From portal-commits at lists.jboss.org Tue Jan 27 08:00:33 2009
Content-Type: multipart/mixed; boundary="===============2051097586485496541=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r12660 -
 modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap.
Date: Tue, 27 Jan 2009 08:00:33 -0500
Message-ID: <E1LRnYP-0005yu-7i@committer01.frg.pub.inap.atl.jboss.com>

--===============2051097586485496541==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2009-01-27 08:00:33 -0500 (Tue, 27 Jan 2009)
New Revision: 12660

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/LDAPStaticRoleMembershipModuleImpl.java
Log:
JBPORTAL-2282

Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/ma=
in/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org=
/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java	2009-0=
1-27 12:35:51 UTC (rev 12659)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org=
/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java	2009-0=
1-27 13:00:33 UTC (rev 12660)
@@ -167,7 +167,7 @@
          }
 =

          //obtain Role entry attributes from directory
-         Attributes attrs =3D ldapContext.getAttributes(ldapRole.getDn());
+         Attributes attrs =3D ldapContext.getAttributes(ldapRole.getDn(), =
new String[] {getMemberAttributeID()});
 =

          //log.debug("Role attributes: " + attrs);
          if (attrs =3D=3D null)

Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/ma=
in/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org=
/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java	2009-01=
-27 12:35:51 UTC (rev 12659)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org=
/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java	2009-01=
-27 13:00:33 UTC (rev 12660)
@@ -49,7 +49,7 @@
  * @author <a href=3D"mailto:boleslaw.dawidowicz(a)jboss.org">Boleslaw Daw=
idowicz</a>
  * @version $Revision: 1.1 $
  */
-public class LDAPStaticRoleMembershipModuleImpl extends LDAPMembershipModu=
le//extends AbstractJBossService implements MembershipModule
+public class LDAPStaticRoleMembershipModuleImpl extends LDAPMembershipModu=
le
 {
 =

    private static final org.jboss.logging.Logger log =3D org.jboss.logging=
.Logger.getLogger(LDAPStaticRoleMembershipModuleImpl.class);
@@ -98,7 +98,7 @@
          }
 =

          //obtain Role entry attributes from directory
-         Attributes attrs =3D ldapContext.getAttributes(ldapUser.getDn());
+         Attributes attrs =3D ldapContext.getAttributes(ldapUser.getDn(), =
new String[] {getMemberAttributeID()});
 =

          //log.debug("User attributes: " + attrs);
          if (attrs =3D=3D null )


--===============2051097586485496541==--