Move JCR utilities from API to CMS JCR

[lgpl/argeo-commons.git] / org.argeo.cms.jcr / src / org / argeo / cms / jcr / internal / JcrDeployment.java

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrDeployment.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrDeployment.java
index d0fa841e0967cd9dc5e333f3077f7b55cf327b7f..0daaad47c95f830503c6434a75f8a6acea26e4a0 100644 (file)
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrDeployment.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrDeployment.java
@@ -34,11 +34,11 @@ import org.apache.jackrabbit.core.RepositoryImpl;
 import org.argeo.api.DataModelNamespace;
 import org.argeo.api.NodeConstants;
 import org.argeo.api.NodeDeployment;
-import org.argeo.api.NodeUtils;
 import org.argeo.api.security.CryptoKeyring;
 import org.argeo.api.security.Keyring;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.internal.jcr.JcrInitUtils;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.jcr.internal.servlet.CmsRemotingServlet;
 import org.argeo.cms.jcr.internal.servlet.CmsWebDavServlet;
 import org.argeo.cms.jcr.internal.servlet.JcrHttpUtils;
@@ -193,15 +193,15 @@ public class JcrDeployment {
                                Session sourceSession = null;
                                try {
                                        try {
-                                               targetSession = NodeUtils.openDataAdminSession(deployedNodeRepository, workspaceName);
+                                               targetSession = CmsJcrUtils.openDataAdminSession(deployedNodeRepository, workspaceName);
                                        } catch (IllegalArgumentException e) {// no such workspace
-                                               Session adminSession = NodeUtils.openDataAdminSession(deployedNodeRepository, null);
+                                               Session adminSession = CmsJcrUtils.openDataAdminSession(deployedNodeRepository, null);
                                                try {
                                                        adminSession.getWorkspace().createWorkspace(workspaceName);
                                                } finally {
                                                        Jcr.logout(adminSession);
                                                }
-                                               targetSession = NodeUtils.openDataAdminSession(deployedNodeRepository, workspaceName);
+                                               targetSession = CmsJcrUtils.openDataAdminSession(deployedNodeRepository, workspaceName);
                                        }
                                        sourceSession = initRepository.login(workspaceName);
 //                                     JcrUtils.copyWorkspaceXml(sourceSession, targetSession);