X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fmaintenance%2FAbstractMaintenanceService.java;h=3c8f296c4c9243b9b9a0ce7ebfe297744b669ffd;hb=a92b2dfe504630d7406e7ccced0cf5e9388ac03a;hp=6003d638ddadab47a630d694903704ca62dce2c4;hpb=623a0db2d0f161c101b9e41abcaccc04d478d32a;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 6003d638d..3c8f296c4 100644
--- a/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java
+++ b/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java
@@ -9,26 +9,25 @@ 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.api.cms.CmsLog;
+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.argeo.util.naming.Distinguished;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.UserAdmin;
 
 /** Make sure roles and access rights are properly configured. */
 public abstract class AbstractMaintenanceService {
-	private final static Log log = LogFactory.getLog(AbstractMaintenanceService.class);
+	private final static CmsLog log = CmsLog.getLog(AbstractMaintenanceService.class);
 
 	private Repository repository;
 //	private UserAdminService userAdminService;
 	private UserAdmin userAdmin;
-	private UserTransaction userTransaction;
+	private WorkTransaction userTransaction;
 
 	public void init() {
 		makeSureRolesExists(getRequiredRoles());
@@ -47,10 +46,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 +58,7 @@ public abstract class AbstractMaintenanceService {
 				} finally {
 					Jcr.logout(defaultAdminSession);
 				}
-				adminSession = NodeUtils.openDataAdminSession(repository, workspaceName);
+				adminSession = CmsJcrUtils.openDataAdminSession(repository, workspaceName);
 			} else
 				throw e1;
 		}
@@ -202,7 +201,7 @@ public abstract class AbstractMaintenanceService {
 //		this.userAdminService = userAdminService;
 //	}
 
-	protected UserTransaction getUserTransaction() {
+	protected WorkTransaction getUserTransaction() {
 		return userTransaction;
 	}
 
@@ -214,7 +213,7 @@ public abstract class AbstractMaintenanceService {
 		this.userAdmin = userAdmin;
 	}
 
-	public void setUserTransaction(UserTransaction userTransaction) {
+	public void setUserTransaction(WorkTransaction userTransaction) {
 		this.userTransaction = userTransaction;
 	}