projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename LDAP enums
[lgpl/argeo-commons.git]
/
org.argeo.cms
/
src
/
org
/
argeo
/
cms
/
directory
/
ldap
/
LdifDao.java
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 1f338989639801f46c9717031660f5f50f8fc598..52148dfab6084f695b69dcbb8b9b2b79e3a71dc6 100644
(file)
--- 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;
package org.argeo.cms.directory.ldap;
-import static org.argeo.api.acr.ldap.LdapAttr
s
.objectClass;
-import static org.argeo.api.acr.ldap.LdapObj
s
.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;
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 javax.naming.directory.Attributes;
import javax.naming.ldap.LdapName;
-import org.argeo.api.acr.ldap.LdapObj
s
;
+import org.argeo.api.acr.ldap.LdapObj;
import org.argeo.api.cms.directory.HierarchyUnit;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
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.toLowerCase().equals(getDirectory().getGroupObjectClass().toLowerCase())) {
entries.put(key, newGroup(key));
break objectClasses;
- } else if (objectClass.equalsIgnoreCase(LdapObj
s
.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;
// TODO skip if it does not contain groups or users
hierarchy.put(key, new LdapHierarchyUnit(getDirectory(), key));
break objectClasses;