Author: bdaw
Date: 2007-01-24 18:57:02 -0500 (Wed, 24 Jan 2007)
New Revision: 6093
Modified:
trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml
trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml
trunk/core/src/resources/portal-core-sar/conf/login-config.xml
trunk/identity/build.xml
trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModule.java
trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTestCase.java
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java
trunk/identity/src/resources/test/config/msad-config.xml
trunk/identity/src/resources/test/config/opends-config.xml
trunk/identity/src/resources/test/config/openldap-config.xml
trunk/identity/src/resources/test/config/rhds-config.xml
trunk/identity/src/resources/test/config/standardidentity-config.xml
trunk/test/src/etc/directories.xml
trunk/test/src/etc/ldap/ldif/initial-tests-qa-msad.ldif
Log:
- added MSAD into testsuite (still not all tests pass)
- minor bugs correction
Modified: trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml
===================================================================
---
trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-01-24
23:48:11 UTC (rev 6092)
+++
trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-01-24
23:57:02 UTC (rev 6093)
@@ -125,5 +125,19 @@
<value>none</value>
</option>
</option-group>
+ <option-group>
+ <group-name>roleCreateAttibutes</group-name>
+ <!--Schema requires those to have initial value-->
+ <option>
+ <name>cn</name>
+ <value>none</value>
+ </option>
+ <!--Some directory servers require this attribute to be valid DN-->
+ <!--For safety reasons point to the admin user here-->
+ <option>
+ <name>member</name>
+
<value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value>
+ </option>
+ </option-group>
</options>
</identity-configuration>
\ No newline at end of file
Modified:
trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml
===================================================================
---
trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2007-01-24
23:48:11 UTC (rev 6092)
+++
trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2007-01-24
23:57:02 UTC (rev 6093)
@@ -333,7 +333,7 @@
<value>ou=People,dc=example,dc=com</value>
</option>
<option>
- <name>uidAttributeId</name>
+ <name>uidAttributeID</name>
<value>uid</value>
</option>
<option>
@@ -371,10 +371,10 @@
<value>inetUser</value>
</option>
<!--Schema requires those to have initial value-->
- <option>
+ <!--<option>
<name>cn</name>
<value>none</value>
- </option>
+ </option>-->
<option>
<name>sn</name>
<value>none</value>
@@ -388,16 +388,16 @@
<value>groupOfNames</value>
</option>
<!--Schema requires those to have initial value-->
- <option>
+ <!--<option>
<name>cn</name>
<value>none</value>
- </option>
+ </option>-->
<!--Some directory servers require this attribute to be valid DN-->
<!--For safety reasons point to the admin user here-->
- <option>
+ <!--<option>
<name>member</name>
<value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value>
- </option>
+ </option>-->
</option-group>
</options>
</identity-configuration>
\ No newline at end of file
Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-01-24 23:48:11 UTC
(rev 6092)
+++ trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-01-24 23:57:02 UTC
(rev 6093)
@@ -41,14 +41,14 @@
that are not mapped as attribute you may have LDAP user synchronized into DB
with no password set.
Please see HibernateUserProfileImpl module options
"synchronizeNonExistingUsers", "acceptOtherImplementations"
"defaultSynchronizePassword" or
"randomSynchronizePassword" to manage this behaviour-->
- <login-module code =
"org.jboss.portal.identity.auth.DBIdentityLoginModule"
flag="sufficient">
+ <!--<login-module code =
"org.jboss.portal.identity.auth.DBIdentityLoginModule"
flag="sufficient">
<module-option
name="dsJndiName">java:/PortalDS</module-option>
<module-option name="principalsQuery">SELECT jbp_password
FROM jbp_users WHERE jbp_uname=?</module-option>
<module-option name="rolesQuery">SELECT jbp_roles.jbp_name,
'Roles' FROM jbp_role_membership INNER JOIN jbp_roles ON
jbp_role_membership.jbp_rid = jbp_roles.jbp_rid INNER JOIN jbp_users ON
jbp_role_membership.jbp_uid = jbp_users.jbp_uid WHERE
jbp_users.jbp_uname=?</module-option>
<module-option
name="hashAlgorithm">MD5</module-option>
<module-option name="hashEncoding">HEX</module-option>
<module-option
name="additionalRole">Authenticated</module-option>
- </login-module>
+ </login-module>-->
<login-module
code="org.jboss.portal.identity.auth.IdentityLoginModule"
flag="required">
<module-option
name="unauthenticatedIdentity">guest</module-option>
Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml 2007-01-24 23:48:11 UTC (rev 6092)
+++ trunk/identity/build.xml 2007-01-24 23:57:02 UTC (rev 6093)
@@ -455,9 +455,9 @@
<!--<test todir="${test.reports}"
name="org.jboss.portal.test.identity.UserProtoTestCase"/>-->
<!--<test todir="${test.reports}"
name="org.jboss.portal.test.identity.ConfigurationTestCase"/>-->
<!--<test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPSimpleUserModuleTestCase"/>-->
- <!--<test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPSimpleRoleModuleTestCase"/>-->
+ <test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPSimpleRoleModuleTestCase"/>
<!--<test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPStaticGroupMembershipModuleTestCase"/>-->
- <test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/>
+ <!--<test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/>-->
<!--<test todir="${test.reports}"
name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/>-->
</x-test>
<x-classpath>
Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModule.java 2007-01-24
23:48:11 UTC (rev 6092)
+++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModule.java 2007-01-24
23:57:02 UTC (rev 6093)
@@ -89,7 +89,7 @@
try
{
- log.debug("Attributes: " + attrs);
+ //log.debug("Attributes: " + attrs);
//role name
Attribute uida = attrs.get(getRidAttributeID());
Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java 2007-01-24
23:48:11 UTC (rev 6092)
+++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java 2007-01-24
23:57:02 UTC (rev 6093)
@@ -118,7 +118,7 @@
LDAPUserImpl ldapu = null;
try
{
- log.debug("Search result attributes: " + attrs);
+ //log.debug("Search result attributes: " + attrs);
Attribute uida = attrs.get(getUidAttributeID());
Modified:
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTestCase.java
===================================================================
---
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTestCase.java 2007-01-24
23:48:11 UTC (rev 6092)
+++
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTestCase.java 2007-01-24
23:57:02 UTC (rev 6093)
@@ -100,14 +100,14 @@
public void testFindRoleByName() throws Exception
{
LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleById("Echo");
- assertEquals(ldapr.getDn(), "cn=Echo,ou=Roles," + suffix);
+ assertEquals(ldapr.getDn().toLowerCase(), ("cn=Echo,ou=Roles," +
suffix).toLowerCase());
assertEquals(ldapr.getName(), "Echo");
}
public void testRemoveRole() throws Exception
{
LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleById("Echo");
- assertEquals(ldapr.getDn(), "cn=Echo,ou=Roles," + suffix);
+ assertEquals(ldapr.getDn().toLowerCase(), ("cn=Echo,ou=Roles," +
suffix).toLowerCase());
assertEquals(ldapr.getName(), "Echo");
roleModule.removeRole("Echo");
try
@@ -136,8 +136,8 @@
try
{
- ldapr = (LDAPRoleImpl)roleModule.findRoleById("testRole");
- fail("");
+ roleModule.findRoleById("testRole");
+ fail("shouldn reach this");
}
catch (Exception e)
{
@@ -150,7 +150,7 @@
public void testgetRoleCount() throws Exception
{
LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleById("Echo");
- assertEquals(ldapr.getDn(), "cn=Echo,ou=Roles," + suffix);
+ assertEquals(ldapr.getDn().toLowerCase(), ("cn=Echo,ou=Roles," +
suffix).toLowerCase());
assertEquals(ldapr.getName(), "Echo");
int count = roleModule.getRolesCount();
@@ -168,9 +168,9 @@
for (Iterator iterator = roles.iterator(); iterator.hasNext();)
{
LDAPRoleImpl role = (LDAPRoleImpl)iterator.next();
- roleNames.add(role.getDn());
+ roleNames.add(role.getDn().toLowerCase());
}
- assertTrue(roleNames.contains("cn=Echo,ou=Roles," + suffix));
+ assertTrue(roleNames.contains(("cn=Echo,ou=Roles," +
suffix).toLowerCase()));
//
@@ -183,10 +183,10 @@
for (Iterator iterator = roles.iterator(); iterator.hasNext();)
{
LDAPRoleImpl role = (LDAPRoleImpl)iterator.next();
- roleNames.add(role.getDn());
+ roleNames.add(role.getDn().toLowerCase());
}
- assertTrue(roleNames.contains("cn=Echo,ou=Roles," + suffix));
- assertTrue(roleNames.contains("cn=Echo1,ou=Roles," + suffix));
+ assertTrue(roleNames.contains(("cn=Echo,ou=Roles," +
suffix).toLowerCase()));
+ assertTrue(roleNames.contains(("cn=Echo1,ou=Roles," +
suffix).toLowerCase()));
//
roles = roleModule.findRolesByNames(new String[] {"Echo",
"Echo1", "TheDuke"});
@@ -198,10 +198,10 @@
for (Iterator iterator = roles.iterator(); iterator.hasNext();)
{
LDAPRoleImpl role = (LDAPRoleImpl)iterator.next();
- roleNames.add(role.getDn());
+ roleNames.add(role.getDn().toLowerCase());
}
- assertTrue(roleNames.contains("cn=Echo,ou=Roles," + suffix));
- assertTrue(roleNames.contains("cn=Echo1,ou=Roles," + suffix));
- assertTrue(roleNames.contains("cn=TheDuke,ou=Roles," + suffix));
+ assertTrue(roleNames.contains(("cn=Echo,ou=Roles," +
suffix).toLowerCase()));
+ assertTrue(roleNames.contains(("cn=Echo1,ou=Roles," +
suffix).toLowerCase()));
+ assertTrue(roleNames.contains(("cn=TheDuke,ou=Roles," +
suffix).toLowerCase()));
}
}
Modified:
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java
===================================================================
---
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java 2007-01-24
23:48:11 UTC (rev 6092)
+++
trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTestCase.java 2007-01-24
23:57:02 UTC (rev 6093)
@@ -26,6 +26,7 @@
import org.jboss.portal.identity.UserModule;
import org.jboss.portal.identity.ldap.LDAPUserImpl;
import org.jboss.portal.identity.ldap.LDAPRoleImpl;
+import org.jboss.portal.identity.ldap.LDAPUserModuleImpl;
import org.jboss.portal.identity.IdentityServiceControllerImpl;
import org.jboss.portal.identity.IdentityContext;
import org.jboss.portal.identity.User;
@@ -34,6 +35,7 @@
import org.jboss.portal.identity.UserProfileModule;
import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.IdentityConfiguration;
import org.jboss.portal.test.identity.ldap.LDAPTestCase;
import java.util.Set;
@@ -65,6 +67,8 @@
private String suffix;
+ private String userPrefix;
+
public void setUp() throws Exception
{
super.setUp();
@@ -105,6 +109,7 @@
suffix = getDirectoryServerConfigParameter().getCleanUpDN();
+ userPrefix =
((IdentityConfiguration)controller.getIdentityContext().getObject(IdentityContext.TYPE_IDENTITY_CONFIGURATION)).getValue(IdentityConfiguration.USER_UID_ATTRIBUTE_ID);
populate();
}
@@ -118,7 +123,7 @@
public void testFindUserByName() throws Exception
{
LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke");
- assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix);
+ assertEquals(ldapu.getDn().toLowerCase(), (userPrefix +
"=jduke,ou=People," + suffix).toLowerCase());
assertEquals(ldapu.getUserName(), "jduke");
}
@@ -126,11 +131,11 @@
{
LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke");
assertNotNull(ldapu);
- assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix);
+ assertEquals(ldapu.getDn().toLowerCase(), (userPrefix +
"=jduke,ou=People," + suffix).toLowerCase());
userModule.removeUser("jduke");
try
{
- ldapu = (LDAPUserImpl)userModule.findUserById("jduke");
+ userModule.findUserById("jduke");
fail();
}
catch (IdentityException e)
@@ -166,7 +171,7 @@
public void testgetUserCount() throws Exception
{
LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke");
- assertEquals(ldapu.getDn(), "uid=jduke,ou=People," + suffix);
+ assertEquals(ldapu.getDn().toLowerCase(),(userPrefix +
"=jduke,ou=People," + suffix).toLowerCase());
assertEquals(ldapu.getUserName(), "jduke");
int count = userModule.getUserCount();
Modified: trunk/identity/src/resources/test/config/msad-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/msad-config.xml 2007-01-24 23:48:11 UTC (rev
6092)
+++ trunk/identity/src/resources/test/config/msad-config.xml 2007-01-24 23:57:02 UTC (rev
6093)
@@ -98,12 +98,16 @@
<option-group>
<group-name>common</group-name>
<option>
+ <name>uidAttributeID</name>
+ <value>cn</value>
+ </option>
+ <option>
<name>userContainerDN</name>
-
<value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+ <value>ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test</value>
</option>
<option>
<name>roleContainerDN</name>
-
<value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+ <value>ou=Roles,ou=testsuite,ou=portal,dc=jboss,dc=test</value>
</option>
</option-group>
<option-group>
@@ -114,16 +118,32 @@
<value>top</value>
<value>person</value>
<value>inetOrgPerson</value>
+ <value>organizationalPerson</value>
+ <value>user</value>
</option>
+ <!--<option>
+ <name>sAMAccountName</name>
+ <value>toto</value>
+ </option>-->
<!--Schema requires those to have initial value-->
- <option>
+ <!--<option>
<name>cn</name>
<value>none</value>
- </option>
+ </option>-->
<option>
<name>sn</name>
<value>none</value>
</option>
</option-group>
+ <option-group>
+ <group-name>roleCreateAttibutes</group-name>
+ <!--Some directory servers require this attribute to be valid DN-->
+ <!--For safety reasons point to the admin user here-->
+ <option>
+ <name>member</name>
+
<!--<value>cn=Administrator,cd=Users,dc=jboss,dc=test</value>-->
+
<value>cn=jduke,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test</value>
+ </option>
+ </option-group>
</options>
</identity-configuration>
\ No newline at end of file
Modified: trunk/identity/src/resources/test/config/opends-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/opends-config.xml 2007-01-24 23:48:11 UTC
(rev 6092)
+++ trunk/identity/src/resources/test/config/opends-config.xml 2007-01-24 23:57:02 UTC
(rev 6093)
@@ -125,5 +125,19 @@
<value>none</value>
</option>
</option-group>
+ <option-group>
+ <group-name>roleCreateAttibutes</group-name>
+ <!--Schema requires those to have initial value-->
+ <option>
+ <name>cn</name>
+ <value>none</value>
+ </option>
+ <!--Some directory servers require this attribute to be valid DN-->
+ <!--For safety reasons point to the admin user here-->
+ <option>
+ <name>member</name>
+
<value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value>
+ </option>
+ </option-group>
</options>
</identity-configuration>
\ No newline at end of file
Modified: trunk/identity/src/resources/test/config/openldap-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/openldap-config.xml 2007-01-24 23:48:11 UTC
(rev 6092)
+++ trunk/identity/src/resources/test/config/openldap-config.xml 2007-01-24 23:57:02 UTC
(rev 6093)
@@ -125,5 +125,19 @@
<value>none</value>
</option>
</option-group>
+ <option-group>
+ <group-name>roleCreateAttibutes</group-name>
+ <!--Schema requires those to have initial value-->
+ <option>
+ <name>cn</name>
+ <value>none</value>
+ </option>
+ <!--Some directory servers require this attribute to be valid DN-->
+ <!--For safety reasons point to the admin user here-->
+ <option>
+ <name>member</name>
+
<value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value>
+ </option>
+ </option-group>
</options>
</identity-configuration>
\ No newline at end of file
Modified: trunk/identity/src/resources/test/config/rhds-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/rhds-config.xml 2007-01-24 23:48:11 UTC (rev
6092)
+++ trunk/identity/src/resources/test/config/rhds-config.xml 2007-01-24 23:57:02 UTC (rev
6093)
@@ -125,5 +125,19 @@
<value>none</value>
</option>
</option-group>
+ <option-group>
+ <group-name>roleCreateAttibutes</group-name>
+ <!--Schema requires those to have initial value-->
+ <option>
+ <name>cn</name>
+ <value>none</value>
+ </option>
+ <!--Some directory servers require this attribute to be valid DN-->
+ <!--For safety reasons point to the admin user here-->
+ <option>
+ <name>member</name>
+
<value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value>
+ </option>
+ </option-group>
</options>
</identity-configuration>
\ No newline at end of file
Modified: trunk/identity/src/resources/test/config/standardidentity-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-01-24
23:48:11 UTC (rev 6092)
+++ trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-01-24
23:57:02 UTC (rev 6093)
@@ -331,7 +331,7 @@
<value>ou=People,dc=example,dc=com</value>
</option>
<option>
- <name>uidAttributeId</name>
+ <name>uidAttributeID</name>
<value>uid</value>
</option>
<option>
@@ -343,7 +343,7 @@
<value>ou=Roles,dc=example,dc=com</value>
</option>
<option>
- <name>ridAttributeId</name>
+ <name>ridAttributeID</name>
<value>cn</value>
</option>
<option>
@@ -369,10 +369,10 @@
<value>inetUser</value>
</option>
<!--Schema requires those to have initial value-->
- <option>
+ <!--<option>
<name>cn</name>
<value>none</value>
- </option>
+ </option>-->
<option>
<name>sn</name>
<value>none</value>
@@ -386,16 +386,16 @@
<value>groupOfNames</value>
</option>
<!--Schema requires those to have initial value-->
- <option>
+ <!--<option>
<name>cn</name>
<value>none</value>
- </option>
+ </option>-->
<!--Some directory servers require this attribute to be valid DN-->
<!--For safety reasons point to the admin user here-->
- <option>
+ <!--<option>
<name>member</name>
<value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value>
- </option>
+ </option>-->
</option-group>
</options>
</identity-configuration>
Modified: trunk/test/src/etc/directories.xml
===================================================================
--- trunk/test/src/etc/directories.xml 2007-01-24 23:48:11 UTC (rev 6092)
+++ trunk/test/src/etc/directories.xml 2007-01-24 23:57:02 UTC (rev 6093)
@@ -52,7 +52,7 @@
<cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn>
</directory>
- <!--<directory>
+ <directory>
<directory-name>MSAD</directory-name>
<description>Microsoft Active Directory in QA Labs (need vpn
access)</description>
@@ -65,9 +65,9 @@
<populate-ldif>ldap/ldif/initial-tests-qa-msad.ldif</populate-ldif>
- <cleanup-dn>dc=testsuite,ou=portal,dc=jboss,dc=com</cleanup-dn>
- </directory>-->
- <directory>
+ <cleanup-dn>ou=testsuite,ou=portal,dc=jboss,dc=test</cleanup-dn>
+ </directory>
+ <directory>
<directory-name>OpenLDAP</directory-name>
<description>OpenLDAP Directory in QA Labs (need vpn
access)</description>
@@ -81,5 +81,5 @@
<populate-ldif>ldap/ldif/initial-tests-qa-openldap.ldif</populate-ldif>
<cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn>
- </directory>
+ </directory>
</directories>
Modified: trunk/test/src/etc/ldap/ldif/initial-tests-qa-msad.ldif
===================================================================
--- trunk/test/src/etc/ldap/ldif/initial-tests-qa-msad.ldif 2007-01-24 23:48:11 UTC (rev
6092)
+++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-msad.ldif 2007-01-24 23:57:02 UTC (rev
6093)
@@ -138,37 +138,40 @@
sn: Duke
userPassword: theduke
mail: email(a)email.com
-member: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
+#member: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
dn: cn=jduke1,ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
objectclass: top
-objectclass: inetOrgPerson
-objectclass: inetUser
+objectclass: person
+objectclass: organizationalPerson
+objectclass: user
cn: jduke1
#cn: Java Duke1
sn: Duke1
userPassword: theduke
mail: email(a)email.com
-member: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
-member: cn=Echo1,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
+#memberOf: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
+#memberOf: cn=Echo1,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
dn: cn=jduke2,ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
objectclass: top
-objectclass: inetOrgPerson
-objectclass: inetUser
+objectclass: person
+objectclass: organizationalPerson
+objectclass: user
cn: jduke2
#cn: Java Duke2
sn: Duke2
userPassword: theduke
mail: email(a)email.com
-member: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
-member: cn=Echo1,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
-member: cn=TheDuke,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
+#memberOf: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
+#memberOf: cn=Echo1,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
+#memberOf: cn=TheDuke,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
dn: cn=jduke3,ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
objectclass: top
-objectclass: inetOrgPerson
-objectclass: inetUser
+objectclass: person
+objectclass: organizationalPerson
+objectclass: user
cn: jduke3
#cn: Java Duke3
sn: Duke3
@@ -177,8 +180,9 @@
dn: cn=jduke4,ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test
objectclass: top
-objectclass: inetOrgPerson
-objectclass: inetUser
+objectclass: person
+objectclass: organizationalPerson
+objectclass: user
cn: jduke4
#cn: Java Duke4
sn: Duke4