X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Forg.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fusers%2FUserAdminWrapper.java;fp=eclipse%2Forg.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fusers%2FUserAdminWrapper.java;h=0000000000000000000000000000000000000000;hb=7b242851c0094d13cbaca5b68261ad92c873a59f;hp=d120ae9a289b8494e62372e28a5f607edc08f8d1;hpb=dbb84b4ec2d313ec0724d035c32f482ac57974c5;p=lgpl%2Fargeo-commons.git

diff --git a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java b/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java
deleted file mode 100644
index d120ae9a2..000000000
--- a/eclipse/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.argeo.cms.e4.users;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.argeo.api.cms.CmsConstants;
-import org.argeo.cms.swt.CmsException;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.directory.DirectoryConf;
-import org.argeo.util.transaction.WorkTransaction;
-import org.osgi.service.useradmin.UserAdmin;
-import org.osgi.service.useradmin.UserAdminEvent;
-import org.osgi.service.useradmin.UserAdminListener;
-
-/** Centralise interaction with the UserAdmin in this bundle */
-public class UserAdminWrapper {
-
-	private UserAdmin userAdmin;
-	// private ServiceReference<UserAdmin> userAdminServiceReference;
-//	private Set<String> uris;
-	private Map<UserDirectory, Hashtable<String, String>> userDirectories = Collections
-			.synchronizedMap(new LinkedHashMap<>());
-	private WorkTransaction userTransaction;
-
-	// First effort to simplify UX while managing users and groups
-	public final static boolean COMMIT_ON_SAVE = true;
-
-	// Registered listeners
-	List<UserAdminListener> listeners = new ArrayList<UserAdminListener>();
-
-	/**
-	 * Starts a transaction if necessary. Should always been called together with
-	 * {@link UserAdminWrapper#commitOrNotifyTransactionStateChange()} once the
-	 * security model changes have been performed.
-	 */
-	public WorkTransaction beginTransactionIfNeeded() {
-		try {
-			// UserTransaction userTransaction = getUserTransaction();
-			if (userTransaction.isNoTransactionStatus()) {
-				userTransaction.begin();
-				// UiAdminUtils.notifyTransactionStateChange(userTransaction);
-			}
-			return userTransaction;
-		} catch (Exception e) {
-			throw new CmsException("Unable to begin transaction", e);
-		}
-	}
-
-	/**
-	 * Depending on the current application configuration, it will either commit the
-	 * current transaction or throw a notification that the transaction state has
-	 * changed (In the later case, it must be called from the UI thread).
-	 */
-	public void commitOrNotifyTransactionStateChange() {
-		try {
-			// UserTransaction userTransaction = getUserTransaction();
-			if (userTransaction.isNoTransactionStatus())
-				return;
-
-			if (UserAdminWrapper.COMMIT_ON_SAVE)
-				userTransaction.commit();
-			else
-				UiAdminUtils.notifyTransactionStateChange(userTransaction);
-		} catch (Exception e) {
-			throw new CmsException("Unable to clean transaction", e);
-		}
-	}
-
-	// TODO implement safer mechanism
-	public void addListener(UserAdminListener userAdminListener) {
-		if (!listeners.contains(userAdminListener))
-			listeners.add(userAdminListener);
-	}
-
-	public void removeListener(UserAdminListener userAdminListener) {
-		if (listeners.contains(userAdminListener))
-			listeners.remove(userAdminListener);
-	}
-
-	public void notifyListeners(UserAdminEvent event) {
-		for (UserAdminListener listener : listeners)
-			listener.roleChanged(event);
-	}
-
-	public Map<String, String> getKnownBaseDns(boolean onlyWritable) {
-		Map<String, String> dns = new HashMap<String, String>();
-		for (UserDirectory userDirectory : userDirectories.keySet()) {
-			Boolean readOnly = userDirectory.isReadOnly();
-			String baseDn = userDirectory.getContext();
-
-			if (onlyWritable && readOnly)
-				continue;
-			if (baseDn.equalsIgnoreCase(CmsConstants.ROLES_BASEDN))
-				continue;
-			if (baseDn.equalsIgnoreCase(CmsConstants.TOKENS_BASEDN))
-				continue;
-			dns.put(baseDn, DirectoryConf.propertiesAsUri(userDirectories.get(userDirectory)).toString());
-
-		}
-//		for (String uri : uris) {
-//			if (!uri.startsWith("/"))
-//				continue;
-//			Dictionary<String, ?> props = UserAdminConf.uriAsProperties(uri);
-//			String readOnly = UserAdminConf.readOnly.getValue(props);
-//			String baseDn = UserAdminConf.baseDn.getValue(props);
-//
-//			if (onlyWritable && "true".equals(readOnly))
-//				continue;
-//			if (baseDn.equalsIgnoreCase(NodeConstants.ROLES_BASEDN))
-//				continue;
-//			if (baseDn.equalsIgnoreCase(NodeConstants.TOKENS_BASEDN))
-//				continue;
-//			dns.put(baseDn, uri);
-//		}
-		return dns;
-	}
-
-	public UserAdmin getUserAdmin() {
-		return userAdmin;
-	}
-
-	public WorkTransaction getUserTransaction() {
-		return userTransaction;
-	}
-
-	/* DEPENDENCY INJECTION */
-	public void setUserAdmin(UserAdmin userAdmin, Map<String, String> properties) {
-		this.userAdmin = userAdmin;
-//		this.uris = Collections.unmodifiableSortedSet(new TreeSet<>(properties.keySet()));
-	}
-
-	public void setUserTransaction(WorkTransaction userTransaction) {
-		this.userTransaction = userTransaction;
-	}
-
-	public void addUserDirectory(UserDirectory userDirectory, Map<String, String> properties) {
-		userDirectories.put(userDirectory, new Hashtable<>(properties));
-	}
-
-	public void removeUserDirectory(UserDirectory userDirectory, Map<String, String> properties) {
-		userDirectories.remove(userDirectory);
-	}
-
-	// public void setUserAdminServiceReference(
-	// ServiceReference<UserAdmin> userAdminServiceReference) {
-	// this.userAdminServiceReference = userAdminServiceReference;
-	// }
-}