Improve and simplify OSGi Boot

[lgpl/argeo-commons.git] / org.argeo.security.core / src / org / argeo / osgi / useradmin / LdapUserAdmin.java

diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
index c2e26ca4cfc09b610cc9880679f9175c8da7ea83..7a617dfd6115ee3012717ad60276f040b5bb87ed 100644 (file)
--- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
+++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
@@ -24,7 +24,6 @@ import javax.transaction.TransactionManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoException;
 import org.osgi.framework.Filter;
 
 /**
@@ -113,7 +112,7 @@ public class LdapUserAdmin extends AbstractUserDirectory {
                        SearchControls searchControls = new SearchControls();
                        searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
 
-                       String searchBase = getBaseDn();
+                       LdapName searchBase = getBaseDn();
                        NamingEnumeration<SearchResult> results = getLdapContext().search(searchBase, searchFilter, searchControls);
 
                        ArrayList<DirectoryUser> res = new ArrayList<DirectoryUser>();
@@ -139,7 +138,7 @@ public class LdapUserAdmin extends AbstractUserDirectory {
                }
        }
 
-       private LdapName toDn(String baseDn, Binding binding) throws InvalidNameException {
+       private LdapName toDn(LdapName baseDn, Binding binding) throws InvalidNameException {
                return new LdapName(binding.isRelative() ? binding.getName() + "," + baseDn : binding.getName());
        }
 
@@ -153,7 +152,7 @@ public class LdapUserAdmin extends AbstractUserDirectory {
                        SearchControls searchControls = new SearchControls();
                        searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
 
-                       String searchBase = getBaseDn();
+                       LdapName searchBase = getBaseDn();
                        NamingEnumeration<SearchResult> results = getLdapContext().search(searchBase, searchFilter, searchControls);
 
                        while (results.hasMoreElements()) {
@@ -162,7 +161,7 @@ public class LdapUserAdmin extends AbstractUserDirectory {
                        }
                        return directGroups;
                } catch (Exception e) {
-                       throw new ArgeoException("Cannot populate direct members of " + dn, e);
+                       throw new UserDirectoryException("Cannot populate direct members of " + dn, e);
                }
        }