X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2FUserAdminWrapper.java;h=43ce58da9fba74bb7f06c0ea9bb7a3b5f8acd551;hb=89ad04528a66488eb3ad6f51c198d5df3c81b04c;hp=41efefa650d50a1af2c38937d29660ed0ac2e4aa;hpb=8fea21d044841079b2f490c00da5d0902d50c3eb;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
index 41efefa65..43ce58da9 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
@@ -1,53 +1,46 @@
 package org.argeo.security.ui.admin.internal;
 
 import java.util.ArrayList;
-import java.util.Dictionary;
 import java.util.List;
 
-import javax.naming.InvalidNameException;
-import javax.naming.ldap.LdapName;
-import javax.naming.ldap.Rdn;
 import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
-import org.argeo.osgi.useradmin.UserAdminConf;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.useradmin.UserAdmin;
 import org.osgi.service.useradmin.UserAdminEvent;
 import org.osgi.service.useradmin.UserAdminListener;
 
-/** Simplifies the interaction with the UserAdmin in this bundle */
-public class UserAdminWrapper {
-	private Log log = LogFactory.getLog(UserAdminWrapper.class);
-
-	private UserAdmin userAdmin;
-	private ServiceReference<UserAdmin> userAdminServiceReference;
-	private UserTransaction userTransaction;
+/** Centralize interaction with the UserAdmin in this bundle */
+public class UserAdminWrapper extends
+		org.argeo.cms.util.useradmin.UserAdminWrapper {
+	// private Log log = LogFactory.getLog(UserAdminWrapper.class);
 
 	// Registered listeners
 	List<UserAdminListener> listeners = new ArrayList<UserAdminListener>();
 
-	// TODO implement safer mechanism
-	public void addListener(UserAdminListener userAdminListener) {
-		if (!listeners.contains(userAdminListener))
-			listeners.add(userAdminListener);
-	}
-
-	/** Must be called from the UI Thread. */
-	public void beginTransactionIfNeeded() {
+	/**
+	 * Overwrite the normal begin transaction behaviour to also notify the UI.
+	 * Must be called from the UI Thread.
+	 */
+	public UserTransaction beginTransactionIfNeeded() {
 		try {
+			UserTransaction userTransaction = getUserTransaction();
 			if (userTransaction.getStatus() == Status.STATUS_NO_TRANSACTION) {
 				userTransaction.begin();
 				UiAdminUtils.notifyTransactionStateChange(userTransaction);
 			}
+			return userTransaction;
 		} catch (Exception e) {
 			throw new ArgeoException("Unable to begin transaction", e);
 		}
 	}
 
+	// TODO implement safer mechanism
+	public void addListener(UserAdminListener userAdminListener) {
+		if (!listeners.contains(userAdminListener))
+			listeners.add(userAdminListener);
+	}
+
 	// Expose this?
 	public void removeListener(UserAdminListener userAdminListener) {
 		if (listeners.contains(userAdminListener))
@@ -58,67 +51,4 @@ public class UserAdminWrapper {
 		for (UserAdminListener listener : listeners)
 			listener.roleChanged(event);
 	}
-
-	public UserAdmin getUserAdmin() {
-		return userAdmin;
-	}
-
-	public UserTransaction getUserTransaction() {
-		return userTransaction;
-	}
-
-	/* DEPENDENCY INJECTION */
-	public void setUserAdmin(UserAdmin userAdmin) {
-		this.userAdmin = userAdmin;
-	}
-
-	public void setUserAdminServiceReference(
-			ServiceReference<UserAdmin> userAdminServiceReference) {
-		this.userAdminServiceReference = userAdminServiceReference;
-		// for (String uri : userAdminServiceReference.getPropertyKeys()) {
-		// if (!uri.startsWith("/"))
-		// continue;
-		// log.debug(uri);
-		// Dictionary<String, ?> props = UserAdminConf.uriAsProperties(uri);
-		// log.debug(props);
-		// }
-	}
-
-	public List<String> getKnownBaseDns(boolean onlyWritable) {
-		List<String> dns = new ArrayList<String>();
-		for (String uri : userAdminServiceReference.getPropertyKeys()) {
-			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;
-			dns.add(baseDn);
-		}
-		return dns;
-	}
-
-//	// Returns the human friendly domain name give a dn.
-//	public String getDomainName(String dn) {
-//		if (dn.endsWith("ou=roles, ou=node"))
-//			return "System roles";
-//		try {
-//
-//			LdapName name;
-//			name = new LdapName(dn);
-//			List<Rdn> rdns = name.getRdns();
-//
-//			String penultimate = (String) rdns.get(rdns.size() - 2).getValue();
-//			String last = (String) rdns.get(rdns.size() - 1).getValue();
-//			return (penultimate + '.' + last);
-//		} catch (InvalidNameException e) {
-//			throw new ArgeoException("Unable to get domain name for " + dn, e);
-//		}
-//	}
-
-	public void setUserTransaction(UserTransaction userTransaction) {
-		this.userTransaction = userTransaction;
-	}
 }
\ No newline at end of file