[portal-commits] JBoss Portal SVN: r11991 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap.

[portal-commits at lists.jboss.org]

Author: bdaw
Date: 2008-09-26 08:26:45 -0400 (Fri, 26 Sep 2008)
New Revision: 11991

Modified:
   modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java
   modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
   modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java
   modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
Log:
- fix configuration for LDAP empty roles
- fix findUsersFilteredByUserName returning set of SearchResult object
- push minor search roles improvements

Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java	2008-09-26 11:51:14 UTC (rev 11990)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java	2008-09-26 12:26:45 UTC (rev 11991)
@@ -220,6 +220,9 @@
          controls.setReturningObjFlag(true);
          controls.setTimeLimit(getSearchTimeLimit());
 
+         String[] retAttr = {getRidAttributeID(), getDisplayNameAttributeID()};
+         controls.setReturningAttributes(retAttr);
+
          //
          filter = filter.replaceAll("\\\\", "\\\\\\\\");
 

Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java	2008-09-26 11:51:14 UTC (rev 11990)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java	2008-09-26 12:26:45 UTC (rev 11991)
@@ -181,7 +181,7 @@
             return new HashSet();
          }
 
-         return Tools.toSet(uf.subList(offset, size).iterator());
+         return processUsers(uf.subList(offset, size));
       }
       catch (NoSuchElementException e)
       {

Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java	2008-09-26 11:51:14 UTC (rev 11990)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java	2008-09-26 12:26:45 UTC (rev 11991)
@@ -428,7 +428,7 @@
 
                //can't remove the last member (if the attribute is required by schema)
                //TODO: workaround this somehow.... (adding goofy user or admin instead?)
-               if (attr.size() != 1)
+               if (!(attr.size() == 1 && isMembershipAttributeRequired()))
                {
                   //remove user name from the member list
                   attr.remove(memberName);

Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java	2008-09-26 11:51:14 UTC (rev 11990)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java	2008-09-26 12:26:45 UTC (rev 11991)
@@ -336,7 +336,7 @@
             return new HashSet();
          }
 
-         return Tools.toSet(uf.subList(offset, size).iterator());
+         return processUsers(uf.subList(offset, size));
       }
       catch (NoSuchElementException e)
       {