Author: bdaw Date: 2007-02-02 10:10:17 -0500 (Fri, 02 Feb 2007) New Revision: 6145 Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java Log: - make some tests pass on MSAD Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2007-02-02 00:28:54 UTC (rev 6144) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2007-02-02 15:10:17 UTC (rev 6145) @@ -148,7 +148,7 @@ //obtain Role entry attributes from directory Attributes attrs = getConnectionContext().createInitialContext().getAttributes(ldapRole.getDn()); - log.debug("Role attributes: " + attrs); + //log.debug("Role attributes: " + attrs); if (attrs == null ) { throw new IdentityException("Cannot find Role with DN: " + ldapRole.getDn()); Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java 2007-02-02 00:28:54 UTC (rev 6144) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java 2007-02-02 15:10:17 UTC (rev 6145) @@ -83,7 +83,7 @@ //obtain Role entry attributes from directory Attributes attrs = getConnectionContext().createInitialContext().getAttributes(ldapUser.getDn()); - log.debug("User attributes: " + attrs); + //log.debug("User attributes: " + attrs); if (attrs == null ) { throw new IdentityException("Cannot find User with DN: " + ldapUser.getDn()); Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-02-02 00:28:54 UTC (rev 6144) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-02-02 15:10:17 UTC (rev 6145) @@ -31,6 +31,7 @@ import org.jboss.portal.identity.UserModule; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.identity.IdentityServiceControllerImpl; +import org.jboss.portal.identity.IdentityConfiguration; import java.util.Set; @@ -61,6 +62,8 @@ private String suffix; + private String prefix; + public void setUp() throws Exception { super.setUp(); @@ -77,7 +80,9 @@ suffix = getDirectoryServerConfigParameter().getCleanUpDN(); + prefix = ((IdentityConfiguration)identityContext.getObject(IdentityContext.TYPE_IDENTITY_CONFIGURATION)).getValue(IdentityConfiguration.USER_UID_ATTRIBUTE_ID); + populate(); } @@ -95,9 +100,9 @@ LDAPUserImpl user = (LDAPUserImpl)iterator.next(); names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains(("uid=jduke1,ou=People," + suffix).toLowerCase())); - assertTrue(names.contains(("uid=jduke3,ou=People," + suffix).toLowerCase())); - assertTrue(names.contains(("uid=jduke4,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke1,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke3,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke4,ou=People," + suffix).toLowerCase())); } //TODO:extend this @@ -154,8 +159,8 @@ names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains(("uid=jduke1,ou=People," + suffix).toLowerCase())); - assertTrue(names.contains(("uid=jduke4,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke1,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke4,ou=People," + suffix).toLowerCase())); } @@ -180,8 +185,8 @@ names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains(("uid=jduke3,ou=People," + suffix).toLowerCase())); - assertTrue(names.contains(("uid=jduke4,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke3,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke4,ou=People," + suffix).toLowerCase())); /*membershipModule.assignUsers(role,new HashSet()); users = membershipModule.getUsers(role);