X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fmaintenance%2FAbstractMaintenanceService.java;h=804ab975886b9f211a4f800081fafea55d6a69e7;hb=c53fec78daddb69c489686844188036b04e1615a;hp=ae09cd4bfdbaf1fa77e4ad9bce345392e191dcf5;hpb=5986e55820cba0821f0c16627c4ab144863c82ab;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java index ae09cd4bf..804ab9758 100644 --- a/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java +++ b/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java @@ -12,7 +12,7 @@ import javax.jcr.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeUtils; +import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrUtils; import org.argeo.naming.Distinguished; @@ -47,10 +47,10 @@ public abstract class AbstractMaintenanceService { protected void configureJcr(Repository repository, String workspaceName) { Session adminSession; try { - adminSession = NodeUtils.openDataAdminSession(repository, workspaceName); + adminSession = CmsJcrUtils.openDataAdminSession(repository, workspaceName); } catch (RuntimeException e1) { if (e1.getCause() != null && e1.getCause() instanceof NoSuchWorkspaceException) { - Session defaultAdminSession = NodeUtils.openDataAdminSession(repository, null); + Session defaultAdminSession = CmsJcrUtils.openDataAdminSession(repository, null); try { defaultAdminSession.getWorkspace().createWorkspace(workspaceName); log.info("Created JCR workspace " + workspaceName); @@ -59,7 +59,7 @@ public abstract class AbstractMaintenanceService { } finally { Jcr.logout(defaultAdminSession); } - adminSession = NodeUtils.openDataAdminSession(repository, workspaceName); + adminSession = CmsJcrUtils.openDataAdminSession(repository, workspaceName); } else throw e1; }