From fbde11e8a342318876a4744c4676d3618bdf8583 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier
Date: Wed, 5 Jan 2022 12:37:17 +0100
Subject: [PATCH] Massive Argeo APIs refactoring
---
cms/org.argeo.cms.integration/bnd.bnd | 2 +-
.../cms/integration/CmsExceptionsChain.java | 5 +-
.../cms/integration/CmsLoginServlet.java | 4 +-
.../cms/integration/CmsLogoutServlet.java | 4 +-
.../integration/CmsPrivateServletContext.java | 5 +-
.../cms/integration/CmsTokenServlet.java | 6 +-
.../argeo/cms/integration/JcrReadServlet.java | 5 +-
.../cms/integration/JcrWriteServlet.java | 5 +-
.../websocket/CmsWebSocketConfigurator.java | 9 +-
.../maintenance/backup/vfs/OsCallBackup.java | 5 +-
.../backup/vfs/SimpleBackupPurge.java | 5 +-
.../maintenance/backup/vfs/SystemBackup.java | 5 +-
.../src/org/argeo/ssh/AbstractSsh.java | 5 +-
.../src/org/argeo/ssh/SshSync.java | 5 +-
.../org.argeo.cms.ui.workbench.rap/.classpath | 2 +-
.../META-INF/spring/osgi.xml | 2 +-
.../org.argeo.cms.ui.workbench.rap/bnd.bnd | 1 -
.../ui/workbench/rap/AnonymousEntryPoint.java | 9 +-
.../cms/ui/workbench/rap/LoginEntryPoint.java | 10 +-
.../ui/workbench/rap/RapActionBarAdvisor.java | 2 +-
.../ui/workbench/rap/RapWorkbenchLogin.java | 4 -
.../workbench/rap/SpnegoWorkbenchLogin.java | 4 -
.../org.argeo.cms.ui.workbench/.classpath | 2 +-
.../META-INF/spring/osgi.xml | 6 +-
.../cms/spring/AbstractSystemExecution.java | 11 +-
.../cms/spring/SimpleRoleRegistration.java | 5 +-
.../cms/spring/osgi/OsgiModuleLabel.java | 5 +-
.../cms/ui/workbench/AbstractLoginDialog.java | 5 +-
.../cms/ui/workbench/WorkbenchUiPlugin.java | 7 +-
.../commands/OpenChangePasswordDialog.java | 7 +-
.../jcr/commands/AddRemoteRepository.java | 6 +-
.../internal/jcr/commands/GetNodeSize.java | 2 +-
.../internal/jcr/commands/UploadFiles.java | 2 +-
.../jcr/parts/AbstractJcrQueryEditor.java | 5 +-
.../internal/jcr/parts/ChildNodesPage.java | 2 +-
.../internal/jcr/parts/GenericNodePage.java | 6 +-
.../jcr/parts/NodeVersionHistoryPage.java | 6 +-
.../internal/useradmin/PartStateChanged.java | 2 +-
.../internal/useradmin/UserAdminWrapper.java | 4 +-
.../internal/useradmin/commands/NewGroup.java | 2 +-
.../internal/useradmin/commands/NewUser.java | 4 +-
.../useradmin/parts/GroupMainPage.java | 14 +-
.../internal/useradmin/parts/GroupsView.java | 19 +-
.../parts/UserBatchUpdateWizard.java | 15 +-
.../internal/useradmin/parts/UserEditor.java | 8 +-
.../useradmin/parts/UserMainPage.java | 16 +-
.../internal/useradmin/parts/UsersView.java | 10 +-
.../useradmin/providers/CommonNameLP.java | 2 +-
.../internal/useradmin/providers/MailLP.java | 2 +-
.../useradmin/providers/RoleIconLP.java | 10 +-
.../useradmin/providers/UserFilter.java | 6 +-
.../providers/UserTransactionProvider.java | 5 +-
.../cms/ui/workbench/jcr/JcrBrowserView.java | 6 +-
.../cms/ui/workbench/legacy/rap/OpenFile.java | 5 +-
.../ui/workbench/useradmin/AdminLogView.java | 2 +-
.../useradmin/LogContentProvider.java | 2 +-
.../cms/ui/workbench/useradmin/LogView.java | 4 +-
.../spring/ApplicationContextTracker.java | 5 +-
.../eclipse/spring/SpringCommandHandler.java | 5 +-
legacy/org.argeo.slc.client.rap/.classpath | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 8 -
.../META-INF/spring/osgi.xml | 2 +-
legacy/org.argeo.slc.client.rap/bnd.bnd | 1 +
.../org.argeo.slc.client.ui.dist/.classpath | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 8 -
.../.settings/org.eclipse.pde.core.prefs | 4 -
.../META-INF/spring/osgi.xml | 2 +-
legacy/org.argeo.slc.client.ui.dist/bnd.bnd | 2 +-
.../dist/commands/CopyLocalJavaWorkspace.java | 5 +-
.../ui/dist/commands/CopyWorkspace.java | 7 +-
.../commands/CreateLocalJavaWorkspace.java | 5 +-
.../ui/dist/commands/CreateWorkspace.java | 7 +-
.../ui/dist/commands/DeleteArtifacts.java | 2 +-
.../ui/dist/commands/DeleteWorkspace.java | 4 +-
.../slc/client/ui/dist/commands/Fetch.java | 4 +-
.../ui/dist/commands/MergeWorkspaces.java | 7 +-
.../dist/commands/NormalizeDistribution.java | 7 +-
.../ui/dist/commands/NormalizeWorkspace.java | 7 +-
.../commands/OpenGenerateBinariesWizard.java | 2 +-
.../ui/dist/commands/PublishWorkspace.java | 8 +-
.../ui/dist/commands/RegisterRepository.java | 2 +-
.../client/ui/dist/commands/RunInOsgi.java | 5 +-
.../dist/commands/UnregisterRemoteRepo.java | 6 +-
.../dist/controllers/DistSessionFactory.java | 2 +-
.../controllers/DistTreeContentProvider.java | 6 +-
.../ui/dist/editors/BundleDetailPage.java | 5 +-
.../ui/dist/editors/DistWkspBrowserPage.java | 2 +-
.../ui/dist/editors/DistWkspSearchPage.java | 2 +-
.../ui/dist/editors/DistWorkspaceEditor.java | 2 +-
.../ModularDistVersionOverviewPage.java | 5 +-
.../slc/client/ui/dist/model/RepoElem.java | 10 +-
.../dist/utils/ArtifactsTableConfigurer.java | 2 +-
.../dist/utils/DistNodeViewerComparator.java | 5 +-
.../client/ui/dist/utils/DistUiHelpers.java | 5 +-
.../views/AbstractQueryArtifactsView.java | 5 +-
.../views/AnonymousDistributionsView.java | 2 +-
.../ui/dist/views/ArtifactsBrowser.java | 2 +-
.../ui/dist/views/QueryArtifactsForm.java | 2 +-
.../ui/dist/views/QueryBundlesForm.java | 2 +-
.../client/ui/dist/wizards/FetchWizard.java | 4 +-
.../dist/wizards/GenerateBinariesWizard.java | 5 +-
.../ui/dist/wizards/RegisterRepoWizard.java | 6 +-
legacy/org.argeo.slc.client.ui/.classpath | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 12 -
.../.settings/org.eclipse.pde.core.prefs | 3 -
legacy/org.argeo.slc.client.ui/bnd.bnd | 1 -
.../slc/client/ui/commands/UpdateModule.java | 5 +-
.../ui/decorators/ResultFailedDecorator.java | 2 +-
.../slc/client/ui/editors/ProcessEditor.java | 4 +-
.../slc/client/ui/model/ParentNodeFolder.java | 2 +-
.../ui/providers/ResultTreeLabelProvider.java | 2 +-
.../ui/views/JcrExecutionModulesView.java | 5 +-
.../client/ui/views/JcrProcessListView.java | 4 +-
.../client/ui/views/JcrResultTreeView.java | 4 +-
legacy/org.argeo.slc.spring/bnd.bnd | 1 -
legacy/org.argeo.slc.spring/build.properties | 3 -
.../core/deploy/DefaultResourceSetTest.java | 5 +-
.../AbstractExecutionFlowTestCase.java | 5 +-
.../execution/ExceptionIfInitCalledTwice.java | 5 +-
.../core/execution/tasks/SystemCallTest.java | 5 +-
.../AbstractInternalSpringTestCase.java | 5 +-
.../src/org/argeo/slc/ant/AntRun.java | 5 +-
.../attachment/FileAttachmentsStorage.java | 5 +-
.../slc/core/deploy/DefaultResourceSet.java | 5 +-
.../slc/core/deploy/SimpleExecutables.java | 5 +-
.../slc/core/deploy/VersionedDirSync.java | 5 +-
.../AbstractExecutionFlowGenerator.java | 5 +-
...faultExecutionFlowDescriptorConverter.java | 5 +-
.../core/execution/DefaultExecutionSpec.java | 5 +-
.../slc/core/execution/ExecutionAspect.java | 5 +-
.../ExecutionParameterPostProcessor.java | 5 +-
.../slc/core/execution/ExecutionScope.java | 5 +-
.../execution/FileExecutionResources.java | 5 +-
.../slc/core/execution/ParameterRef.java | 5 +-
.../generator/ExecutionFlowGenerator.java | 5 +-
.../execution/generator/RunnableCallFlow.java | 5 +-
.../argeo/slc/core/execution/tasks/Echo.java | 9 +-
.../slc/core/execution/tasks/SystemCall.java | 5 +-
.../core/execution/xml/AsFlowDecorator.java | 5 +-
.../xml/FlowBeanDefinitionParser.java | 5 +-
.../core/execution/xml/NamespaceUtils.java | 2 +-
.../xml/SpecBeanDefinitionParser.java | 5 +-
.../org/argeo/slc/osgi/BundlesManager.java | 5 +-
.../slc/osgi/FileSystemBundleRegister.java | 5 +-
.../MultipleServiceExporterPostProcessor.java | 5 +-
.../argeo/slc/osgi/OsgiExecutionModule.java | 5 +-
.../slc/osgi/OsgiExecutionModulesManager.java | 5 +-
.../slc/osgi/OsgiExecutionResources.java | 5 +-
.../AbstractOsgiModularDistribution.java | 5 +-
.../build/OsgiRuntimeModularDistribution.java | 5 +-
.../slc/spring/AbstractSystemExecution.java | 11 +-
.../spring/auth/AbstractSystemExecution.java | 11 +-
.../spring/auth/SimpleRoleRegistration.java | 5 +-
.../slc/spring/repo/osgi/BndWrapper.java | 5 +-
.../slc/spring/repo/osgi/MavenWrapper.java | 5 +-
.../slc/spring/repo/osgi/UriWrapper.java | 5 +-
.../unit/AbstractOsgiRuntimeTestCase.java | 5 +-
.../spring/unit/AbstractSpringTestCase.java | 5 +-
.../org/argeo/slc/jsch/AbstractJschTask.java | 7 +-
.../argeo/slc/jsch/JschContextSession.java | 5 +-
.../src/org/argeo/slc/jsch/RemoteExec.java | 5 +-
.../src/org/argeo/slc/jsch/ScpFrom.java | 5 +-
.../src/org/argeo/slc/jsch/ScpTo.java | 5 +-
.../org/argeo/slc/jsch/SimpleUserInfo.java | 5 +-
.../argeo/slc/jsch/SshFilesDeployment.java | 5 +-
.../src/org/argeo/slc/jsch/SshShell.java | 5 +-
.../slc/lib/jcr/JcrRepositoryBackup.java | 5 +-
.../slc/lib/linux/rpmfactory/BuildInMock.java | 5 +-
.../slc/lib/linux/rpmfactory/CreateSrpm.java | 5 +-
.../org/argeo/slc/lib/vbox/VBoxManager.java | 5 +-
.../argeo/slc/log4j/SlcExecutionAppender.java | 142 -------
.../src/org/argeo/slc/mail/SendMail.java | 5 +-
.../deploy/HttpdApplicationDeployment.java | 5 +-
.../support/deploy/HttpdServerManager.java | 5 +-
org.argeo.slc.factory/pom.xml | 15 +-
.../slc/rpmfactory/core/BuildInMock.java | 5 +-
.../core/CreateRpmDistribution.java | 5 +-
.../slc/rpmfactory/core/ReleaseStaging.java | 5 +-
.../slc/rpmfactory/core/RpmFactoryImpl.java | 5 +-
.../rpmfactory/core/RpmProxyServiceImpl.java | 5 +-
.../slc/rpmfactory/core/YumListParser.java | 5 +-
org.argeo.slc.jcr/bnd.bnd | 1 -
org.argeo.slc.jcr/build.properties | 4 +-
.../org/argeo/slc/jcr/JcrMetadataWriter.java | 13 +-
.../src/org/argeo/slc/jcr/JcrTestResult.java | 5 +-
.../JcrExecutionModulesListener.java | 163 +++-----
.../jcr/execution/JcrExecutionProcess.java | 34 +-
.../slc/jcr/execution/JcrProcessThread.java | 4 +-
org.argeo.slc.repo/bnd.bnd | 1 -
.../org/argeo/slc/repo/ArtifactIndexer.java | 115 ++---
.../org/argeo/slc/repo/JarFileIndexer.java | 114 ++---
.../slc/repo/ModularDistributionIndexer.java | 5 +-
.../org/argeo/slc/repo/PdeSourcesIndexer.java | 5 +-
.../src/org/argeo/slc/repo/RepoConstants.java | 4 +-
.../src/org/argeo/slc/repo/RepoSync.java | 5 +-
.../src/org/argeo/slc/repo/RepoUtils.java | 10 +-
.../slc/repo/core/AbstractJcrRepoManager.java | 21 +-
.../argeo/slc/repo/core/RepoServiceImpl.java | 2 +-
.../argeo/slc/repo/core/WorkspaceIndexer.java | 5 +-
.../org/argeo/slc/repo/maven/AetherUtils.java | 5 +-
.../slc/repo/maven/GenerateBinaries.java | 119 ++----
.../slc/repo/maven/IndexDistribution.java | 5 +-
.../slc/repo/maven/MavenConventionsUtils.java | 5 +-
.../slc/repo/maven/MavenProxyServiceImpl.java | 45 +-
.../argeo/slc/repo/maven/Migration_01_03.java | 187 +++------
.../slc/repo/osgi/ArchiveSourcesProvider.java | 10 +-
.../argeo/slc/repo/osgi/ArchiveWrapper.java | 5 +-
.../repo/osgi/ArgeoOsgiDistributionImpl.java | 5 +-
.../org/argeo/slc/repo/osgi/BndWrapper.java | 5 +-
.../argeo/slc/repo/osgi/ImportBundlesZip.java | 21 +-
.../org/argeo/slc/repo/osgi/MavenWrapper.java | 5 +-
.../argeo/slc/repo/osgi/NormalizeGroup.java | 163 +++-----
.../argeo/slc/repo/osgi/OsgiFactoryImpl.java | 5 +-
.../org/argeo/slc/repo/osgi/OsgiProfile.java | 12 +-
.../slc/repo/osgi/ProcessDistribution.java | 31 +-
.../argeo/slc/repo/osgi/SourcesProvider.java | 6 +-
.../org/argeo/slc/repo/osgi/SubArtifact.java | 394 +++++++++---------
.../org/argeo/slc/repo/osgi/UriWrapper.java | 5 +-
org.argeo.slc.runtime/pom.xml | 6 +
.../src/org/argeo/cli/fs/SyncFileVisitor.java | 5 +-
.../AbstractExecutionModulesManager.java | 5 +-
.../org/argeo/slc/runtime/DefaultAgent.java | 2 +-
.../argeo/slc/runtime/DefaultAgentCli.java | 5 +-
.../slc/runtime/DefaultExecutionFlow.java | 5 +-
.../slc/runtime/DefaultExecutionStack.java | 5 +-
.../argeo/slc/runtime/ExecutionThread.java | 5 +-
.../slc/runtime/InstantiationManager.java | 5 +-
.../org/argeo/slc/runtime/ProcessThread.java | 5 +-
.../src/org/argeo/slc/runtime/tasks/Echo.java | 9 +-
.../argeo/slc/runtime/tasks/SystemCall.java | 5 +-
.../argeo/slc/runtime/test/ContextUtils.java | 5 +-
.../slc/runtime/test/SimpleTestResult.java | 5 +-
232 files changed, 1012 insertions(+), 1653 deletions(-)
delete mode 100644 legacy/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.pde.core.prefs
delete mode 100644 legacy/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 legacy/org.argeo.slc.client.ui/.settings/org.eclipse.pde.core.prefs
delete mode 100644 legacy/org.argeo.slc.support/src/org/argeo/slc/log4j/SlcExecutionAppender.java
diff --git a/cms/org.argeo.cms.integration/bnd.bnd b/cms/org.argeo.cms.integration/bnd.bnd
index 306bcd283..5a4665346 100644
--- a/cms/org.argeo.cms.integration/bnd.bnd
+++ b/cms/org.argeo.cms.integration/bnd.bnd
@@ -1,4 +1,4 @@
Import-Package:\
-org.argeo.api,\
javax.jcr.nodetype,\
+org.apache.commons.logging,\
*
\ No newline at end of file
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java
index bbac176a5..fb289c18e 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java
@@ -7,8 +7,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -16,7 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/** Serialisable wrapper of a {@link Throwable}. */
public class CmsExceptionsChain {
- public final static Log log = LogFactory.getLog(CmsExceptionsChain.class);
+ public final static CmsLog log = CmsLog.getLog(CmsExceptionsChain.class);
private List exceptions = new ArrayList<>();
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
index 45dcd73fc..29a3137bb 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsAuth;
import org.argeo.api.cms.CmsSessionId;
import org.argeo.cms.auth.RemoteAuthCallback;
import org.argeo.cms.auth.RemoteAuthCallbackHandler;
@@ -49,7 +49,7 @@ public class CmsLoginServlet extends HttpServlet {
ServletHttpRequest request = new ServletHttpRequest(req);
ServletHttpResponse response = new ServletHttpResponse(resp);
try {
- lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) {
+ lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) {
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
for (Callback callback : callbacks) {
if (callback instanceof NameCallback && username != null)
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
index 6bf8d2250..0628eae36 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsAuth;
import org.argeo.api.cms.CmsSessionId;
import org.argeo.cms.auth.CurrentUser;
import org.argeo.cms.auth.RemoteAuthCallback;
@@ -38,7 +38,7 @@ public class CmsLogoutServlet extends HttpServlet {
ServletHttpResponse httpResponse = new ServletHttpResponse(response);
LoginContext lc = null;
try {
- lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
+ lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER,
new RemoteAuthCallbackHandler(httpRequest, httpResponse) {
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
for (Callback callback : callbacks) {
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java
index ac342d3ac..cec04d230 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java
@@ -1,7 +1,5 @@
package org.argeo.cms.integration;
-import static org.argeo.api.NodeConstants.LOGIN_CONTEXT_USER;
-
import java.io.IOException;
import java.security.AccessControlContext;
import java.security.PrivilegedAction;
@@ -13,6 +11,7 @@ import javax.security.auth.login.LoginException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.argeo.api.cms.CmsAuth;
import org.argeo.cms.auth.RemoteAuthCallbackHandler;
import org.argeo.cms.auth.RemoteAuthUtils;
import org.argeo.cms.servlet.ServletHttpRequest;
@@ -46,7 +45,7 @@ public class CmsPrivateServletContext extends ServletContextHelper {
if ((pathInfo != null && (servletPath + pathInfo).equals(loginPage)) || servletPath.contentEquals(loginServlet))
return true;
try {
- lc = new LoginContext(LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response));
+ lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response));
lc.login();
} catch (LoginException e) {
lc = processUnauthorized(req, resp);
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java
index b95e56ef6..983202ad2 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java
@@ -15,13 +15,13 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsAuth;
import org.argeo.cms.CmsUserManager;
import org.argeo.cms.auth.RemoteAuthCallback;
import org.argeo.cms.auth.RemoteAuthCallbackHandler;
import org.argeo.cms.servlet.ServletHttpRequest;
import org.argeo.cms.servlet.ServletHttpResponse;
-import org.argeo.naming.NamingUtils;
+import org.argeo.util.naming.NamingUtils;
import org.osgi.service.useradmin.Authorization;
import com.fasterxml.jackson.core.JsonGenerator;
@@ -45,7 +45,7 @@ public class CmsTokenServlet extends HttpServlet {
ServletHttpResponse response = new ServletHttpResponse(resp);
LoginContext lc = null;
try {
- lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) {
+ lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) {
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
for (Callback callback : callbacks) {
if (callback instanceof RemoteAuthCallback) {
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrReadServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrReadServlet.java
index 83393ec8e..0553d7f59 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrReadServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrReadServlet.java
@@ -30,10 +30,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.api.JackrabbitNode;
import org.apache.jackrabbit.api.JackrabbitValue;
+import org.argeo.api.cms.CmsLog;
import org.argeo.jcr.JcrUtils;
import org.osgi.service.http.context.ServletContextHelper;
@@ -43,7 +42,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/** Access a JCR repository via web services. */
public class JcrReadServlet extends HttpServlet {
private static final long serialVersionUID = 6536175260540484539L;
- private final static Log log = LogFactory.getLog(JcrReadServlet.class);
+ private final static CmsLog log = CmsLog.getLog(JcrReadServlet.class);
protected final static String ACCEPT_HTTP_HEADER = "Accept";
protected final static String CONTENT_DISPOSITION_HTTP_HEADER = "Content-Disposition";
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrWriteServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrWriteServlet.java
index 71d915674..8a3864bbd 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrWriteServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrWriteServlet.java
@@ -12,14 +12,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.jcr.JcrUtils;
/** Access a JCR repository via web services. */
public class JcrWriteServlet extends JcrReadServlet {
private static final long serialVersionUID = 17272653843085492L;
- private final static Log log = LogFactory.getLog(JcrWriteServlet.class);
+ private final static CmsLog log = CmsLog.getLog(JcrWriteServlet.class);
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
index a1cdb257e..aea1f0a38 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
@@ -12,9 +12,8 @@ import javax.websocket.server.HandshakeRequest;
import javax.websocket.server.ServerEndpointConfig;
import javax.websocket.server.ServerEndpointConfig.Configurator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.auth.RemoteAuthCallbackHandler;
import org.argeo.cms.auth.RemoteAuthSession;
import org.argeo.cms.servlet.ServletHttpSession;
@@ -24,7 +23,7 @@ import org.osgi.service.http.context.ServletContextHelper;
public class CmsWebSocketConfigurator extends Configurator {
public final static String WEBSOCKET_SUBJECT = "org.argeo.cms.websocket.subject";
- private final static Log log = LogFactory.getLog(CmsWebSocketConfigurator.class);
+ private final static CmsLog log = CmsLog.getLog(CmsWebSocketConfigurator.class);
final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
@Override
@@ -72,7 +71,7 @@ public class CmsWebSocketConfigurator extends Configurator {
rejectResponse(response, null);
}
try {
- LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
+ LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER,
new RemoteAuthCallbackHandler(httpSession));
lc.login();
if (log.isDebugEnabled())
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java
index c8f20bd7e..a72ce63f9 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java
@@ -11,17 +11,16 @@ import org.apache.commons.exec.ExecuteStreamHandler;
import org.apache.commons.exec.Executor;
import org.apache.commons.exec.PumpStreamHandler;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs2.FileContent;
import org.apache.commons.vfs2.FileObject;
+import org.argeo.api.cms.CmsLog;
/**
* Runs an OS command and save its standard output as a file. Typically used for
* MySQL or OpenLDAP dumps.
*/
public class OsCallBackup extends AbstractAtomicBackup {
- private final static Log log = LogFactory.getLog(OsCallBackup.class);
+ private final static CmsLog log = CmsLog.getLog(OsCallBackup.class);
private String command;
private Map variables = new HashMap();
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java
index 6e747019b..c8baf20c9 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java
@@ -8,16 +8,15 @@ import java.util.Date;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.Selectors;
+import org.argeo.api.cms.CmsLog;
/** Simple backup purge which keeps backups only for a given number of days */
public class SimpleBackupPurge implements BackupPurge {
- private final static Log log = LogFactory.getLog(SimpleBackupPurge.class);
+ private final static CmsLog log = CmsLog.getLog(SimpleBackupPurge.class);
private Integer daysKept = 30;
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java
index a70267844..9ae0c96e5 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java
@@ -5,8 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
@@ -14,6 +12,7 @@ import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.Selectors;
import org.apache.commons.vfs2.UserAuthenticator;
import org.apache.commons.vfs2.impl.DefaultFileSystemConfigBuilder;
+import org.argeo.api.cms.CmsLog;
import org.argeo.util.LangUtils;
/**
@@ -21,7 +20,7 @@ import org.argeo.util.LangUtils;
* remote and local data based on certain criteria.
*/
public class SystemBackup implements Runnable {
- private final static Log log = LogFactory.getLog(SystemBackup.class);
+ private final static CmsLog log = CmsLog.getLog(SystemBackup.class);
private FileSystemManager fileSystemManager;
private UserAuthenticator userAuthenticator = null;
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/ssh/AbstractSsh.java b/cms/org.argeo.cms.integration/src/org/argeo/ssh/AbstractSsh.java
index 261ac2460..6bdb9bc99 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/ssh/AbstractSsh.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/ssh/AbstractSsh.java
@@ -9,8 +9,6 @@ import java.util.HashSet;
import java.util.Scanner;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.sshd.client.SshClient;
import org.apache.sshd.client.channel.ClientChannel;
import org.apache.sshd.client.channel.ClientChannelEvent;
@@ -19,10 +17,11 @@ import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystemProvider;
import org.apache.sshd.common.util.io.NoCloseInputStream;
import org.apache.sshd.common.util.io.NoCloseOutputStream;
+import org.argeo.api.cms.CmsLog;
@SuppressWarnings("restriction")
abstract class AbstractSsh {
- private final static Log log = LogFactory.getLog(AbstractSsh.class);
+ private final static CmsLog log = CmsLog.getLog(AbstractSsh.class);
private static SshClient sshClient;
private static SftpFileSystemProvider sftpFileSystemProvider;
diff --git a/cms/org.argeo.cms.integration/src/org/argeo/ssh/SshSync.java b/cms/org.argeo.cms.integration/src/org/argeo/ssh/SshSync.java
index bafda015f..b9f1e91d0 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/ssh/SshSync.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/ssh/SshSync.java
@@ -10,8 +10,6 @@ import java.util.Map;
import java.util.Scanner;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.sshd.agent.SshAgent;
import org.apache.sshd.agent.SshAgentFactory;
import org.apache.sshd.agent.local.LocalAgentFactory;
@@ -21,9 +19,10 @@ import org.apache.sshd.client.future.ConnectFuture;
import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystem;
import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystemProvider;
+import org.argeo.api.cms.CmsLog;
public class SshSync {
- private final static Log log = LogFactory.getLog(SshSync.class);
+ private final static CmsLog log = CmsLog.getLog(SshSync.class);
public static void main(String[] args) {
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/.classpath b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/.classpath
index 457b11571..e03d341b1 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/.classpath
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/.classpath
@@ -4,6 +4,6 @@
+ path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11" />
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 894017918..09e9ed8f9 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 da72c4c46..7ac394ca1 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,4 @@ org.argeo.cms.ui.workbench,\
org.argeo.cms.ui.workbench.commands,\
org.argeo.eclipse.ui.specific,\
org.argeo.eclipse.spring,\
-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 586c1ee18..82e86b404 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
@@ -6,9 +6,8 @@ import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
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.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.CmsException;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.EntryPoint;
@@ -20,7 +19,7 @@ import org.eclipse.ui.PlatformUI;
* unauthenticated access.
*/
public class AnonymousEntryPoint implements EntryPoint {
- private final static Log log = LogFactory.getLog(AnonymousEntryPoint.class);
+ private final static CmsLog log = CmsLog.getLog(AnonymousEntryPoint.class);
/**
* How many seconds to wait before invalidating the session if the user has
@@ -41,7 +40,7 @@ public class AnonymousEntryPoint implements EntryPoint {
final LoginContext loginContext;
try {
- loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS,
+ loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_ANONYMOUS,
subject);
loginContext.login();
} catch (LoginException e1) {
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/LoginEntryPoint.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/LoginEntryPoint.java
index 57f7c0763..c86dde4aa 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/LoginEntryPoint.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/LoginEntryPoint.java
@@ -8,10 +8,9 @@ import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsAuth;
import org.argeo.api.cms.CmsImageManager;
+import org.argeo.api.cms.CmsLog;
import org.argeo.api.cms.CmsView;
import org.argeo.api.cms.UxContext;
import org.argeo.cms.CmsException;
@@ -20,7 +19,6 @@ import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.swt.SimpleSwtUxContext;
import org.argeo.cms.swt.auth.CmsLogin;
import org.argeo.cms.swt.auth.CmsLoginShell;
-import org.argeo.eclipse.ui.specific.UiContext;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.EntryPoint;
import org.eclipse.swt.events.SelectionListener;
@@ -30,7 +28,7 @@ import org.eclipse.swt.widgets.Display;
public class LoginEntryPoint implements EntryPoint, CmsView {
protected final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
protected final static String HEADER_AUTHORIZATION = "Authorization";
- private final static Log log = LogFactory.getLog(LoginEntryPoint.class);
+ private final static CmsLog log = CmsLog.getLog(LoginEntryPoint.class);
private LoginContext loginContext;
private UxContext uxContext = null;
private String uid;
@@ -45,7 +43,7 @@ public class LoginEntryPoint implements EntryPoint, CmsView {
CmsSwtUtils.registerCmsView(loginShell.getShell(), this);
try {
// try pre-auth
- loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, loginShell);
+ loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, loginShell);
loginContext.login();
} catch (LoginException e) {
loginShell.createUi();
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapActionBarAdvisor.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapActionBarAdvisor.java
index a5acfe528..3f4b2cabe 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapActionBarAdvisor.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapActionBarAdvisor.java
@@ -19,7 +19,7 @@ import org.eclipse.ui.commands.ICommandService;
/** Eclipse rap specific action bar advisor */
public class RapActionBarAdvisor extends ActionBarAdvisor {
private final static String ID_BASE = SecureRapActivator.ID;
- // private final static Log log = LogFactory
+ // private final static CmsLog log = CmsLog
// .getLog(SecureActionBarAdvisor.class);
/** Null means anonymous */
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 956f967e2..d471703f7 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
@@ -6,14 +6,10 @@ import java.util.Locale;
import javax.security.auth.Subject;
import javax.security.auth.x500.X500Principal;
-import org.argeo.cms.CmsMsg;
import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.client.service.JavaScriptExecutor;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
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 fad2d9f13..4eaaef79d 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
@@ -8,14 +8,10 @@ import javax.security.auth.x500.X500Principal;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.argeo.cms.CmsMsg;
import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.ui.util.CmsUiUtils;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.client.service.JavaScriptExecutor;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/.classpath b/legacy/argeo-commons/org.argeo.cms.ui.workbench/.classpath
index 457b11571..e03d341b1 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/.classpath
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/.classpath
@@ -4,6 +4,6 @@
+ path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11" />
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 9f72ed253..17fd7f5b4 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 @@
-
+
-
+
@@ -30,8 +30,6 @@
-
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 3c3220099..d18de037a 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
@@ -4,14 +4,13 @@ import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
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.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.CmsException;
/** Provides base method for executing code with system authorization. */
abstract class AbstractSystemExecution {
- private final static Log log = LogFactory.getLog(AbstractSystemExecution.class);
+ private final static CmsLog log = CmsLog.getLog(AbstractSystemExecution.class);
private final Subject subject = new Subject();
/** Authenticate the calling thread */
@@ -19,7 +18,7 @@ abstract class AbstractSystemExecution {
ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
try {
- LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject);
+ LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject);
lc.login();
} catch (LoginException e) {
throw new CmsException("Cannot login as system", e);
@@ -34,7 +33,7 @@ abstract class AbstractSystemExecution {
ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
try {
- LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject);
+ LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject);
lc.logout();
} catch (LoginException e) {
throw new CmsException("Cannot logout as system", e);
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/SimpleRoleRegistration.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/SimpleRoleRegistration.java
index 462621622..ea59c594e 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/SimpleRoleRegistration.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/SimpleRoleRegistration.java
@@ -7,8 +7,7 @@ import java.util.Map;
import javax.naming.InvalidNameException;
import javax.naming.ldap.LdapName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.CmsException;
import org.argeo.osgi.transaction.WorkTransaction;
import org.osgi.service.useradmin.Role;
@@ -19,7 +18,7 @@ import org.osgi.service.useradmin.UserAdmin;
* is already registered.
*/
public class SimpleRoleRegistration implements Runnable {
- private final static Log log = LogFactory.getLog(SimpleRoleRegistration.class);
+ private final static CmsLog log = CmsLog.getLog(SimpleRoleRegistration.class);
private String role;
private List roles = new ArrayList();
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java
index f085d6a23..e10ea0606 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java
@@ -1,7 +1,6 @@
package org.argeo.cms.spring.osgi;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -11,7 +10,7 @@ import org.osgi.framework.Constants;
* {@link BundleContext}.
*/
public class OsgiModuleLabel {
- private final static Log log = LogFactory.getLog(OsgiModuleLabel.class);
+ private final static CmsLog log = CmsLog.getLog(OsgiModuleLabel.class);
private Bundle bundle;
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/AbstractLoginDialog.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/AbstractLoginDialog.java
index b2a46a391..8d965b827 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/AbstractLoginDialog.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/AbstractLoginDialog.java
@@ -8,8 +8,7 @@ import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -28,7 +27,7 @@ import org.osgi.framework.FrameworkUtil;
public abstract class AbstractLoginDialog extends TrayDialog implements CallbackHandler {
private static final long serialVersionUID = -8046708963512717709L;
- private final static Log log = LogFactory.getLog(AbstractLoginDialog.class);
+ private final static CmsLog log = CmsLog.getLog(AbstractLoginDialog.class);
private Thread modalContextThread = null;
boolean processCallbacks = false;
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 5d2232829..a95275ee0 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
@@ -7,8 +7,7 @@ import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.CmsException;
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
@@ -21,7 +20,7 @@ import org.osgi.framework.ServiceRegistration;
/** The activator class controls the plug-in life cycle */
public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener {
- private final static Log log = LogFactory.getLog(WorkbenchUiPlugin.class);
+ private final static CmsLog log = CmsLog.getLog(WorkbenchUiPlugin.class);
// The plug-in ID
public final static String PLUGIN_ID = "org.argeo.cms.ui.workbench"; //$NON-NLS-1$
@@ -129,7 +128,7 @@ public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener
}
public void logging(IStatus status, String plugin) {
- Log pluginLog = LogFactory.getLog(plugin);
+ CmsLog pluginLog = CmsLog.getLog(plugin);
Integer severity = status.getSeverity();
if (severity == IStatus.ERROR)
pluginLog.error(status.getMessage(), status.getException());
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 92548a6c9..73a56c688 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
@@ -15,10 +15,9 @@ import javax.naming.ldap.LdapName;
import javax.security.auth.Subject;
import javax.security.auth.x500.X500Principal;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.security.CryptoKeyring;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.CmsException;
+import org.argeo.cms.security.CryptoKeyring;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
import org.argeo.osgi.transaction.WorkTransaction;
import org.eclipse.core.commands.AbstractHandler;
@@ -42,7 +41,7 @@ import org.osgi.service.useradmin.UserAdmin;
/** Open the change password dialog */
public class OpenChangePasswordDialog extends AbstractHandler {
- private final static Log log = LogFactory.getLog(OpenChangePasswordDialog.class);
+ private final static CmsLog log = CmsLog.getLog(OpenChangePasswordDialog.class);
private UserAdmin userAdmin;
private WorkTransaction userTransaction;
private CryptoKeyring keyring = null;
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 8ae330c6c..80c121746 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
@@ -9,11 +9,11 @@ import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
-import org.argeo.api.NodeConstants;
-import org.argeo.api.security.Keyring;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.ArgeoTypes;
import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.security.Keyring;
import org.argeo.cms.ui.workbench.internal.WorkbenchConstants;
import org.argeo.cms.ui.workbench.util.CommandUtils;
import org.argeo.eclipse.ui.EclipseUiException;
@@ -123,7 +123,7 @@ public class AddRemoteRepository extends AbstractHandler implements WorkbenchCon
String checkedUriStr = checkedUri.toString();
Hashtable params = new Hashtable();
- params.put(NodeConstants.LABELED_URI, checkedUriStr);
+ params.put(CmsConstants.LABELED_URI, checkedUriStr);
Repository repository = repositoryFactory.getRepository(params);
if (username.getText().trim().equals("")) {// anonymous
// FIXME make it more generic
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java
index d31674afa..d49067f85 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java
@@ -22,7 +22,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
/** Compute an approximative size for the selected node(s) */
public class GetNodeSize extends AbstractHandler {
- // private final static Log log = LogFactory.getLog(GetNodeSize.class);
+ // private final static CmsLog log = CmsLog.getLog(GetNodeSize.class);
public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".getNodeSize";
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/UploadFiles.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/UploadFiles.java
index dcc0d0ebc..236b2c92e 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/UploadFiles.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/UploadFiles.java
@@ -31,7 +31,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
/** Upload local file(s) under the currently selected node */
public class UploadFiles extends AbstractHandler {
- // private final static Log log = LogFactory.getLog(ImportFileSystem.class);
+ // private final static CmsLog log = CmsLog.getLog(ImportFileSystem.class);
public Object execute(ExecutionEvent event) throws ExecutionException {
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
index 7f97d5806..e9d531504 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
@@ -9,8 +9,7 @@ import javax.jcr.query.QueryResult;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.eclipse.ui.EclipseUiException;
import org.argeo.eclipse.ui.GenericTableComparator;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -40,7 +39,7 @@ import org.eclipse.ui.part.EditorPart;
/** Executes any JCR query. */
public abstract class AbstractJcrQueryEditor extends EditorPart {
- private final static Log log = LogFactory.getLog(AbstractJcrQueryEditor.class);
+ private final static CmsLog log = CmsLog.getLog(AbstractJcrQueryEditor.class);
protected String initialQuery;
protected String initialQueryType;
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java
index b11554c00..da7e7d478 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java
@@ -25,7 +25,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
/** List all children of the current node */
public class ChildNodesPage extends FormPage {
- // private final static Log log = LogFactory.getLog(ChildNodesPage.class);
+ // private final static CmsLog log = CmsLog.getLog(ChildNodesPage.class);
private Node currentNode;
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java
index 367655951..3cf8dc5cf 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java
@@ -13,7 +13,7 @@ import javax.jcr.PropertyIterator;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import org.argeo.cms.ui.CmsConstants;
+import org.argeo.cms.ui.CmsUiConstants;
import org.argeo.cms.ui.workbench.internal.WorkbenchConstants;
import org.argeo.eclipse.ui.EclipseUiException;
import org.argeo.jcr.JcrUtils;
@@ -39,13 +39,13 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
*/
public class GenericNodePage extends FormPage implements WorkbenchConstants {
- // private final static Log log = LogFactory.getLog(GenericNodePage.class);
+ // private final static CmsLog log = CmsLog.getLog(GenericNodePage.class);
// local constants
private final static String JCR_PROPERTY_NAME = "jcr:name";
// Utils
- protected DateFormat timeFormatter = new SimpleDateFormat(CmsConstants.DATE_TIME_FORMAT);
+ protected DateFormat timeFormatter = new SimpleDateFormat(CmsUiConstants.DATE_TIME_FORMAT);
// Main business Objects
private Node currentNode;
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
index fa90a424f..f066e30ee 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
@@ -18,7 +18,7 @@ import javax.jcr.version.VersionHistory;
import javax.jcr.version.VersionIterator;
import javax.jcr.version.VersionManager;
-import org.argeo.cms.ui.CmsConstants;
+import org.argeo.cms.ui.CmsUiConstants;
import org.argeo.cms.ui.jcr.FullVersioningTreeContentProvider;
import org.argeo.cms.ui.jcr.JcrDClickListener;
import org.argeo.cms.ui.jcr.VersionLabelProvider;
@@ -51,11 +51,11 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
* enable browsing
*/
public class NodeVersionHistoryPage extends FormPage implements WorkbenchConstants {
- // private final static Log log = LogFactory
+ // private final static CmsLog log = CmsLog
// .getLog(NodeVersionHistoryPage.class);
// Utils
- protected DateFormat timeFormatter = new SimpleDateFormat(CmsConstants.DATE_TIME_FORMAT);
+ protected DateFormat timeFormatter = new SimpleDateFormat(CmsUiConstants.DATE_TIME_FORMAT);
// business objects
private Node currentNode;
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java
index 28e82c5d7..23d1f4b28 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java
@@ -10,7 +10,7 @@ import org.eclipse.ui.PlatformUI;
/** Manage transaction and part refresh while updating the security model */
public class PartStateChanged implements IPartListener, IStartup {
- // private final static Log log = LogFactory.getLog(PartStateChanged.class);
+ // private final static CmsLog log = CmsLog.getLog(PartStateChanged.class);
// private IContextActivation contextActivation;
@Override
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 67c1c7a9b..c4b6a3c00 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
@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.CmsException;
import org.argeo.osgi.transaction.WorkTransaction;
import org.argeo.osgi.useradmin.UserAdminConf;
@@ -94,7 +94,7 @@ public class UserAdminWrapper {
if (onlyWritable && "true".equals(readOnly))
continue;
- if (baseDn.equalsIgnoreCase(NodeConstants.ROLES_BASEDN))
+ if (baseDn.equalsIgnoreCase(CmsConstants.ROLES_BASEDN))
continue;
dns.put(baseDn, uri);
}
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java
index a7782b765..d3ccbe3ea 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java
@@ -9,8 +9,8 @@ import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.naming.LdapAttrs;
import org.argeo.osgi.useradmin.UserAdminConf;
+import org.argeo.util.naming.LdapAttrs;
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/useradmin/commands/NewUser.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java
index bccfff139..de86e88f7 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java
@@ -16,8 +16,8 @@ import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
import org.argeo.cms.auth.UserAdminUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.naming.LdapAttrs;
import org.argeo.osgi.useradmin.UserAdminConf;
+import org.argeo.util.naming.LdapAttrs;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
@@ -40,7 +40,7 @@ import org.osgi.service.useradmin.UserAdminEvent;
/** Open a wizard that enables creation of a new user. */
public class NewUser extends AbstractHandler {
- // private final static Log log = LogFactory.getLog(NewUser.class);
+ // private final static CmsLog log = CmsLog.getLog(NewUser.class);
public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".newUser";
/* DEPENDENCY INJECTION */
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 a226c134c..2706bea1b 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
@@ -1,9 +1,9 @@
package org.argeo.cms.ui.workbench.internal.useradmin.parts;
-import static org.argeo.api.NodeInstance.WORKGROUP;
+import static org.argeo.api.cms.CmsData.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.util.naming.LdapAttrs.businessCategory;
+import static org.argeo.util.naming.LdapAttrs.description;
import java.util.ArrayList;
import java.util.Iterator;
@@ -16,7 +16,7 @@ import javax.jcr.Session;
import javax.naming.InvalidNameException;
import javax.naming.ldap.LdapName;
-import org.argeo.api.NodeInstance;
+import org.argeo.api.cms.CmsData;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.CmsException;
import org.argeo.cms.auth.UserAdminUtils;
@@ -36,8 +36,8 @@ 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.osgi.transaction.WorkTransaction;
+import org.argeo.util.naming.LdapAttrs;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -85,12 +85,12 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
final static String ID = "GroupEditor.mainPage";
private final UserEditor editor;
- private final NodeInstance nodeInstance;
+ private final CmsData nodeInstance;
private final UserAdminWrapper userAdminWrapper;
private final Session session;
public GroupMainPage(FormEditor editor, UserAdminWrapper userAdminWrapper, Repository repository,
- NodeInstance nodeInstance) {
+ CmsData nodeInstance) {
super(editor, ID, "Main");
try {
session = repository.login();
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 46c891f52..23ad3abe7 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
@@ -3,9 +3,8 @@ package org.argeo.cms.ui.workbench.internal.useradmin.parts;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.CmsException;
import org.argeo.cms.auth.CurrentUser;
@@ -20,8 +19,8 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultD
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.naming.LdapObjs;
+import org.argeo.util.naming.LdapAttrs;
+import org.argeo.util.naming.LdapObjs;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
@@ -43,7 +42,7 @@ import org.osgi.service.useradmin.UserAdminListener;
/** List all groups with filter */
public class GroupsView extends ViewPart implements ArgeoNames {
- private final static Log log = LogFactory.getLog(GroupsView.class);
+ private final static CmsLog log = CmsLog.getLog(GroupsView.class);
public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".groupsView";
/* DEPENDENCY INJECTION */
@@ -132,14 +131,14 @@ public class GroupsView extends ViewPart implements ArgeoNames {
public MyUserTableViewer(Composite parent, int style) {
super(parent, style);
- showSystemRoles = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN);
+ showSystemRoles = CurrentUser.isInRole(CmsConstants.ROLE_ADMIN);
}
protected void populateStaticFilters(Composite staticFilterCmp) {
staticFilterCmp.setLayout(new GridLayout());
final Button showSystemRoleBtn = new Button(staticFilterCmp, SWT.CHECK);
showSystemRoleBtn.setText("Show system roles");
- showSystemRoles = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN);
+ showSystemRoles = CurrentUser.isInRole(CmsConstants.ROLE_ADMIN);
showSystemRoleBtn.setSelection(showSystemRoles);
showSystemRoleBtn.addSelectionListener(new SelectionAdapter() {
@@ -172,7 +171,7 @@ public class GroupsView extends ViewPart implements ArgeoNames {
builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=")
.append(LdapObjs.groupOfNames.name()).append(")");
if (!showSystemRoles)
- builder.append("(!(").append(LdapAttrs.DN).append("=*").append(NodeConstants.ROLES_BASEDN)
+ builder.append("(!(").append(LdapAttrs.DN).append("=*").append(CmsConstants.ROLES_BASEDN)
.append("))");
builder.append("(|");
builder.append(tmpBuilder.toString());
@@ -181,7 +180,7 @@ public class GroupsView extends ViewPart implements ArgeoNames {
if (!showSystemRoles)
builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=")
.append(LdapObjs.groupOfNames.name()).append(")(!(").append(LdapAttrs.DN).append("=*")
- .append(NodeConstants.ROLES_BASEDN).append(")))");
+ .append(CmsConstants.ROLES_BASEDN).append(")))");
else
builder.append("(").append(LdapAttrs.objectClass.name()).append("=")
.append(LdapObjs.groupOfNames.name()).append(")");
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 a6f9c4b3d..9e3b06884 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
@@ -5,9 +5,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.CmsException;
import org.argeo.cms.auth.CurrentUser;
import org.argeo.cms.auth.UserAdminUtils;
@@ -20,9 +19,9 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
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.naming.LdapObjs;
import org.argeo.osgi.transaction.WorkTransaction;
+import org.argeo.util.naming.LdapAttrs;
+import org.argeo.util.naming.LdapObjs;
import org.eclipse.jface.dialogs.IPageChangeProvider;
import org.eclipse.jface.dialogs.IPageChangedListener;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -49,7 +48,7 @@ import org.osgi.service.useradmin.UserAdminEvent;
/** Wizard to update users */
public class UserBatchUpdateWizard extends Wizard {
- private final static Log log = LogFactory.getLog(UserBatchUpdateWizard.class);
+ private final static CmsLog log = CmsLog.getLog(UserBatchUpdateWizard.class);
private UserAdminWrapper userAdminWrapper;
// pages
@@ -465,7 +464,7 @@ public class UserBatchUpdateWizard extends Wizard {
columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200));
// Only show technical DN to admin
- if (CurrentUser.isInRole(NodeConstants.ROLE_ADMIN))
+ if (CurrentUser.isInRole(CmsConstants.ROLE_ADMIN))
columnDefs.add(new ColumnDefinition(new UserNameLP(), "Distinguished Name", 300));
userTableCmp = new ChooseUserTableViewer(pageCmp, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
@@ -564,7 +563,7 @@ public class UserBatchUpdateWizard extends Wizard {
columnDefs.add(new ColumnDefinition(new MailLP(), "E-mail", 150));
columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200));
// Only show technical DN to admin
- if (CurrentUser.isInRole(NodeConstants.ROLE_ADMIN))
+ if (CurrentUser.isInRole(CmsConstants.ROLE_ADMIN))
columnDefs.add(new ColumnDefinition(new UserNameLP(), "Distinguished Name", 300));
userTableCmp = new ChosenUsersTableViewer(pageCmp, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
userTableCmp.setLayoutData(EclipseUiUtils.fillAll());
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 3acd1850a..ae72fb723 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
@@ -5,13 +5,13 @@ import java.util.List;
import javax.jcr.Repository;
-import org.argeo.api.NodeInstance;
+import org.argeo.api.cms.CmsData;
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.util.naming.LdapAttrs;
import org.argeo.cms.auth.UserAdminUtils;
-import org.argeo.naming.LdapAttrs;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -39,7 +39,7 @@ public class UserEditor extends FormEditor {
private Repository repository;
private UserAdminWrapper userAdminWrapper;
private UserAdmin userAdmin;
- private NodeInstance nodeInstance;
+ private CmsData nodeInstance;
// Context
private User user;
@@ -207,7 +207,7 @@ public class UserEditor extends FormEditor {
this.repository = repository;
}
- public void setNodeInstance(NodeInstance nodeInstance) {
+ public void setNodeInstance(CmsData nodeInstance) {
this.nodeInstance = nodeInstance;
}
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 8a6da7d65..59051d2f2 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
@@ -1,17 +1,17 @@
package org.argeo.cms.ui.workbench.internal.useradmin.parts;
import static org.argeo.cms.auth.UserAdminUtils.getProperty;
-import static org.argeo.naming.LdapAttrs.cn;
-import static org.argeo.naming.LdapAttrs.givenName;
-import static org.argeo.naming.LdapAttrs.mail;
-import static org.argeo.naming.LdapAttrs.sn;
-import static org.argeo.naming.LdapAttrs.uid;
+import static org.argeo.util.naming.LdapAttrs.cn;
+import static org.argeo.util.naming.LdapAttrs.givenName;
+import static org.argeo.util.naming.LdapAttrs.mail;
+import static org.argeo.util.naming.LdapAttrs.sn;
+import static org.argeo.util.naming.LdapAttrs.uid;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.auth.CurrentUser;
import org.argeo.cms.ui.workbench.CmsWorkbenchStyles;
@@ -29,7 +29,7 @@ import org.argeo.cms.swt.CmsSwtUtils;
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.util.naming.LdapAttrs;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -355,7 +355,7 @@ public class UserMainPage extends FormPage implements ArgeoNames {
staticFilterCmp.setLayout(new GridLayout());
showSystemRoleBtn = new Button(staticFilterCmp, SWT.CHECK);
showSystemRoleBtn.setText("Show system roles");
- boolean showSysRole = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN);
+ boolean showSysRole = CurrentUser.isInRole(CmsConstants.ROLE_ADMIN);
showSystemRoleBtn.setSelection(showSysRole);
userFilter.setShowSystemRole(showSysRole);
showSystemRoleBtn.addSelectionListener(new SelectionAdapter() {
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 b09d59eed..eeab612f3 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
@@ -3,7 +3,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.api.cms.CmsConstants;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.CmsException;
import org.argeo.cms.auth.CurrentUser;
@@ -19,8 +19,8 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultD
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.naming.LdapObjs;
+import org.argeo.util.naming.LdapAttrs;
+import org.argeo.util.naming.LdapObjs;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
@@ -37,7 +37,7 @@ import org.osgi.service.useradmin.UserAdminListener;
/** List all users with filter - based on Ldif userAdmin */
public class UsersView extends ViewPart implements ArgeoNames {
- // private final static Log log = LogFactory.getLog(UsersView.class);
+ // private final static CmsLog log = CmsLog.getLog(UsersView.class);
public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".usersView";
@@ -61,7 +61,7 @@ public class UsersView extends ViewPart implements ArgeoNames {
columnDefs.add(new ColumnDefinition(new MailLP(), "E-mail", 150));
columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200));
// Only show technical DN to admin
- if (CurrentUser.isInRole(NodeConstants.ROLE_ADMIN))
+ if (CurrentUser.isInRole(CmsConstants.ROLE_ADMIN))
columnDefs.add(new ColumnDefinition(new UserNameLP(),
"Distinguished Name", 300));
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java
index cae230593..793ce4436 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java
@@ -1,7 +1,7 @@
package org.argeo.cms.ui.workbench.internal.useradmin.providers;
import org.argeo.cms.auth.UserAdminUtils;
-import org.argeo.naming.LdapAttrs;
+import org.argeo.util.naming.LdapAttrs;
import org.osgi.service.useradmin.User;
/** Simply declare a label provider that returns the common name of a user */
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java
index c411bd20f..e5d8bca33 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java
@@ -1,7 +1,7 @@
package org.argeo.cms.ui.workbench.internal.useradmin.providers;
import org.argeo.cms.auth.UserAdminUtils;
-import org.argeo.naming.LdapAttrs;
+import org.argeo.util.naming.LdapAttrs;
import org.osgi.service.useradmin.User;
/** Simply declare a label provider that returns the Primary Mail of a user */
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 bd2260bb3..7658be866 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.util.naming.LdapAttrs;
+import org.argeo.api.cms.CmsData;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.auth.UserAdminUtils;
-import org.argeo.naming.LdapAttrs;
import org.eclipse.swt.graphics.Image;
import org.osgi.service.useradmin.Role;
import org.osgi.service.useradmin.User;
@@ -22,11 +22,11 @@ public class RoleIconLP extends UserAdminAbstractLP {
public Image getImage(Object element) {
User user = (User) element;
String dn = user.getName();
- if (dn.endsWith(NodeConstants.ROLES_BASEDN))
+ if (dn.endsWith(CmsConstants.ROLES_BASEDN))
return SecurityAdminImages.ICON_ROLE;
else if (user.getType() == Role.GROUP) {
String businessCategory = UserAdminUtils.getProperty(user, LdapAttrs.businessCategory);
- if (businessCategory != null && businessCategory.equals(NodeInstance.WORKGROUP))
+ if (businessCategory != null && businessCategory.equals(CmsData.WORKGROUP))
return SecurityAdminImages.ICON_WORKGROUP;
return SecurityAdminImages.ICON_GROUP;
} else
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 36278743a..a8261c5b3 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.api.cms.CmsConstants;
import org.argeo.cms.auth.UserAdminUtils;
-import org.argeo.naming.LdapAttrs;
+import org.argeo.util.naming.LdapAttrs;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.osgi.service.useradmin.User;
@@ -37,7 +37,7 @@ public class UserFilter extends ViewerFilter {
@Override
public boolean select(Viewer viewer, Object parentElement, Object element) {
User user = (User) element;
- if (!showSystemRole && user.getName().matches(".*(" + NodeConstants.ROLES_BASEDN + ")"))
+ if (!showSystemRole && user.getName().matches(".*(" + CmsConstants.ROLES_BASEDN + ")"))
// UserAdminUtils.getProperty(user, LdifName.dn.name())
// .toLowerCase().endsWith(AuthConstants.ROLES_BASEDN))
return false;
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java
index 71abe0120..f9b04a93a 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java
@@ -3,8 +3,7 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.CmsException;
import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
import org.argeo.osgi.transaction.WorkTransaction;
@@ -13,7 +12,7 @@ import org.eclipse.ui.ISources;
/** Observe and notify UI on UserTransaction state changes */
public class UserTransactionProvider extends AbstractSourceProvider {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(UserTransactionProvider.class);
public final static String TRANSACTION_STATE = WorkbenchUiPlugin.PLUGIN_ID
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 ee6263f0e..9368e1c9c 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
@@ -13,8 +13,8 @@ import javax.jcr.observation.Event;
import javax.jcr.observation.EventListener;
import javax.jcr.observation.ObservationManager;
-import org.argeo.api.NodeConstants;
-import org.argeo.api.security.Keyring;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.cms.security.Keyring;
import org.argeo.cms.ui.jcr.DefaultRepositoryRegister;
import org.argeo.cms.ui.jcr.JcrBrowserUtils;
import org.argeo.cms.ui.jcr.JcrDClickListener;
@@ -84,7 +84,7 @@ public class JcrBrowserView extends ViewPart {
top.setLayout(gl);
try {
- this.userSession = this.nodeRepository.login(NodeConstants.HOME_WORKSPACE);
+ this.userSession = this.nodeRepository.login(CmsConstants.HOME_WORKSPACE);
} catch (RepositoryException e) {
throw new EclipseUiException("Cannot open user session", e);
}
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/legacy/rap/OpenFile.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/legacy/rap/OpenFile.java
index 4fe850826..616dadcf6 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/legacy/rap/OpenFile.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/legacy/rap/OpenFile.java
@@ -1,7 +1,6 @@
package org.argeo.cms.ui.workbench.legacy.rap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.rap.rwt.RWT;
@@ -25,7 +24,7 @@ import org.eclipse.rap.rwt.client.service.UrlLauncher;
*
*/
public class OpenFile extends AbstractHandler {
- private final static Log log = LogFactory.getLog(OpenFile.class);
+ private final static CmsLog log = CmsLog.getLog(OpenFile.class);
public final static String ID = SingleSourcingConstants.OPEN_FILE_CMD_ID;
public final static String PARAM_FILE_NAME = SingleSourcingConstants.PARAM_FILE_NAME;
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 cdc0e8b58..55a868bcd 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
@@ -2,7 +2,7 @@ package org.argeo.cms.ui.workbench.useradmin;
import java.util.ArrayList;
-import org.argeo.api.ArgeoLogger;
+import org.argeo.cms.ArgeoLogger;
import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.LabelProvider;
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 b65313cc7..84884c65e 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
@@ -7,7 +7,7 @@ import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import org.argeo.api.ArgeoLogListener;
+import org.argeo.cms.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 b95de6a2a..1af2740a4 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
@@ -2,8 +2,8 @@ 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.ArgeoLogListener;
+import org.argeo.cms.ArgeoLogger;
import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.LabelProvider;
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java
index 81e8d9edf..2bd54d144 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java
@@ -2,8 +2,7 @@ package org.argeo.eclipse.spring;
import static java.text.MessageFormat.format;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.eclipse.core.runtime.Platform;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -15,7 +14,7 @@ import org.springframework.context.ApplicationContext;
/** Tracks Spring application context published as services. */
class ApplicationContextTracker {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(ApplicationContextTracker.class);
private static final String FILTER = "(&(objectClass=org.springframework.context.ApplicationContext)" //$NON-NLS-1$
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java
index 0fb40b0cf..361ff23e5 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java
@@ -1,7 +1,6 @@
package org.argeo.eclipse.spring;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.eclipse.ui.EclipseUiException;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
@@ -11,7 +10,7 @@ import org.springframework.context.ApplicationContext;
/** Allows to declare Eclipse commands as Spring beans */
public class SpringCommandHandler implements IHandler {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(SpringCommandHandler.class);
public void addHandlerListener(IHandlerListener handlerListener) {
diff --git a/legacy/org.argeo.slc.client.rap/.classpath b/legacy/org.argeo.slc.client.rap/.classpath
index 06bea9468..a76fff418 100644
--- a/legacy/org.argeo.slc.client.rap/.classpath
+++ b/legacy/org.argeo.slc.client.rap/.classpath
@@ -2,6 +2,6 @@
- >>
+ >>
diff --git a/legacy/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs b/legacy/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8b45224bc..000000000
--- a/legacy/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu Apr 14 17:49:18 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/legacy/org.argeo.slc.client.rap/META-INF/spring/osgi.xml b/legacy/org.argeo.slc.client.rap/META-INF/spring/osgi.xml
index 6c7654620..0202c77e3 100644
--- a/legacy/org.argeo.slc.client.rap/META-INF/spring/osgi.xml
+++ b/legacy/org.argeo.slc.client.rap/META-INF/spring/osgi.xml
@@ -17,5 +17,5 @@
+ interface="org.argeo.cms.security.CryptoKeyring" />
diff --git a/legacy/org.argeo.slc.client.rap/bnd.bnd b/legacy/org.argeo.slc.client.rap/bnd.bnd
index 7b46665df..518826108 100644
--- a/legacy/org.argeo.slc.client.rap/bnd.bnd
+++ b/legacy/org.argeo.slc.client.rap/bnd.bnd
@@ -12,5 +12,6 @@ javax.servlet.http,\
org.argeo.eclipse.spring,\
org.argeo.slc.repo.core,\
org.argeo.cms.ui.util,\
+org.argeo.api.cms,\
*
\ No newline at end of file
diff --git a/legacy/org.argeo.slc.client.ui.dist/.classpath b/legacy/org.argeo.slc.client.ui.dist/.classpath
index 120e381bb..7c32a3ec0 100644
--- a/legacy/org.argeo.slc.client.ui.dist/.classpath
+++ b/legacy/org.argeo.slc.client.ui.dist/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.jdt.core.prefs b/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7c5d41949..000000000
--- a/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Dec 08 08:27:02 CET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.pde.core.prefs b/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 0e2e53753..000000000
--- a/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Dec 08 08:27:02 CET 2010
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/legacy/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml b/legacy/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
index 324c66f8b..7c33b1399 100644
--- a/legacy/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
+++ b/legacy/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
@@ -12,7 +12,7 @@
filter="(cn=java)" />
-
+
diff --git a/legacy/org.argeo.slc.client.ui.dist/bnd.bnd b/legacy/org.argeo.slc.client.ui.dist/bnd.bnd
index b075699aa..d4ed89c61 100644
--- a/legacy/org.argeo.slc.client.ui.dist/bnd.bnd
+++ b/legacy/org.argeo.slc.client.ui.dist/bnd.bnd
@@ -10,7 +10,7 @@ Import-Package: org.argeo.eclipse.spring,\
javax.jcr.nodetype,\
javax.jcr.security,\
aQute.lib.*;resolution:=optional,\
+org.springframework.beans.factory,\
org.osgi.*;version=0.0.0,\
-org.argeo.api,\
*
\ No newline at end of file
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
index 27ed484ae..c9bd5590f 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
@@ -6,8 +6,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.security.Privilege;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.ui.workbench.util.PrivilegedJob;
import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
import org.argeo.jcr.JcrMonitor;
@@ -37,7 +36,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
* JavaRepoManager.
*/
public class CopyLocalJavaWorkspace extends AbstractHandler {
- private static final Log log = LogFactory
+ private static final CmsLog log = CmsLog
.getLog(CopyLocalJavaWorkspace.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".copyLocalJavaWorkspace";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
index 87db6674b..2618c5c98 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
@@ -8,9 +8,8 @@ import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
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.api.cms.CmsLog;
+import org.argeo.cms.security.Keyring;
import org.argeo.cms.ui.workbench.util.PrivilegedJob;
import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
import org.argeo.jcr.JcrMonitor;
@@ -36,7 +35,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
/** Create a copy of the chosen workspace in a remote repository */
public class CopyWorkspace extends AbstractHandler {
- private static final Log log = LogFactory.getLog(CopyWorkspace.class);
+ private static final CmsLog log = CmsLog.getLog(CopyWorkspace.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".copyWorkspace";
public final static String DEFAULT_LABEL = "Duplicate...";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java
index dd15ecf10..4972bc38e 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java
@@ -1,7 +1,6 @@
package org.argeo.slc.client.ui.dist.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
import org.argeo.slc.client.ui.dist.DistPlugin;
import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
@@ -16,7 +15,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
/** Create a new empty workspace in the default local java repository */
public class CreateLocalJavaWorkspace extends AbstractHandler {
- private static final Log log = LogFactory
+ private static final CmsLog log = CmsLog
.getLog(CreateLocalJavaWorkspace.class);
// Exposes commands meta-info
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
index 9934c8689..c034ef641 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
@@ -8,9 +8,8 @@ import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
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.api.cms.CmsLog;
+import org.argeo.cms.security.Keyring;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcConstants;
@@ -27,7 +26,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
/** Create a new empty workspace in a remote repository */
public class CreateWorkspace extends AbstractHandler {
- private static final Log log = LogFactory.getLog(CreateWorkspace.class);
+ private static final CmsLog log = CmsLog.getLog(CreateWorkspace.class);
// Exposes commands meta-info
public final static String ID = DistPlugin.PLUGIN_ID + ".createWorkspace";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
index 4caf2b526..bc80827e6 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
@@ -21,7 +21,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
/** Delete chosen artifacts from the current workspace */
public class DeleteArtifacts extends AbstractHandler {
- // private static final Log log = LogFactory.getLog(DeleteWorkspace.class);
+ // private static final CmsLog log = CmsLog.getLog(DeleteWorkspace.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".deleteArtifacts";
public final static String DEFAULT_LABEL = "Delete selected items";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
index 4707fc0e6..c2f862d85 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
@@ -9,7 +9,7 @@ import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
-import org.argeo.api.security.Keyring;
+import org.argeo.cms.security.Keyring;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
@@ -29,7 +29,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
* {@code NodeType.NT_UNSTRUCTURED}
*/
public class DeleteWorkspace extends AbstractHandler {
- // private static final Log log = LogFactory.getLog(DeleteWorkspace.class);
+ // private static final CmsLog log = CmsLog.getLog(DeleteWorkspace.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".deleteWorkspace";
public final static String DEFAULT_LABEL = "Clear";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java
index 39a9274d8..ab0e42390 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java
@@ -6,7 +6,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
-import org.argeo.api.security.Keyring;
+import org.argeo.cms.security.Keyring;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.dist.DistPlugin;
@@ -25,7 +25,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
* definition of the fetch process parameters
*/
public class Fetch extends AbstractHandler {
- // private final static Log log = LogFactory.getLog(Fetch.class);
+ // private final static CmsLog log = CmsLog.getLog(Fetch.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".fetch";
public final static String DEFAULT_LABEL = "Fetch...";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
index 6a62a62ee..4ba2e0565 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
@@ -10,9 +10,8 @@ import javax.jcr.Session;
import javax.jcr.query.Query;
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.api.cms.CmsLog;
+import org.argeo.cms.security.Keyring;
import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
import org.argeo.jcr.JcrMonitor;
import org.argeo.jcr.JcrUtils;
@@ -29,7 +28,7 @@ import org.eclipse.core.runtime.jobs.Job;
/** Merge two workspaces */
public class MergeWorkspaces extends AbstractHandler {
- private final static Log log = LogFactory.getLog(MergeWorkspaces.class);
+ private final static CmsLog log = CmsLog.getLog(MergeWorkspaces.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".mergeWorkspaces";
public final static String DEFAULT_LABEL = "Merge";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
index 2b9b2d05c..03fd9b6b0 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
@@ -14,9 +14,8 @@ import javax.jcr.query.Query;
import javax.jcr.query.QueryResult;
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.api.cms.CmsLog;
+import org.argeo.cms.security.Keyring;
import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
import org.argeo.jcr.JcrMonitor;
import org.argeo.jcr.JcrUtils;
@@ -59,7 +58,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
/** Legacy - Make sure than Maven and OSGi metadata are consistent */
public class NormalizeDistribution extends AbstractHandler implements SlcNames {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(NormalizeDistribution.class);
public final static String ID = DistPlugin.PLUGIN_ID
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
index 73261fed2..617e0f26d 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
@@ -12,9 +12,8 @@ import javax.jcr.query.Query;
import javax.jcr.query.QueryResult;
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.api.cms.CmsLog;
+import org.argeo.cms.security.Keyring;
import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
import org.argeo.jcr.JcrMonitor;
import org.argeo.jcr.JcrUtils;
@@ -43,7 +42,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
* must sometimes be triggered manually
*/
public class NormalizeWorkspace extends AbstractHandler implements SlcNames {
- private final static Log log = LogFactory.getLog(NormalizeWorkspace.class);
+ private final static CmsLog log = CmsLog.getLog(NormalizeWorkspace.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".normalizeWorkspace";
public final static ImageDescriptor DEFAULT_ICON = DistPlugin.getImageDescriptor("icons/normalize.gif");
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java
index c1b6c12db..19271d116 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java
@@ -15,7 +15,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
/** Open a {@code GenerateBinariesWizard} wizard for the selected node */
public class OpenGenerateBinariesWizard extends AbstractHandler {
- // private static final Log log = LogFactory.getLog(DeleteWorkspace.class);
+ // private static final CmsLog log = CmsLog.getLog(DeleteWorkspace.class);
public final static String ID = DistPlugin.PLUGIN_ID
+ ".openGenerateBinariesWizard";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
index b7a75c53b..c308d8024 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
@@ -8,8 +8,8 @@ import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
import javax.jcr.security.Privilege;
-import org.argeo.api.NodeConstants;
-import org.argeo.api.security.Keyring;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.cms.security.Keyring;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcConstants;
import org.argeo.slc.SlcException;
@@ -23,7 +23,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
/** Publish the current workspace by giving READ_ONLY rights to anonymous */
public class PublishWorkspace extends AbstractHandler {
- // private static final Log log = LogFactory.getLog(PublishWorkspace.class);
+ // private static final CmsLog log = CmsLog.getLog(PublishWorkspace.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".publishWorkspace";
public final static String DEFAULT_LABEL = "Make Public";
@@ -48,7 +48,7 @@ public class PublishWorkspace extends AbstractHandler {
Session session = null;
try {
- nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE);
+ nodeSession = nodeRepository.login(CmsConstants.HOME_WORKSPACE);
Node repoNode = nodeSession.getNode(targetRepoPath);
Repository repository = RepoUtils.getRepository(repositoryFactory,
keyring, repoNode);
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
index f09fd1763..4795ee5de 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
@@ -3,8 +3,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.cms.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/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
index fc336f6fb..cf267194e 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
@@ -14,8 +14,7 @@ import javax.jcr.Session;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
@@ -36,7 +35,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
/** UNDER DEVELOPMENT. Download and prepare an OSGi runtime */
public class RunInOsgi extends AbstractHandler implements SlcNames {
- private final static Log log = LogFactory.getLog(RunInOsgi.class);
+ private final static CmsLog log = CmsLog.getLog(RunInOsgi.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".runInOsgi";
public final static String DEFAULT_LABEL = "Run in OSGi";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java
index 8ff0e4a94..5b610fb80 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java
@@ -6,7 +6,7 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.ArgeoTypes;
import org.argeo.cms.ui.workbench.util.CommandUtils;
import org.argeo.jcr.JcrUtils;
@@ -23,7 +23,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
* the node Repository. It does not affect the repository instance
*/
public class UnregisterRemoteRepo extends AbstractHandler {
- // private static final Log log = LogFactory
+ // private static final CmsLog log = CmsLog
// .getLog(UnregisterRemoteRepo.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".unregisterRemoteRepo";
@@ -42,7 +42,7 @@ public class UnregisterRemoteRepo extends AbstractHandler {
return null;
try {
- session = nodeRepository.login(NodeConstants.HOME_WORKSPACE);
+ session = nodeRepository.login(CmsConstants.HOME_WORKSPACE);
Node rNode = session.getNode(repoPath);
if (rNode.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) {
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java
index 52c537469..67c4674e3 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java
@@ -8,7 +8,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
-import org.argeo.api.security.Keyring;
+import org.argeo.cms.security.Keyring;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.repo.RepoUtils;
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
index c2e9a8e48..05b11c906 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
@@ -12,11 +12,11 @@ import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
-import org.argeo.api.NodeConstants;
-import org.argeo.api.security.Keyring;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.ArgeoTypes;
import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.security.Keyring;
import org.argeo.eclipse.ui.TreeParent;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
@@ -45,7 +45,7 @@ public class DistTreeContentProvider implements ITreeContentProvider {
try {
if (nodeSession != null)
dispose();
- nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE);
+ nodeSession = nodeRepository.login(CmsConstants.HOME_WORKSPACE);
String reposPath = CmsJcrUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
index c300af1ba..103ffa33c 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
@@ -5,8 +5,7 @@ import java.net.URL;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.argeo.slc.SlcNames;
import org.argeo.slc.build.License;
@@ -36,7 +35,7 @@ import org.eclipse.ui.forms.widgets.Section;
/** Show details for a given bundle. */
public class BundleDetailPage extends FormPage implements SlcNames {
- private final static Log log = LogFactory.getLog(BundleDetailPage.class);
+ private final static CmsLog log = CmsLog.getLog(BundleDetailPage.class);
final static String PAGE_ID = "BundleDetailPage";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java
index e377b53c8..0923dcd5d 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java
@@ -49,7 +49,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
*/
public class DistWkspBrowserPage extends FormPage implements DistConstants,
RepoConstants {
- // private final static Log log = LogFactory
+ // private final static CmsLog log = CmsLog
// .getLog(ArtifactsBrowserPage.class);
final static String PAGE_ID = "artifactsBrowserPage";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
index 167cb5a05..fc81214a4 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
@@ -72,7 +72,7 @@ import org.eclipse.ui.forms.widgets.Section;
/** Show all bundles contained in a given workspace as filter-able table */
public class DistWkspSearchPage extends FormPage implements SlcNames {
- // final private static Log log = LogFactory
+ // final private static CmsLog log = CmsLog
// .getLog(DistributionOverviewPage.class);
final static String PAGE_ID = "distributionOverviewPage";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
index 3f8f98d9b..a628496dc 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
@@ -6,7 +6,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
-import org.argeo.api.security.Keyring;
+import org.argeo.cms.security.Keyring;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.SlcNames;
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
index d3ab885ac..5cb97a053 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
@@ -20,8 +20,7 @@ import javax.jcr.query.qom.QueryObjectModelFactory;
import javax.jcr.query.qom.Selector;
import javax.jcr.query.qom.StaticOperand;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.ui.workbench.util.CommandUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.jcr.JcrUtils;
@@ -78,7 +77,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
public class ModularDistVersionOverviewPage extends FormPage implements
SlcNames {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(ModularDistVersionOverviewPage.class);
final static String PAGE_ID = "ModularDistVersionOverviewPage";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
index 7d4ef1f4b..9356f0828 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java
+++ b/legacy/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.NodeConstants;
-import org.argeo.api.security.Keyring;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.security.Keyring;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.repo.RepoConstants;
@@ -23,7 +23,7 @@ import org.argeo.slc.repo.RepoUtils;
* home Node or just an URI and a label if user is anonymous
*/
public class RepoElem extends DistParentElem {
- // private final static Log log = LogFactory.getLog(RepoElem.class);
+ // private final static CmsLog log = CmsLog.getLog(RepoElem.class);
private RepositoryFactory repositoryFactory;
private Keyring keyring;
@@ -93,7 +93,7 @@ public class RepoElem extends DistParentElem {
try {
// FIXME make it more generic
- String defaultWorkspace = NodeConstants.SYS_WORKSPACE;
+ String defaultWorkspace = CmsConstants.SYS_WORKSPACE;
defaultSession = repository.login(credentials, defaultWorkspace);
refreshChildren();
} catch (RepositoryException e) {
@@ -174,7 +174,7 @@ public class RepoElem extends DistParentElem {
protected Session repositoryLogin(String workspaceName) {
try {
if (workspaceName == null)
- workspaceName = NodeConstants.SYS_WORKSPACE;// FIXME make it more generic
+ workspaceName = CmsConstants.SYS_WORKSPACE;// FIXME make it more generic
return repository.login(credentials, workspaceName);
} catch (RepositoryException e) {
throw new SlcException("Cannot login repository " + label + " with credential " + credentials, e);
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
index dcdfc930d..cc6e788ee 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.TableColumn;
*/
public class ArtifactsTableConfigurer implements SlcNames, SlcTypes,
DistConstants {
- // private final static Log log = LogFactory
+ // private final static CmsLog log = CmsLog
// .getLog(ArtifactsTableConfigurer.class);
// Used in the comparator to be able to retrieve the value from a row
// knowing the corresponding column index.
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java
index 14119969f..2977eabf0 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java
@@ -10,8 +10,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.ValueFormatException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.eclipse.ui.GenericTableComparator;
import org.argeo.slc.SlcException;
import org.eclipse.jface.viewers.Viewer;
@@ -20,7 +19,7 @@ import org.eclipse.jface.viewers.Viewer;
public class DistNodeViewerComparator extends GenericTableComparator {
private static final long serialVersionUID = -5966120108210992211L;
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(DistNodeViewerComparator.class);
// Jcr property type goes to 12
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
index b53fe0196..b611e49d6 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
@@ -8,15 +8,14 @@ import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.argeo.slc.SlcNames;
import org.argeo.slc.SlcTypes;
import org.argeo.slc.client.ui.dist.DistConstants;
public class DistUiHelpers implements DistConstants, SlcTypes, SlcNames {
- private final static Log log = LogFactory.getLog(DistUiHelpers.class);
+ private final static CmsLog log = CmsLog.getLog(DistUiHelpers.class);
private final static DateFormat df = new SimpleDateFormat(DATE_TIME_FORMAT);
/**
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
index e6552ebc1..53af8063f 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
@@ -13,8 +13,7 @@ import javax.jcr.query.QueryResult;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.eclipse.ui.GenericTableComparator;
import org.argeo.slc.SlcException;
import org.argeo.slc.SlcTypes;
@@ -39,7 +38,7 @@ import org.eclipse.ui.part.ViewPart;
/** Factorizes useful methods to build a query view in a sashForm */
public abstract class AbstractQueryArtifactsView extends ViewPart implements
SlcTypes {
- private static final Log log = LogFactory
+ private static final CmsLog log = CmsLog
.getLog(AbstractQueryArtifactsView.class);
// shortcuts
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
index b511c4e93..4abfb8634 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
@@ -21,7 +21,7 @@ import org.eclipse.ui.part.ViewPart;
*/
public class AnonymousDistributionsView extends ViewPart implements SlcNames,
ArgeoNames {
- // private final static Log log = LogFactory
+ // private final static CmsLog log = CmsLog
// .getLog(AnonymousDistributionsView.class);
public final static String ID = DistPlugin.PLUGIN_ID
+ ".anonymousDistributionsView";
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
index 9eef47710..da3dfd285 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
@@ -40,7 +40,7 @@ import org.eclipse.ui.part.ViewPart;
public class ArtifactsBrowser extends ViewPart implements DistConstants,
RepoConstants {
- // private final static Log log = LogFactory.getLog(ArtifactsBrowser.class);
+ // private final static CmsLog log = CmsLog.getLog(ArtifactsBrowser.class);
public final static String ID = DistPlugin.PLUGIN_ID + ".artifactsBrowser";
/* DEPENDENCY INJECTION */
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
index 9ce41d477..fcbb3f140 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
@@ -18,7 +18,7 @@ import org.eclipse.swt.widgets.Text;
/** Query SLC Repo to get some artifacts given some predefined parameters */
public class QueryArtifactsForm extends AbstractQueryArtifactsView implements
SlcNames {
- // private static final Log log = LogFactory.getLog(QueryArtifactsForm.class);
+ // private static final CmsLog log = CmsLog.getLog(QueryArtifactsForm.class);
public static final String ID = DistPlugin.PLUGIN_ID + ".queryArtifactsForm";
// widgets
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
index c4980d53f..68e3bec72 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
@@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Text;
/** Query SLC Repo to get some artifacts given some predefined parameters */
public class QueryBundlesForm extends AbstractQueryArtifactsView implements
SlcNames, SlcTypes {
- // private static final Log log = LogFactory.getLog(QueryBundlesForm.class);
+ // private static final CmsLog log = CmsLog.getLog(QueryBundlesForm.class);
public static final String ID = DistPlugin.PLUGIN_ID + ".queryBundlesForm";
// widgets
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
index dfbca8d39..2991f14b5 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
@@ -13,10 +13,10 @@ import javax.jcr.RepositoryException;
import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
-import org.argeo.api.security.Keyring;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.ArgeoTypes;
import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.security.Keyring;
import org.argeo.cms.ui.workbench.util.PrivilegedJob;
import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
import org.argeo.jcr.JcrMonitor;
@@ -62,7 +62,7 @@ import org.eclipse.swt.widgets.Text;
* object.
*/
public class FetchWizard extends Wizard {
- // private final static Log log = LogFactory.getLog(FetchWizard.class);
+ // private final static CmsLog log = CmsLog.getLog(FetchWizard.class);
// Business objects
private Keyring keyring;
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
index 3fbbb2869..8940c0068 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
@@ -8,8 +8,7 @@ import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.cms.ui.workbench.util.PrivilegedJob;
import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
import org.argeo.jcr.JcrMonitor;
@@ -51,7 +50,7 @@ import org.eclipse.swt.widgets.Text;
* artifacts for this group using a {@link GenerateBinaries} runnable
*/
public class GenerateBinariesWizard extends Wizard {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(GenerateBinariesWizard.class);
// Business objects
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
index 31e726a03..b4d920a29 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java
@@ -11,11 +11,11 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import javax.jcr.nodetype.NodeType;
-import org.argeo.api.NodeConstants;
-import org.argeo.api.security.Keyring;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.ArgeoNames;
import org.argeo.cms.ArgeoTypes;
import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.security.Keyring;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
@@ -88,7 +88,7 @@ public class RegisterRepoWizard extends Wizard {
Session nodeSession = null;
try {
- nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE);
+ nodeSession = nodeRepository.login(CmsConstants.HOME_WORKSPACE);
String reposPath = CmsJcrUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH;
Node repos = nodeSession.getNode(reposPath);
diff --git a/legacy/org.argeo.slc.client.ui/.classpath b/legacy/org.argeo.slc.client.ui/.classpath
index 120e381bb..7c32a3ec0 100644
--- a/legacy/org.argeo.slc.client.ui/.classpath
+++ b/legacy/org.argeo.slc.client.ui/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs b/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 95d6b05d7..000000000
--- a/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Wed Aug 04 16:31:36 CEST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.pde.core.prefs b/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 31cbfaeee..000000000
--- a/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jul 27 14:24:51 CEST 2010
-eclipse.preferences.version=1
-resolve.requirebundle=false
diff --git a/legacy/org.argeo.slc.client.ui/bnd.bnd b/legacy/org.argeo.slc.client.ui/bnd.bnd
index d24c331e7..497210cbc 100644
--- a/legacy/org.argeo.slc.client.ui/bnd.bnd
+++ b/legacy/org.argeo.slc.client.ui/bnd.bnd
@@ -7,7 +7,6 @@ org.eclipse.rap.ui.workbench;resolution:=optional
Bundle-Activator: org.argeo.slc.client.ui.ClientUiPlugin
Import-Package: org.argeo.eclipse.spring,\
-org.argeo.api,\
org.eclipse.core.runtime,\
org.osgi.*;version=0.0.0,\
*
diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java
index 7cf8509b7..6b9802702 100644
--- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java
+++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java
@@ -6,8 +6,7 @@ import java.util.Map;
import javax.jcr.Node;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.BasicNameVersion;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
@@ -27,7 +26,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
/** Deletes one or many results */
public class UpdateModule extends AbstractHandler {
- private final static Log log = LogFactory.getLog(UpdateModule.class);
+ private final static CmsLog log = CmsLog.getLog(UpdateModule.class);
private ModulesManager modulesManager;
diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
index 9d91cc544..d8a541230 100644
--- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
+++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
@@ -28,7 +28,7 @@ public class ResultFailedDecorator extends LabelProvider implements
// FIXME why not use? org.eclipse.jface.viewers.DecoratingLabelProvider
- // private final static Log log = LogFactory
+ // private final static CmsLog log = CmsLog
// .getLog(ResultFailedDecorator.class);
private final static DateFormat dateFormat = new SimpleDateFormat(
diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java
index 38db84a3c..022460fbb 100644
--- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java
+++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java
@@ -11,7 +11,7 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
@@ -54,7 +54,7 @@ public class ProcessEditor extends FormEditor implements SlcTypes, SlcNames {
pushSession = new ServerPushSession();
pushSession.start();
try {
- homeSession = repository.login(NodeConstants.HOME_WORKSPACE);
+ homeSession = repository.login(CmsConstants.HOME_WORKSPACE);
agentSession = repository.login();
} catch (RepositoryException e1) {
throw new SlcException("Cannot log in to repository");
diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java
index c6ffcd8d9..79963982b 100644
--- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java
+++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java
@@ -23,7 +23,7 @@ import org.argeo.slc.SlcTypes;
* and keeps a reference to its parent.
*/
public class ParentNodeFolder extends ResultParent {
- // private final static Log log = LogFactory.getLog(ParentNodeFolder.class);
+ // private final static CmsLog log = CmsLog.getLog(ParentNodeFolder.class);
private Node node = null;
diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
index 3c418d63c..5555e9cac 100644
--- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
+++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.swt.graphics.Image;
/** Basic label provider for a tree of result */
public class ResultTreeLabelProvider extends LabelProvider {
- // private final static Log log = LogFactory
+ // private final static CmsLog log = CmsLog
// .getLog(ResultTreeLabelProvider.class);
@Override
diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
index 6ddc1974c..b667ef751 100644
--- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
+++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
@@ -19,8 +19,7 @@ import javax.jcr.observation.Event;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider;
import org.argeo.eclipse.ui.jcr.NodeElementComparer;
@@ -57,7 +56,7 @@ import org.eclipse.ui.part.ViewPart;
/** JCR based view of the execution modules. */
public class JcrExecutionModulesView extends ViewPart implements SlcTypes, SlcNames {
- private final static Log log = LogFactory.getLog(JcrExecutionModulesView.class);
+ private final static CmsLog log = CmsLog.getLog(JcrExecutionModulesView.class);
public static final String ID = ClientUiPlugin.ID + ".jcrExecutionModulesView";
diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java
index 7a921441f..2fcf77b39 100644
--- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java
+++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java
@@ -16,7 +16,7 @@ import javax.jcr.observation.EventListener;
import javax.jcr.observation.ObservationManager;
import javax.jcr.query.Query;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
@@ -65,7 +65,7 @@ public class JcrProcessListView extends ViewPart {
pushSession = new ServerPushSession();
pushSession.start();
try {
- session = repository.login(NodeConstants.HOME_WORKSPACE);
+ session = repository.login(CmsConstants.HOME_WORKSPACE);
} catch (RepositoryException re) {
throw new SlcException("Unable to log in Repository " + repository, re);
}
diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
index 824dcfd72..e74d4c8f6 100644
--- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
+++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
@@ -18,7 +18,7 @@ import javax.jcr.observation.Event;
import javax.jcr.observation.EventListener;
import javax.jcr.observation.ObservationManager;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.ui.workbench.util.CommandUtils;
import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
import org.argeo.jcr.JcrUtils;
@@ -125,7 +125,7 @@ public class JcrResultTreeView extends ViewPart {
@Override
public void createPartControl(Composite parent) {
try {
- session = repository.login(NodeConstants.HOME_WORKSPACE);
+ session = repository.login(CmsConstants.HOME_WORKSPACE);
} catch (RepositoryException e1) {
throw new SlcException("Cannot log in to repository");
}
diff --git a/legacy/org.argeo.slc.spring/bnd.bnd b/legacy/org.argeo.slc.spring/bnd.bnd
index 682a5ea24..4b1e53439 100644
--- a/legacy/org.argeo.slc.spring/bnd.bnd
+++ b/legacy/org.argeo.slc.spring/bnd.bnd
@@ -1,6 +1,5 @@
Import-Package: javax.jcr.nodetype,\
javax.jcr.security,\
-org.argeo.api,\
aQute.bnd.osgi,\
org.apache.tools.ant.*;resolution:="optional",\
junit.framework;resolution:="optional",\
diff --git a/legacy/org.argeo.slc.spring/build.properties b/legacy/org.argeo.slc.spring/build.properties
index 25c77f274..c90717773 100644
--- a/legacy/org.argeo.slc.spring/build.properties
+++ b/legacy/org.argeo.slc.spring/build.properties
@@ -1,8 +1,5 @@
additional.bundles = org.springframework.context,\
org.slf4j.api,\
- org.slf4j.commons.logging,\
- org.slf4j.log4j12,\
- org.apache.log4j,\
org.springframework.aop,\
org.springframework.aspects,\
org.springframework.beans,\
diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/deploy/DefaultResourceSetTest.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/deploy/DefaultResourceSetTest.java
index e433d6694..bf2be685d 100644
--- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/deploy/DefaultResourceSetTest.java
+++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/deploy/DefaultResourceSetTest.java
@@ -2,13 +2,12 @@ package org.argeo.slc.core.deploy;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.core.test.context.AbstractInternalSpringTestCase;
import org.springframework.core.io.Resource;
public class DefaultResourceSetTest extends AbstractInternalSpringTestCase {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(DefaultResourceSetTest.class);
public void testListResources() {
diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java
index 3a5e8a75b..104783780 100644
--- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java
+++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java
@@ -2,8 +2,7 @@ package org.argeo.slc.core.execution;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.execution.ExecutionContext;
import org.argeo.slc.execution.ExecutionFlow;
import org.argeo.slc.runtime.test.SimpleTestResult;
@@ -14,7 +13,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public abstract class AbstractExecutionFlowTestCase extends TestCase {
- protected final Log log = LogFactory.getLog(getClass());
+ protected final CmsLog log = CmsLog.getLog(getClass());
protected void logException(Throwable ex) {
log.info("Got Exception of class " + ex.getClass().toString()
diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/ExceptionIfInitCalledTwice.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/ExceptionIfInitCalledTwice.java
index 7ba7c826a..658ff3424 100644
--- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/ExceptionIfInitCalledTwice.java
+++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/ExceptionIfInitCalledTwice.java
@@ -1,12 +1,11 @@
package org.argeo.slc.core.execution;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.springframework.beans.factory.InitializingBean;
public class ExceptionIfInitCalledTwice implements Runnable, InitializingBean {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(ExceptionIfInitCalledTwice.class);
private Boolean calledOnce = false;
diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/tasks/SystemCallTest.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/tasks/SystemCallTest.java
index b007b9a54..19fb1efa8 100644
--- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/tasks/SystemCallTest.java
+++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/tasks/SystemCallTest.java
@@ -1,11 +1,10 @@
package org.argeo.slc.core.execution.tasks;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.core.execution.AbstractExecutionFlowTestCase;
public class SystemCallTest extends AbstractExecutionFlowTestCase {
- private final static Log log = LogFactory.getLog(SystemCallTest.class);
+ private final static CmsLog log = CmsLog.getLog(SystemCallTest.class);
private final String defFile = "systemCall.xml";
diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/test/context/AbstractInternalSpringTestCase.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/test/context/AbstractInternalSpringTestCase.java
index 507bb41bf..2068dc9a5 100644
--- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/test/context/AbstractInternalSpringTestCase.java
+++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/test/context/AbstractInternalSpringTestCase.java
@@ -4,8 +4,7 @@ import java.util.Map;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.ListableBeanFactory;
@@ -14,7 +13,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
/** Helper for tests using a Spring application context. */
public abstract class AbstractInternalSpringTestCase extends TestCase {
- protected final Log log = LogFactory.getLog(getClass());
+ protected final CmsLog log = CmsLog.getLog(getClass());
private ConfigurableApplicationContext context;
/**
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/ant/AntRun.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/ant/AntRun.java
index 238e2255c..c073b1155 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/ant/AntRun.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/ant/AntRun.java
@@ -7,18 +7,17 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
import org.apache.tools.ant.helper.ProjectHelper2;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.springframework.core.io.Resource;
public class AntRun implements Runnable {
- private final static Log log = LogFactory.getLog(AntRun.class);
+ private final static CmsLog log = CmsLog.getLog(AntRun.class);
private Resource buildFile;
private File baseDir;
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java
index b5c9e3cd4..fc2a2924d 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java
@@ -12,8 +12,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.argeo.slc.attachment.Attachment;
import org.argeo.slc.attachment.AttachmentsStorage;
@@ -22,7 +21,7 @@ import org.springframework.core.io.Resource;
public class FileAttachmentsStorage implements AttachmentsStorage,
AttachmentUploader, InitializingBean {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(FileAttachmentsStorage.class);
private File attachmentsDirectory;
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/DefaultResourceSet.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/DefaultResourceSet.java
index a5b8536df..f131dee89 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/DefaultResourceSet.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/DefaultResourceSet.java
@@ -7,8 +7,7 @@ import java.util.Map;
import java.util.StringTokenizer;
import java.util.TreeMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ResourceLoaderAware;
@@ -21,7 +20,7 @@ import org.springframework.util.PathMatcher;
public class DefaultResourceSet implements ResourceLoaderAware,
InitializingBean, ResourceSet {
- private final static Log log = LogFactory.getLog(DefaultResourceSet.class);
+ private final static CmsLog log = CmsLog.getLog(DefaultResourceSet.class);
public final static String DEFAULT_EXCLUDES = "**/.svn/**";
private String base;
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/SimpleExecutables.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/SimpleExecutables.java
index 6c9336854..10b399875 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/SimpleExecutables.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/SimpleExecutables.java
@@ -4,15 +4,14 @@ import java.io.File;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.build.Distribution;
import org.argeo.slc.deploy.DeploymentData;
import org.argeo.slc.deploy.InstalledExecutables;
import org.argeo.slc.deploy.TargetData;
public class SimpleExecutables implements InstalledExecutables {
- private final static Log log = LogFactory.getLog(SimpleExecutables.class);
+ private final static CmsLog log = CmsLog.getLog(SimpleExecutables.class);
private String baseDir;
private Map paths = new TreeMap();
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/VersionedDirSync.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/VersionedDirSync.java
index 40f6735e0..96df26bd9 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/VersionedDirSync.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/VersionedDirSync.java
@@ -4,8 +4,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.argeo.slc.deploy.VersioningDriver;
@@ -14,7 +13,7 @@ import org.argeo.slc.deploy.VersioningDriver;
* information if possible.
*/
public class VersionedDirSync implements Runnable {
- private final static Log log = LogFactory.getLog(VersionedDirSync.class);
+ private final static CmsLog log = CmsLog.getLog(VersionedDirSync.class);
private VersioningDriver versioningDriver;
private File dir;
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java
index 19861151a..9ccfaa488 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java
@@ -3,8 +3,7 @@ package org.argeo.slc.core.execution;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.springframework.beans.BeansException;
import org.springframework.beans.MutablePropertyValues;
@@ -18,7 +17,7 @@ import org.springframework.core.PriorityOrdered;
public abstract class AbstractExecutionFlowGenerator implements
BeanFactoryPostProcessor, PriorityOrdered {
- private final Log log = LogFactory.getLog(getClass());
+ private final CmsLog log = CmsLog.getLog(getClass());
protected abstract Map createExecutionFlowDefinitions(
ConfigurableListableBeanFactory beanFactory);
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
index 0bdeb53bb..d85dbd070 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
@@ -7,8 +7,7 @@ import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.execution.ExecutionFlow;
import org.argeo.slc.execution.ExecutionFlowDescriptor;
import org.argeo.slc.execution.ExecutionFlowDescriptorConverter;
@@ -42,7 +41,7 @@ public class DefaultExecutionFlowDescriptorConverter implements
/** Workaround for https://www.spartadn.com/bugzilla/show_bug.cgi?id=206 */
private final static String REF_VALUE_INTERNAL = "[internal]";
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(DefaultExecutionFlowDescriptorConverter.class);
private ApplicationContext applicationContext;
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java
index e603f71a7..b7ebe6c1a 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java
@@ -3,8 +3,7 @@ package org.argeo.slc.core.execution;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.execution.ExecutionSpecAttribute;
import org.argeo.slc.execution.RefSpecAttribute;
import org.argeo.slc.execution.RefValueChoice;
@@ -22,7 +21,7 @@ import org.springframework.context.ConfigurableApplicationContext;
public class DefaultExecutionSpec extends org.argeo.slc.runtime.DefaultExecutionSpec
implements BeanNameAware, ApplicationContextAware, InitializingBean {
private static final long serialVersionUID = 5159882223926926539L;
- private final static Log log = LogFactory.getLog(DefaultExecutionSpec.class);
+ private final static CmsLog log = CmsLog.getLog(DefaultExecutionSpec.class);
private transient ApplicationContext applicationContext;
public DefaultExecutionSpec() {
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionAspect.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionAspect.java
index 2fb23488c..2275ee947 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionAspect.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionAspect.java
@@ -1,7 +1,6 @@
package org.argeo.slc.core.execution;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.execution.ExecutionContext;
import org.argeo.slc.execution.ExecutionFlow;
import org.argeo.slc.execution.ExecutionStack;
@@ -13,7 +12,7 @@ import org.aspectj.lang.annotation.Pointcut;
@Aspect
/** Aspect intercepting calls on execution flows and contexts. */
public class ExecutionAspect {
- private final static Log log = LogFactory.getLog(ExecutionAspect.class);
+ private final static CmsLog log = CmsLog.getLog(ExecutionAspect.class);
private ExecutionStack executionStack;
private ExecutionContext executionContext;
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
index 75105045e..85d96c89e 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
@@ -7,8 +7,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.argeo.slc.execution.ExecutionContext;
import org.argeo.slc.execution.ExecutionFlow;
@@ -35,7 +34,7 @@ import org.springframework.util.StringUtils;
public class ExecutionParameterPostProcessor extends
InstantiationAwareBeanPostProcessorAdapter {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(ExecutionParameterPostProcessor.class);
private ExecutionContext executionContext;
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionScope.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionScope.java
index 19296ab08..0e08f9228 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionScope.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionScope.java
@@ -1,7 +1,6 @@
package org.argeo.slc.core.execution;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.argeo.slc.UnsupportedException;
import org.argeo.slc.execution.ExecutionContext;
@@ -17,7 +16,7 @@ import org.springframework.beans.factory.config.Scope;
* reused across an execution.
*/
public class ExecutionScope implements Scope {
- private final static Log log = LogFactory.getLog(ExecutionScope.class);
+ private final static CmsLog log = CmsLog.getLog(ExecutionScope.class);
private final ThreadLocal executionStack = new ThreadLocal();
public final ThreadLocal executionStackBeanName = new ThreadLocal();
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/FileExecutionResources.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/FileExecutionResources.java
index 41fb6941a..b102639b1 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/FileExecutionResources.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/FileExecutionResources.java
@@ -9,8 +9,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.SlcException;
import org.argeo.slc.execution.ExecutionContext;
import org.springframework.core.io.FileSystemResource;
@@ -19,7 +18,7 @@ import org.springframework.util.Assert;
/** Implements write access to resources based on standard Java {@link File} */
public class FileExecutionResources implements ExecutionResources {
- private final static Log log = LogFactory
+ private final static CmsLog log = CmsLog
.getLog(FileExecutionResources.class);
protected final static String DEFAULT_EXECUTION_RESOURCES_DIRNAME = "executionResources";
public final static String DEFAULT_EXECUTION_RESOURCES_TMP_PATH = System
diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ParameterRef.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ParameterRef.java
index 093f78184..67da8ce7e 100644
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ParameterRef.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ParameterRef.java
@@ -1,12 +1,11 @@
package org.argeo.slc.core.execution;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
import org.argeo.slc.runtime.InstantiationManager;
import org.springframework.beans.factory.FactoryBean;
public class ParameterRef implements FactoryBean