X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fdirectory%2Fldap%2FLdifDao.java;h=06489c6e2dbc052b433581579fbe309179a8842c;hb=654cb2ca43dd4513a4d6a5bbe81762eaf6675496;hp=1f338989639801f46c9717031660f5f50f8fc598;hpb=54df376a9c2dd458a82eaa09bfbb718fe699dd0d;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java index 1f3389896..06489c6e2 100644 --- a/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java +++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java @@ -1,7 +1,7 @@ package org.argeo.cms.directory.ldap; -import static org.argeo.api.acr.ldap.LdapAttrs.objectClass; -import static org.argeo.api.acr.ldap.LdapObjs.inetOrgPerson; +import static org.argeo.api.acr.ldap.LdapAttr.objectClass; +import static org.argeo.api.acr.ldap.LdapObj.inetOrgPerson; import java.io.File; import java.io.FileOutputStream; @@ -26,7 +26,7 @@ import javax.naming.NamingException; import javax.naming.directory.Attributes; import javax.naming.ldap.LdapName; -import org.argeo.api.acr.ldap.LdapObjs; +import org.argeo.api.acr.ldap.LdapObj; import org.argeo.api.cms.directory.HierarchyUnit; import org.osgi.framework.Filter; import org.osgi.framework.FrameworkUtil; @@ -119,7 +119,7 @@ public class LdifDao extends AbstractLdapDirectoryDao { } else if (objectClass.toLowerCase().equals(getDirectory().getGroupObjectClass().toLowerCase())) { entries.put(key, newGroup(key)); break objectClasses; - } else if (objectClass.equalsIgnoreCase(LdapObjs.organizationalUnit.name())) { + } else if (objectClass.equalsIgnoreCase(LdapObj.organizationalUnit.name())) { // TODO skip if it does not contain groups or users hierarchy.put(key, new LdapHierarchyUnit(getDirectory(), key)); break objectClasses; @@ -257,10 +257,14 @@ public class LdifDao extends AbstractLdapDirectoryDao { } if (user == null) throw new IllegalStateException("User to modify no found " + dn); - user.publishAttributes(modifiedAttrs); + publishAttributes(dn, modifiedAttrs); } } + protected void publishAttributes(LdapName dn, Attributes modifiedAttributes) { + values.put(dn, modifiedAttributes); + } + @Override public void commit(LdapEntryWorkingCopy wc) { save();