Massive Argeo APIs refactoring

[gpl/argeo-slc.git] / legacy / org.argeo.slc.client.ui.dist / src / org / argeo / slc / client / ui / dist / commands / MergeWorkspaces.java

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 6a62a62ee3ff82aaca30393ed4ee9707e301f868..4ba2e0565bc21bd9ca54ef0d2577a0e4572ac2e1 100644 (file)
--- 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";