X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Finternal%2FJcrDeployment.java;h=9915fb037012f00fa714ef038d27043f45b9c231;hb=b7683883512d924a039a43c2e1102290aa49f64d;hp=d0fa841e0967cd9dc5e333f3077f7b55cf327b7f;hpb=1a0d5ca243bc86a5f54448186178e5fb04c623e9;p=lgpl%2Fargeo-commons.git

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 d0fa841e0..9915fb037 100644
--- 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
@@ -1,6 +1,6 @@
 package org.argeo.cms.jcr.internal;
 
-import static org.argeo.api.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE;
+import static org.argeo.cms.osgi.DataModelNamespace.CMS_DATA_MODEL_NAMESPACE;
 import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_INIT_PARAM_PREFIX;
 
 import java.io.File;
@@ -31,17 +31,17 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.core.RepositoryContext;
 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;
+import org.argeo.cms.osgi.DataModelNamespace;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
@@ -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);