tdraier 2005/03/03 15:09:14 CET
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/services/usermanager
JahiaGroupManagerLDAPProvider.java
JahiaUserManagerLDAPProvider.java
Log:
added logging info and fix for sunone server
Revision Changes Path
1.16.4.12 +12 -6
jahia/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java.diff?r1=1.16.4.11&r2=1.16.4.12&f=h
1.32.4.13 +2 -1
jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java.diff?r1=1.32.4.12&r2=1.32.4.13&f=h
Index: JahiaGroupManagerLDAPProvider.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaGroupManagerLDAPProvider.java,v
retrieving revision 1.16.4.11
retrieving revision 1.16.4.12
diff -u -r1.16.4.11 -r1.16.4.12
--- JahiaGroupManagerLDAPProvider.java 16 Feb 2005 13:02:59 -0000
1.16.4.11
+++ JahiaGroupManagerLDAPProvider.java 3 Mar 2005 14:09:13 -0000
1.16.4.12
@@ -1001,6 +1001,10 @@
}
}
groupProps.setProperty (attrName, attrValue);
+ // hack for strange-case server
+ if (attrName.equalsIgnoreCase("objectClass")) {
+ groupProps.setProperty ("objectClass", attrValue);
+ }
}
}
@@ -1324,12 +1328,16 @@
// EP : 2004-21-07 : refactoring : uses old way if
SEARCH_USER_ATTRIBUTE_NAME not defined
String searchProperties = ldapProperties.getProperty
(SEARCH_USER_ATTRIBUTE_NAME);
boolean searchUserDefined = (!(searchProperties == null) &&
(searchProperties.length() > 0));
-
+
+ logger.debug ("Getting members for group, dynamic="+dynamic+",
searchUserDefined="+searchUserDefined);
+
if (answer != null) {
while (answer.hasMore ()) {
+ String userKey = (String)answer.next ();
+ logger.debug ("Member value : "+userKey);
if (dynamic) {
Properties p = new Properties();
- p.put("ldap.url", answer.next());
+ p.put("ldap.url", userKey);
Set t = getUserManagerProvider().searchUsers(0,p);
for (Iterator iterator = t.iterator();
iterator.hasNext();) {
JahiaUser jahiaUser = (JahiaUser) iterator.next();
@@ -1339,16 +1347,14 @@
JahiaUser user = null;
if (searchUserDefined) { // use attribute definition (?)
user = getUserManagerProvider().
- lookupUser ((String)answer
- .nextElement (),
+ lookupUser (userKey,
ldapProperties
.getProperty (
SEARCH_USER_ATTRIBUTE_NAME));
} else { // use DN
user = getUserManagerProvider()
.lookupUserFromDN(
- (String)answer
- .nextElement ());
+ userKey);
}
if (user != null)
members.put (user.getName(), user);
Index: JahiaUserManagerLDAPProvider.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaUserManagerLDAPProvider.java,v
retrieving revision 1.32.4.12
retrieving revision 1.32.4.13
diff -u -r1.32.4.12 -r1.32.4.13
--- JahiaUserManagerLDAPProvider.java 23 Feb 2005 18:36:41 -0000
1.32.4.12
+++ JahiaUserManagerLDAPProvider.java 3 Mar 2005 14:09:13 -0000
1.32.4.13
@@ -577,7 +577,7 @@
}
}
} catch (SizeLimitExceededException slee) {
- // we just return the list as it is
+// we just return the list as it is
logger.debug(
"Search generated more than configured maximum search limit
in " +
DEFAULT_CONFIGURATION_FILE +
@@ -888,6 +888,7 @@
}
protected JahiaLDAPUser lookupUserFromDN(String dn) {
+ logger.debug ("Lookup user from dn " + dn);
JahiaLDAPUser user = null;
try {
