Introduce CMS Servlet.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / NodeUserAdmin.java

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 1a9817450ed427deee762ed39f0866d1d6a3942c..11efa9e0f9dc9920520b9f800a9b7c17d9061bce 100644 (file)
--- 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;
@@ -35,9 +34,13 @@ import org.apache.commons.httpclient.params.HttpParams;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
+import org.argeo.cms.CmsUserManager;
+import org.argeo.cms.internal.auth.CmsUserManagerImpl;
 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.transaction.WorkTransaction;
 import org.argeo.osgi.useradmin.AbstractUserDirectory;
 import org.argeo.osgi.useradmin.AggregatingUserAdmin;
 import org.argeo.osgi.useradmin.LdapUserAdmin;
@@ -52,6 +55,7 @@ import org.ietf.jgss.GSSName;
 import org.ietf.jgss.Oid;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedServiceFactory;
 import org.osgi.service.useradmin.Authorization;
@@ -72,7 +76,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
@@ -82,11 +86,25 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
        private boolean singleUser = false;
 //     private boolean systemRolesAvailable = false;
 
+       CmsUserManagerImpl userManager;
+
        public NodeUserAdmin(String systemRolesBaseDn, String tokensBaseDn) {
                super(systemRolesBaseDn, tokensBaseDn);
                BundleContext bc = Activator.getBundleContext();
                if (bc != null) {
-                       tmTracker = new ServiceTracker<>(bc, TransactionManager.class, null);
+                       tmTracker = new ServiceTracker<>(bc, WorkControl.class, null) {
+
+                               @Override
+                               public WorkControl addingService(ServiceReference<WorkControl> reference) {
+                                       WorkControl workControl = super.addingService(reference);
+                                       userManager = new CmsUserManagerImpl();
+                                       userManager.setUserAdmin(NodeUserAdmin.this);
+                                       // FIXME make it more robust
+                                       userManager.setUserTransaction((WorkTransaction) workControl);
+                                       bc.registerService(CmsUserManager.class, userManager, null);
+                                       return workControl;
+                               }
+                       };
                        tmTracker.open();
                } else {
                        tmTracker = null;
@@ -128,7 +146,7 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
 
                // OSGi
                LdapName baseDn = userDirectory.getBaseDn();
-               Dictionary<String, Object> regProps = new Hashtable<>();
+               Hashtable<String, Object> regProps = new Hashtable<>();
                regProps.put(Constants.SERVICE_PID, pid);
                if (isSystemRolesBaseDn(baseDn))
                        regProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
@@ -136,6 +154,7 @@ class NodeUserAdmin extends AggregatingUserAdmin implements ManagedServiceFactor
                // ServiceRegistration<UserDirectory> reg =
                // bc.registerService(UserDirectory.class, userDirectory, regProps);
                Activator.registerService(UserDirectory.class, userDirectory, regProps);
+               userManager.addUserDirectory(userDirectory, regProps);
                pidToBaseDn.put(pid, baseDn);
                // pidToServiceRegs.put(pid, reg);
 
@@ -194,10 +213,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());