Move JCR utilities from API to CMS JCR

[lgpl/argeo-commons.git] / org.argeo.cms.jcr / src / org / argeo / maintenance / AbstractMaintenanceService.java

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 6003d638ddadab47a630d694903704ca62dce2c4..804ab975886b9f211a4f800081fafea55d6a69e7 100644 (file)
--- a/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java
+++ b/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java
@@ -9,14 +9,14 @@ import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.transaction.UserTransaction;
 
 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;
+import org.argeo.osgi.transaction.WorkTransaction;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.UserAdmin;
@@ -28,7 +28,7 @@ public abstract class AbstractMaintenanceService {
        private Repository repository;
 //     private UserAdminService userAdminService;
        private UserAdmin userAdmin;
-       private UserTransaction userTransaction;
+       private WorkTransaction userTransaction;
 
        public void init() {
                makeSureRolesExists(getRequiredRoles());
@@ -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;
                }
@@ -202,7 +202,7 @@ public abstract class AbstractMaintenanceService {
 //             this.userAdminService = userAdminService;
 //     }
 
-       protected UserTransaction getUserTransaction() {
+       protected WorkTransaction getUserTransaction() {
                return userTransaction;
        }
 
@@ -214,7 +214,7 @@ public abstract class AbstractMaintenanceService {
                this.userAdmin = userAdmin;
        }
 
-       public void setUserTransaction(UserTransaction userTransaction) {
+       public void setUserTransaction(WorkTransaction userTransaction) {
                this.userTransaction = userTransaction;
        }