projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IPA authentication working.
[lgpl/argeo-commons.git]
/
org.argeo.enterprise
/
src
/
org
/
argeo
/
osgi
/
useradmin
/
LdifUserAdmin.java
diff --git
a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
index 970ab7162949aa5ad82e12fcf3727679476785c9..b19e9bf4f311da72fc962bb5b411913d05ae57b0 100644
(file)
--- a/
org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
+++ b/
org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
@@
-40,15
+40,19
@@
public class LdifUserAdmin extends AbstractUserDirectory {
private SortedMap<LdapName, DirectoryGroup> groups = new TreeMap<LdapName, DirectoryGroup>();
public LdifUserAdmin(String uri, String baseDn) {
private SortedMap<LdapName, DirectoryGroup> groups = new TreeMap<LdapName, DirectoryGroup>();
public LdifUserAdmin(String uri, String baseDn) {
- this(fromUri(uri, baseDn));
+ this(fromUri(uri, baseDn)
, false
);
}
public LdifUserAdmin(Dictionary<String, ?> properties) {
}
public LdifUserAdmin(Dictionary<String, ?> properties) {
- super(null, properties);
+ this(properties, false);
+ }
+
+ protected LdifUserAdmin(Dictionary<String, ?> properties, boolean scoped) {
+ super(null, properties, scoped);
}
public LdifUserAdmin(URI uri, Dictionary<String, ?> properties) {
}
public LdifUserAdmin(URI uri, Dictionary<String, ?> properties) {
- super(uri, properties);
+ super(uri, properties
, false
);
}
@Override
}
@Override
@@
-69,7
+73,7
@@
public class LdifUserAdmin extends AbstractUserDirectory {
}
Dictionary<String, Object> properties = cloneProperties();
properties.put(UserAdminConf.readOnly.name(), "true");
}
Dictionary<String, Object> properties = cloneProperties();
properties.put(UserAdminConf.readOnly.name(), "true");
- LdifUserAdmin scopedUserAdmin = new LdifUserAdmin(properties);
+ LdifUserAdmin scopedUserAdmin = new LdifUserAdmin(properties
, true
);
scopedUserAdmin.groups = Collections.unmodifiableSortedMap(groups);
scopedUserAdmin.users = Collections.unmodifiableSortedMap(users);
return scopedUserAdmin;
scopedUserAdmin.groups = Collections.unmodifiableSortedMap(groups);
scopedUserAdmin.users = Collections.unmodifiableSortedMap(users);
return scopedUserAdmin;
@@
-83,13
+87,15
@@
public class LdifUserAdmin extends AbstractUserDirectory {
}
public void init() {
}
public void init() {
+
try {
try {
- if (getUri().getScheme().equals("file")) {
- File file = new File(getUri());
+ URI u = new URI(getUri());
+ if (u.getScheme().equals("file")) {
+ File file = new File(u);
if (!file.exists())
return;
}
if (!file.exists())
return;
}
- load(
getUri()
.toURL().openStream());
+ load(
u
.toURL().openStream());
} catch (Exception e) {
throw new UserDirectoryException("Cannot open URL " + getUri(), e);
}
} catch (Exception e) {
throw new UserDirectoryException("Cannot open URL " + getUri(), e);
}