X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fmaintenance%2FAbstractMaintenanceService.java;h=ae09cd4bfdbaf1fa77e4ad9bce345392e191dcf5;hb=5986e55820cba0821f0c16627c4ab144863c82ab;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..ae09cd4bf 100644 --- a/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java +++ b/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java @@ -9,7 +9,6 @@ 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; @@ -17,6 +16,7 @@ import org.argeo.api.NodeUtils; 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()); @@ -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; }