X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fext%2Ftest%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifUserAdminTest.java;h=8432ce999ca1d51bb07f85e383c3e972cedebf01;hb=5986e55820cba0821f0c16627c4ab144863c82ab;hp=126125b8500f7a3c8c8b46a2e8ff783c42a196ac;hpb=1a0d5ca243bc86a5f54448186178e5fb04c623e9;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java index 126125b85..8432ce999 100644 --- a/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java +++ b/org.argeo.enterprise/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java @@ -16,10 +16,8 @@ import java.util.Dictionary; import java.util.Hashtable; import java.util.List; -import javax.transaction.TransactionManager; - import org.argeo.naming.LdapAttrs; -import org.argeo.transaction.simple.SimpleTransactionManager; +import org.argeo.osgi.transaction.SimpleTransactionManager; import org.osgi.service.useradmin.Authorization; import org.osgi.service.useradmin.Group; import org.osgi.service.useradmin.Role; @@ -36,7 +34,7 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants { final static int TM_BITRONIX = 1; private int tmType = TM_SIMPLE; - private TransactionManager tm; + private SimpleTransactionManager tm; private URI uri; private AbstractUserDirectory userAdmin; private Path tempDir; @@ -171,7 +169,7 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants { } } - private AbstractUserDirectory initUserAdmin(URI uri, TransactionManager tm) { + private AbstractUserDirectory initUserAdmin(URI uri, SimpleTransactionManager tm) { Dictionary props = new Hashtable<>(); props.put(UserAdminConf.uri.name(), uri.toString()); props.put(UserAdminConf.baseDn.name(), BASE_DN); @@ -186,7 +184,7 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants { // JTA // if (TM_BITRONIX == tmType) // EhCacheXAResourceProducer.registerXAResource(UserDirectory.class.getName(), userAdmin.getXaResource()); - userAdmin.setTransactionManager(tm); + userAdmin.setTransactionControl(tm); return userAdmin; }