X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeUserAdmin.java;h=86c6c9c31a66721cdb9acd9c2a0c373a1af2f6ce;hb=5986e55820cba0821f0c16627c4ab144863c82ab;hp=1a9817450ed427deee762ed39f0866d1d6a3942c;hpb=1a0d5ca243bc86a5f54448186178e5fb04c623e9;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
index 1a9817450..86c6c9c31 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
@@ -25,7 +25,6 @@ import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.kerberos.KerberosPrincipal;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import javax.transaction.TransactionManager;
 
 import org.apache.commons.httpclient.auth.AuthPolicy;
 import org.apache.commons.httpclient.auth.CredentialsProvider;
@@ -38,6 +37,7 @@ import org.argeo.api.NodeConstants;
 import org.argeo.cms.internal.http.client.HttpCredentialProvider;
 import org.argeo.cms.internal.http.client.SpnegoAuthScheme;
 import org.argeo.naming.DnsBrowser;
+import org.argeo.osgi.transaction.WorkControl;
 import org.argeo.osgi.useradmin.AbstractUserDirectory;
 import org.argeo.osgi.useradmin.AggregatingUserAdmin;
 import org.argeo.osgi.useradmin.LdapUserAdmin;
@@ -72,7 +72,7 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 //	private ServiceRegistration<UserAdmin> userAdminReg;
 
 	// JTA
-	private final ServiceTracker<TransactionManager, TransactionManager> tmTracker;
+	private final ServiceTracker<WorkControl, WorkControl> tmTracker;
 	// private final String cacheName = UserDirectory.class.getName();
 
 	// GSS API
@@ -86,7 +86,7 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 		super(systemRolesBaseDn, tokensBaseDn);
 		BundleContext bc = Activator.getBundleContext();
 		if (bc != null) {
-			tmTracker = new ServiceTracker<>(bc, TransactionManager.class, null);
+			tmTracker = new ServiceTracker<>(bc, WorkControl.class, null);
 			tmTracker.open();
 		} else {
 			tmTracker = null;
@@ -194,10 +194,10 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 
 	protected void postAdd(AbstractUserDirectory userDirectory) {
 		// JTA
-		TransactionManager tm = tmTracker != null ? tmTracker.getService() : null;
+		WorkControl tm = tmTracker != null ? tmTracker.getService() : null;
 		if (tm == null)
 			throw new IllegalStateException("A JTA transaction manager must be available.");
-		userDirectory.setTransactionManager(tm);
+		userDirectory.setTransactionControl(tm);
 //		if (tmTracker.getService() instanceof BitronixTransactionManager)
 //			EhCacheXAResourceProducer.registerXAResource(cacheName, userDirectory.getXaResource());