From 14702d9eb7b210987fe5dc02445d17f1dd3f17f7 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 12 Mar 2020 09:50:32 +0100 Subject: [PATCH] Adapt to changes in Argeo Commons. --- dep/org.argeo.slc.dep.e4.rap/pom.xml | 2 +- .../META-INF/spring/osgi.xml | 2 +- .../org.argeo.cms.ui.workbench.rap/bnd.bnd | 2 +- .../cms/ui/workbench/rap/AnonymousEntryPoint.java | 2 +- .../cms/ui/workbench/rap/RapWorkbenchLogin.java | 4 ++-- .../cms/ui/workbench/rap/SpnegoWorkbenchLogin.java | 4 ++-- .../META-INF/spring/osgi.xml | 8 ++++---- .../argeo/cms/spring/AbstractSystemExecution.java | 2 +- .../argeo/cms/ui/workbench/WorkbenchUiPlugin.java | 2 +- .../workbench/commands/OpenChangePasswordDialog.java | 2 +- .../internal/jcr/commands/AddRemoteRepository.java | 6 +++--- .../ui/workbench/internal/jcr/commands/DumpNode.java | 4 ++-- .../internal/useradmin/UserAdminWrapper.java | 2 +- .../internal/useradmin/parts/GroupMainPage.java | 12 ++++++------ .../internal/useradmin/parts/GroupsView.java | 2 +- .../useradmin/parts/UserBatchUpdateWizard.java | 2 +- .../internal/useradmin/parts/UserEditor.java | 2 +- .../internal/useradmin/parts/UserMainPage.java | 8 ++++---- .../internal/useradmin/parts/UsersView.java | 2 +- .../internal/useradmin/providers/RoleIconLP.java | 4 ++-- .../internal/useradmin/providers/UserFilter.java | 2 +- .../argeo/cms/ui/workbench/jcr/JcrBrowserView.java | 4 ++-- .../cms/ui/workbench/useradmin/AdminLogView.java | 2 +- .../ui/workbench/useradmin/LogContentProvider.java | 2 +- .../argeo/cms/ui/workbench/useradmin/LogView.java | 4 ++-- .../META-INF/spring/osgi.xml | 2 +- .../slc/client/ui/dist/commands/CopyWorkspace.java | 2 +- .../slc/client/ui/dist/commands/CreateWorkspace.java | 2 +- .../slc/client/ui/dist/commands/DeleteWorkspace.java | 2 +- .../org/argeo/slc/client/ui/dist/commands/Fetch.java | 2 +- .../slc/client/ui/dist/commands/MergeWorkspaces.java | 2 +- .../ui/dist/commands/NormalizeDistribution.java | 2 +- .../client/ui/dist/commands/NormalizeWorkspace.java | 2 +- .../client/ui/dist/commands/PublishWorkspace.java | 2 +- .../client/ui/dist/commands/RegisterRepository.java | 2 +- .../controllers/ArtifactsTreeContentProvider.java | 2 +- .../ui/dist/controllers/DistSessionFactory.java | 2 +- .../ui/dist/controllers/DistTreeContentProvider.java | 4 ++-- .../client/ui/dist/editors/DistWorkspaceEditor.java | 2 +- .../org/argeo/slc/client/ui/dist/model/RepoElem.java | 4 ++-- .../slc/client/ui/dist/wizards/FetchWizard.java | 4 ++-- .../client/ui/dist/wizards/RegisterRepoWizard.java | 4 ++-- org.argeo.slc.jcr/pom.xml | 2 +- .../src/org/argeo/slc/jcr/SlcJcrResultUtils.java | 2 +- .../src/org/argeo/slc/jcr/SlcJcrUtils.java | 2 +- .../src/org/argeo/slc/repo/RepoSync.java | 2 +- .../src/org/argeo/slc/repo/RepoUtils.java | 4 ++-- .../src/org/argeo/slc/repo/core/RepoServiceImpl.java | 2 +- org.argeo.slc.spring/pom.xml | 2 +- .../argeo/slc/spring/AbstractSystemExecution.java | 2 +- .../org/argeo/slc/lib/jcr/JcrRepositoryBackup.java | 2 +- rcp/org.argeo.cms.e4.rcp/bnd.bnd | 2 +- .../src/org/argeo/cms/e4/rcp/CmsE4Application.java | 6 +++--- .../src/org/argeo/eclipse/ui/specific/OpenFile.java | 6 +++--- 54 files changed, 82 insertions(+), 82 deletions(-) diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml index 63cfd3403..d34f7413f 100644 --- a/dep/org.argeo.slc.dep.e4.rap/pom.xml +++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml @@ -37,7 +37,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.1.86-SNAPSHOT + ${version.argeo-commons} test diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml index 231b7d883..248d87497 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml @@ -10,5 +10,5 @@ - + diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/bnd.bnd b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/bnd.bnd index f9e7f66df..da72c4c46 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/bnd.bnd +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/bnd.bnd @@ -10,5 +10,5 @@ org.argeo.cms.ui.workbench,\ org.argeo.cms.ui.workbench.commands,\ org.argeo.eclipse.ui.specific,\ org.argeo.eclipse.spring,\ -org.argeo.node,\ +org.argeo.api,\ * diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java index f657ec368..7c2d57221 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java @@ -23,8 +23,8 @@ import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; -import org.argeo.node.NodeConstants; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.EntryPoint; import org.eclipse.swt.widgets.Display; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java index 353f3e929..3bcedfa0d 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java @@ -8,8 +8,8 @@ import javax.security.auth.x500.X500Principal; import org.argeo.cms.CmsMsg; import org.argeo.cms.auth.CurrentUser; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.util.LoginEntryPoint; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.util.LoginEntryPoint; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.client.service.JavaScriptExecutor; import org.eclipse.swt.SWT; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/SpnegoWorkbenchLogin.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/SpnegoWorkbenchLogin.java index 412fecfc6..64c580442 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/SpnegoWorkbenchLogin.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/SpnegoWorkbenchLogin.java @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServletResponse; import org.argeo.cms.CmsMsg; import org.argeo.cms.auth.CurrentUser; -import org.argeo.cms.util.CmsUtils; -import org.argeo.cms.util.LoginEntryPoint; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.cms.ui.util.LoginEntryPoint; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.client.service.JavaScriptExecutor; import org.eclipse.swt.SWT; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml index a32241299..36c8e2f4e 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml @@ -10,7 +10,7 @@ - + - + + filter="(service.pid=org.argeo.api.fsProvider)" /> - diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/AbstractSystemExecution.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/AbstractSystemExecution.java index ce92c4613..082a28793 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/AbstractSystemExecution.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/AbstractSystemExecution.java @@ -21,8 +21,8 @@ import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; -import org.argeo.node.NodeConstants; /** Provides base method for executing code with system authorization. */ abstract class AbstractSystemExecution { diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java index d96daf221..9d5275ac8 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java @@ -25,7 +25,7 @@ import javax.security.auth.callback.UnsupportedCallbackException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; -import org.argeo.cms.widgets.auth.DefaultLoginDialog; +import org.argeo.cms.ui.widgets.auth.DefaultLoginDialog; import org.eclipse.core.runtime.ILogListener; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java index 30836b948..6913a9aa1 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java @@ -33,9 +33,9 @@ import javax.transaction.UserTransaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.security.CryptoKeyring; import org.argeo.cms.CmsException; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; -import org.argeo.node.security.CryptoKeyring; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java index 3539cacc1..1446369ed 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java @@ -24,6 +24,9 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.SimpleCredentials; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.ui.workbench.internal.WorkbenchConstants; @@ -31,9 +34,6 @@ import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DumpNode.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DumpNode.java index ae23f1d54..2dbb25932 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DumpNode.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DumpNode.java @@ -15,8 +15,8 @@ */ package org.argeo.cms.ui.workbench.internal.jcr.commands; -import static org.argeo.eclipse.ui.utils.SingleSourcingConstants.FILE_SCHEME; -import static org.argeo.eclipse.ui.utils.SingleSourcingConstants.SCHEME_HOST_SEPARATOR; +import static org.argeo.eclipse.ui.util.SingleSourcingConstants.FILE_SCHEME; +import static org.argeo.eclipse.ui.util.SingleSourcingConstants.SCHEME_HOST_SEPARATOR; import java.io.File; import java.io.FileOutputStream; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java index e4efcc72a..d5e995ae5 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java @@ -9,8 +9,8 @@ import java.util.Map; import javax.transaction.Status; import javax.transaction.UserTransaction; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; -import org.argeo.node.NodeConstants; import org.argeo.osgi.useradmin.UserAdminConf; import org.osgi.framework.ServiceReference; import org.osgi.service.useradmin.UserAdmin; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java index bb83391d7..8976956ff 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java @@ -15,10 +15,10 @@ */ package org.argeo.cms.ui.workbench.internal.useradmin.parts; +import static org.argeo.api.NodeInstance.WORKGROUP; import static org.argeo.cms.auth.UserAdminUtils.setProperty; import static org.argeo.naming.LdapAttrs.businessCategory; import static org.argeo.naming.LdapAttrs.description; -import static org.argeo.node.NodeInstance.WORKGROUP; import java.util.ArrayList; import java.util.Iterator; @@ -32,6 +32,8 @@ import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import javax.transaction.UserTransaction; +import org.argeo.api.NodeInstance; +import org.argeo.api.NodeUtils; import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.ui.workbench.CmsWorkbenchStyles; @@ -44,15 +46,13 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.MailLP; import org.argeo.cms.ui.workbench.internal.useradmin.providers.RoleIconLP; import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserFilter; import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.jcr.JcrUtils; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeInstance; -import org.argeo.node.NodeUtils; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; @@ -504,7 +504,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames { // lbl.setFont(EclipseUiUtils.getBoldFont(parent)); // Text text = toolkit.createText(parent, value, SWT.BORDER); // text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - // CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); + // CmsUiUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); // return text; // } // @@ -516,7 +516,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames { Text text = toolkit.createText(parent, value, SWT.NONE); text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); text.setEditable(false); - CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); + CmsUiUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); return text; } diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java index 453fa7d55..aec02b4f8 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; @@ -36,7 +37,6 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.naming.LdapAttrs; import org.argeo.naming.LdapObjs; -import org.argeo.node.NodeConstants; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java index 94eb3a809..5b0b2a558 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java @@ -10,6 +10,7 @@ import javax.transaction.UserTransaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.workbench.internal.useradmin.UiAdminUtils; @@ -24,7 +25,6 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.naming.LdapAttrs; import org.argeo.naming.LdapObjs; -import org.argeo.node.NodeConstants; import org.eclipse.jface.dialogs.IPageChangeProvider; import org.eclipse.jface.dialogs.IPageChangedListener; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java index c322875bb..02da6258e 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java @@ -20,13 +20,13 @@ import java.util.List; import javax.jcr.Repository; +import org.argeo.api.NodeInstance; import org.argeo.cms.CmsException; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; import org.argeo.cms.ui.workbench.internal.useradmin.UiUserAdminListener; import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeInstance; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java index 790921fe9..c37896539 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.argeo.api.NodeConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.workbench.CmsWorkbenchStyles; @@ -38,13 +39,12 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.DomainNameLP; import org.argeo.cms.ui.workbench.internal.useradmin.providers.RoleIconLP; import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserFilter; import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener; -import org.argeo.cms.util.CmsUtils; +import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; @@ -554,7 +554,7 @@ public class UserMainPage extends FormPage implements ArgeoNames { lbl.setFont(EclipseUiUtils.getBoldFont(parent)); Text text = toolkit.createText(parent, value, SWT.BORDER); text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); + CmsUiUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); return text; } @@ -565,7 +565,7 @@ public class UserMainPage extends FormPage implements ArgeoNames { Text text = toolkit.createText(parent, value, SWT.NONE); text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); text.setEditable(false); - CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); + CmsUiUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT); return text; } } diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java index 4a3b1572e..73c8e8563 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java @@ -18,6 +18,7 @@ package org.argeo.cms.ui.workbench.internal.useradmin.parts; import java.util.ArrayList; import java.util.List; +import org.argeo.api.NodeConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; @@ -35,7 +36,6 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.naming.LdapAttrs; import org.argeo.naming.LdapObjs; -import org.argeo.node.NodeConstants; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java index 7e60c4ec4..bd2260bb3 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java @@ -1,10 +1,10 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers; import org.argeo.cms.ui.workbench.internal.useradmin.SecurityAdminImages; +import org.argeo.api.NodeConstants; +import org.argeo.api.NodeInstance; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeInstance; import org.eclipse.swt.graphics.Image; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java index 6694b9619..36278743a 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java @@ -2,9 +2,9 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers; import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty; +import org.argeo.api.NodeConstants; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.naming.LdapAttrs; -import org.argeo.node.NodeConstants; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.osgi.service.useradmin.User; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java index f84950b91..f58d62afd 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java @@ -28,6 +28,7 @@ import javax.jcr.observation.Event; import javax.jcr.observation.EventListener; import javax.jcr.observation.ObservationManager; +import org.argeo.api.security.Keyring; import org.argeo.cms.ui.jcr.DefaultRepositoryRegister; import org.argeo.cms.ui.jcr.JcrBrowserUtils; import org.argeo.cms.ui.jcr.JcrDClickListener; @@ -40,8 +41,7 @@ import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; -import org.argeo.eclipse.ui.jcr.utils.NodeViewerComparer; -import org.argeo.node.security.Keyring; +import org.argeo.eclipse.ui.jcr.util.NodeViewerComparer; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java index c76b8903a..742066a9a 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java @@ -17,8 +17,8 @@ package org.argeo.cms.ui.workbench.useradmin; import java.util.ArrayList; +import org.argeo.api.ArgeoLogger; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; -import org.argeo.node.ArgeoLogger; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TableViewer; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java index 24f3ca1bc..5e4c30451 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java @@ -22,7 +22,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; -import org.argeo.node.ArgeoLogListener; +import org.argeo.api.ArgeoLogListener; import org.eclipse.jface.viewers.ILazyContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java index 07c808d3e..3639520f5 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java @@ -17,9 +17,9 @@ package org.argeo.cms.ui.workbench.useradmin; import java.util.ArrayList; +import org.argeo.api.ArgeoLogListener; +import org.argeo.api.ArgeoLogger; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; -import org.argeo.node.ArgeoLogListener; -import org.argeo.node.ArgeoLogger; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TableViewer; diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml index 2187ea257..48e9a1b62 100644 --- a/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml +++ b/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml @@ -12,7 +12,7 @@ filter="(cn=java)" /> - + diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java index 84d519a45..01e3c9856 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java @@ -25,11 +25,11 @@ import javax.jcr.security.Privilege; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.security.Keyring; import org.argeo.cms.ui.workbench.util.PrivilegedJob; import org.argeo.eclipse.ui.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcConstants; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistPlugin; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java index 2b27f96da..3f70f6d28 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java @@ -25,9 +25,9 @@ import javax.jcr.security.Privilege; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.security.Keyring; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcConstants; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java index 1369aeb3b..9f09a37a9 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java @@ -24,8 +24,8 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import org.argeo.api.security.Keyring; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java index a54423634..39a9274d8 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java @@ -6,8 +6,8 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; +import org.argeo.api.security.Keyring; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java index 39d5495f1..1eb03f16c 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java @@ -27,10 +27,10 @@ import javax.jcr.query.QueryResult; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.security.Keyring; import org.argeo.eclipse.ui.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.repo.RepoUtils; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java index 57aa1edec..de46d58a2 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java @@ -31,10 +31,10 @@ import javax.jcr.util.TraversingItemVisitor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.security.Keyring; import org.argeo.eclipse.ui.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java index b6db2ad16..37e5b7a3d 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java @@ -29,10 +29,10 @@ import javax.jcr.util.TraversingItemVisitor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.api.security.Keyring; import org.argeo.eclipse.ui.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; import org.argeo.slc.client.ui.dist.DistPlugin; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java index 51f7fd64f..91aaf9a6b 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java @@ -23,8 +23,8 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.security.Privilege; +import org.argeo.api.security.Keyring; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcConstants; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistPlugin; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java index 2dbd3377d..0c734b68f 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java @@ -18,8 +18,8 @@ package org.argeo.slc.client.ui.dist.commands; import javax.jcr.Repository; import javax.jcr.RepositoryFactory; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcNames; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java index d301bee28..00274c003 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java @@ -23,7 +23,7 @@ import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; -import org.argeo.eclipse.ui.jcr.utils.JcrItemsComparator; +import org.argeo.eclipse.ui.jcr.util.JcrItemsComparator; import org.argeo.slc.SlcException; import org.argeo.slc.SlcTypes; import org.eclipse.jface.viewers.ITreeContentProvider; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java index 38203d8ba..52c537469 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java @@ -8,8 +8,8 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; +import org.argeo.api.security.Keyring; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.repo.RepoUtils; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java index 0fc46d2f1..f1858d3d9 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java @@ -12,12 +12,12 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.eclipse.ui.TreeParent; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.model.RepoElem; import org.argeo.slc.repo.RepoConstants; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java index 5e9afae81..f2efbde8a 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java @@ -21,8 +21,8 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; +import org.argeo.api.security.Keyring; import org.argeo.jcr.JcrUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; import org.argeo.slc.client.ui.dist.DistPlugin; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java index eae7f55ef..4e404a842 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java @@ -9,10 +9,10 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.repo.RepoConstants; import org.argeo.slc.repo.RepoUtils; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java index fb40e1c34..de7d65c06 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java @@ -28,14 +28,14 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.ui.workbench.util.PrivilegedJob; import org.argeo.eclipse.ui.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.client.ui.dist.utils.ViewerUtils; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java index 8a814d94a..a0f289a13 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java @@ -26,12 +26,12 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import javax.jcr.nodetype.NodeType; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; import org.argeo.slc.SlcException; import org.argeo.slc.repo.RepoConstants; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/org.argeo.slc.jcr/pom.xml b/org.argeo.slc.jcr/pom.xml index 1d09f7868..c6977b8f3 100644 --- a/org.argeo.slc.jcr/pom.xml +++ b/org.argeo.slc.jcr/pom.xml @@ -31,7 +31,7 @@ org.argeo.commons - org.argeo.node.api + org.argeo.api ${version.argeo-commons} diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java index 6353804df..0aea1fc60 100644 --- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java +++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java @@ -20,8 +20,8 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import org.argeo.api.NodeUtils; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; import org.argeo.slc.SlcTypes; diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java index fcf2e7159..4094060bd 100644 --- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java +++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrUtils.java @@ -26,8 +26,8 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import org.argeo.api.NodeUtils; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java index 38fc23a34..d524a2cc3 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java @@ -46,7 +46,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; +import org.argeo.api.NodeUtils; import org.argeo.slc.SlcException; import org.xml.sax.SAXException; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java index 7bc7854cf..d9787ef51 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java @@ -55,8 +55,8 @@ import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; -import org.argeo.node.security.Keyring; +import org.argeo.api.NodeUtils; +import org.argeo.api.security.Keyring; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java index f3be31693..bca40cb01 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java @@ -4,7 +4,7 @@ import javax.jcr.Repository; import javax.jcr.RepositoryFactory; import javax.jcr.Session; -import org.argeo.node.security.Keyring; +import org.argeo.api.security.Keyring; import org.argeo.slc.repo.RepoService; import org.argeo.slc.repo.RepoUtils; diff --git a/org.argeo.slc.spring/pom.xml b/org.argeo.slc.spring/pom.xml index 809d163d2..456edb030 100644 --- a/org.argeo.slc.spring/pom.xml +++ b/org.argeo.slc.spring/pom.xml @@ -19,7 +19,7 @@ org.argeo.commons - org.argeo.node.api + org.argeo.api ${version.argeo-commons} diff --git a/org.argeo.slc.spring/src/org/argeo/slc/spring/AbstractSystemExecution.java b/org.argeo.slc.spring/src/org/argeo/slc/spring/AbstractSystemExecution.java index 7813b9a5f..83a6640c4 100644 --- a/org.argeo.slc.spring/src/org/argeo/slc/spring/AbstractSystemExecution.java +++ b/org.argeo.slc.spring/src/org/argeo/slc/spring/AbstractSystemExecution.java @@ -21,7 +21,7 @@ import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.node.NodeConstants; +import org.argeo.api.NodeConstants; import org.argeo.slc.SlcException; /** Provides base method for executing code with system authorization. */ diff --git a/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java b/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java index 1b95ec517..e1467543a 100644 --- a/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java +++ b/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java @@ -38,7 +38,7 @@ import org.apache.commons.vfs2.FileSelector; import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.FileSystemManager; import org.argeo.jcr.JcrUtils; -import org.argeo.node.NodeUtils; +import org.argeo.api.NodeUtils; import org.argeo.slc.SlcException; /** Backups a JCR repository */ diff --git a/rcp/org.argeo.cms.e4.rcp/bnd.bnd b/rcp/org.argeo.cms.e4.rcp/bnd.bnd index 7759c8457..dca5b9189 100644 --- a/rcp/org.argeo.cms.e4.rcp/bnd.bnd +++ b/rcp/org.argeo.cms.e4.rcp/bnd.bnd @@ -2,7 +2,7 @@ Bundle-SymbolicName: org.argeo.cms.e4.rcp;singleton=true Require-Bundle: org.eclipse.core.runtime -Import-Package: org.argeo.node,\ +Import-Package: org.argeo.api,\ !org.eclipse.core.runtime,\ org.eclipse.swt,\ * diff --git a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java index f8c82cb0f..d66e817ad 100644 --- a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java +++ b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java @@ -6,14 +6,14 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; +import org.argeo.api.NodeConstants; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.CmsImageManager; import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.UxContext; -import org.argeo.cms.util.SimpleUxContext; -import org.argeo.cms.widgets.auth.CmsLoginShell; -import org.argeo.node.NodeConstants; +import org.argeo.cms.ui.util.SimpleUxContext; +import org.argeo.cms.ui.widgets.auth.CmsLoginShell; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.Platform; diff --git a/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/OpenFile.java b/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/OpenFile.java index 704079f11..863082ac3 100644 --- a/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/OpenFile.java +++ b/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/OpenFile.java @@ -15,14 +15,14 @@ */ package org.argeo.eclipse.ui.specific; -import static org.argeo.eclipse.ui.utils.SingleSourcingConstants.FILE_SCHEME; -import static org.argeo.eclipse.ui.utils.SingleSourcingConstants.SCHEME_HOST_SEPARATOR; +import static org.argeo.eclipse.ui.util.SingleSourcingConstants.FILE_SCHEME; +import static org.argeo.eclipse.ui.util.SingleSourcingConstants.SCHEME_HOST_SEPARATOR; import java.awt.Desktop; import java.io.File; import java.io.IOException; -import org.argeo.eclipse.ui.utils.SingleSourcingConstants; +import org.argeo.eclipse.ui.util.SingleSourcingConstants; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -- 2.39.2