Author: bdaw Date: 2007-08-20 16:49:59 -0400 (Mon, 20 Aug 2007) New Revision: 8004 Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/opends-config.xml branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/openldap-config.xml branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/rhds-config.xml branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/sunds-config.xml branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-opends.ldif branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-openldap.ldif branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-sunds.ldif branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa.ldif Log: JBPORTAL-1592 - Backslashes not escaped correctly with ldap modules Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java 2007-08-20 20:49:59 UTC (rev 8004) @@ -200,7 +200,7 @@ } /** - * This method should be used by over modules to perform searches. It will allow user module + * This method should be used by other modules to perform searches. It will allow role module * implementation to apply proper filter and search scope from the configuration * * @param filter that will be concatenated with proper user search filter from the module @@ -213,6 +213,9 @@ controls.setReturningObjFlag(true); controls.setTimeLimit(getSearchTimeLimit()); + // + filter = filter.replaceAll("\\\\", "\\\\\\\\"); + log.debug("Search filter: " + filter); if (log.isDebugEnabled() && filterArgs != null) { @@ -222,7 +225,7 @@ log.debug("Search filterArg: {" + i + "}: " + filterArg); } } - log.debug("Search ctx: " + getRoleCtxDN()); + log.debug("Search ctx: " + getRoleSearchCtxDNs()); Set roleCtxs = getRoleSearchCtxDNs(); Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2007-08-20 20:49:59 UTC (rev 8004) @@ -232,7 +232,7 @@ log.debug("Search filterArg: {" + i + "}: " + filterArg); } } - log.debug("Search ctx: " + getUserSearchCtxDN()); + log.debug("Search ctx: " + getUserSearchCtxDNs()); Set userCtxs = getUserSearchCtxDNs(); Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java 2007-08-20 20:49:59 UTC (rev 8004) @@ -305,6 +305,7 @@ controls.setReturningObjFlag(true); //String filter = getUidAttributeID().concat("=").concat(userName); + filter = filter.replaceAll("\\\\", "\\\\\\\\"); log.debug("Search filter: " + filter); Enumeration results = null; Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-08-20 20:49:59 UTC (rev 8004) @@ -412,16 +412,24 @@ user = userModule.createUser("user2, Test", "password"); users.add(user); - membershipModule.assignUsers(role, users); + // //create names with RFC 2253 exceptions - userModule.createUser("test ++", "password"); - userModule.createUser("test \"", "password"); + user = userModule.createUser("test ++", "password"); + users.add(user); + user = userModule.createUser("test \"", "password"); + users.add(user); //userModule.createUser("test \\", "password"); - userModule.createUser("test <", "password"); - userModule.createUser("test >", "password"); - userModule.createUser("test ;", "password"); + //users.add(user); + user = userModule.createUser("test <", "password"); + users.add(user); + user = userModule.createUser("test >", "password"); + users.add(user); + user = userModule.createUser("test ;", "password"); + users.add(user); + membershipModule.assignUsers(role, users); + ctx.commit(); ctx.begin(); @@ -430,7 +438,7 @@ users = membershipModule.getUsers(role); - assertEquals(3, users.size()); + assertEquals(8, users.size()); assertNotNull(userModule.findUserByUserName("user, Test")); assertNotNull(userModule.findUserByUserName("user1, Test")); Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java 2007-08-20 20:49:59 UTC (rev 8004) @@ -6,12 +6,18 @@ import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.NoSuchUserException; +import org.jboss.portal.identity.UserModule; +import org.jboss.portal.identity.MembershipModule; +import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.Role; import org.jboss.portal.identity.ldap.LDAPRoleImpl; import java.util.Set; import java.util.List; import java.util.LinkedList; import java.util.Iterator; +import java.util.HashSet; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> @@ -26,8 +32,15 @@ return createTestSuite(LDAPExtRoleModuleTestCase.class, "directories-extrolemodule.xml", "datasources.xml"); } + UserModule userModule; + RoleModule roleModule; + MembershipModule membershipModule; + + UserProfileModule userProfileModule; + + private String suffix; public void setUp() throws Exception @@ -61,7 +74,11 @@ controller.setRegisterMBeans(false); controller.start(); identityContext = controller.getIdentityContext(); - this.roleModule = (RoleModule)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE); + userModule = (UserModule)identityContext.getObject(IdentityContext.TYPE_USER_MODULE); + userModule = (UserModule)identityContext.getObject(IdentityContext.TYPE_USER_MODULE); + roleModule = (RoleModule)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE); + membershipModule = (MembershipModule)identityContext.getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE); + userProfileModule = (UserProfileModule)identityContext.getObject(IdentityContext.TYPE_USER_PROFILE_MODULE); suffix = getDirectoryServerConfigParameter().getCleanUpDN(); @@ -200,4 +217,44 @@ } } + + public void testNonStandardName() throws Exception + { + User u = userModule.findUserByUserName("jduke1"); + assertNotNull(u); + + Set roles = membershipModule.getRoles(u); + + assertEquals(2, roles.size()); + + Set roleNames = new HashSet(); + for (Iterator iterator = roles.iterator(); iterator.hasNext();) + { + Role role = (Role)iterator.next(); + roleNames.add(role.getName()); + System.out.println("ROlE NAME: " + role.getName()); + } + + + assertTrue(roleNames.contains("Echo")); + assertTrue(roleNames.contains("User11")); + + + u = userModule.findUserByUserName("jduke4, Duke"); + assertNotNull(u); + + roles = membershipModule.getRoles(u); + + roleNames = new HashSet(); + for (Iterator iterator = roles.iterator(); iterator.hasNext();) + { + Role role = (Role)iterator.next(); + roleNames.add(role.getName()); + } + + assertTrue(roleNames.contains("Echo")); + assertTrue(roleNames.contains("User11")); + + + } } Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTestCase.java 2007-08-20 20:49:59 UTC (rev 8004) @@ -21,6 +21,7 @@ import java.util.Set; import java.util.HashSet; +import java.util.Iterator; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> @@ -152,4 +153,42 @@ } + + public void testNonStandardName() throws Exception + { + User u = userModule.findUserByUserName("jduke1"); + assertNotNull(u); + + Set roles = membershipModule.getRoles(u); + + assertEquals(1, roles.size()); + + Set roleNames = new HashSet(); + for (Iterator iterator = roles.iterator(); iterator.hasNext();) + { + Role role = (Role)iterator.next(); + roleNames.add(role.getName()); + System.out.println("ROlE NAME: " + role.getName()); + } + + + assertTrue(roleNames.contains("Echo")); + + + u = userModule.findUserByUserName("jduke4, Duke"); + assertNotNull(u); + + roles = membershipModule.getRoles(u); + + roleNames = new HashSet(); + for (Iterator iterator = roles.iterator(); iterator.hasNext();) + { + Role role = (Role)iterator.next(); + roleNames.add(role.getName()); + } + + assertTrue(roleNames.contains("Echo")); + + + } } Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-08-20 20:49:59 UTC (rev 8004) @@ -102,7 +102,7 @@ } 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())); + assertTrue(names.contains((prefix + "=jduke4\\, Duke,ou=People," + suffix).toLowerCase())); } //TODO:extend this @@ -143,7 +143,7 @@ { Set users = new HashSet(); users.add((LDAPUserImpl)userModule.findUserByUserName("jduke1")); - users.add((LDAPUserImpl)userModule.findUserByUserName("jduke4")); + users.add((LDAPUserImpl)userModule.findUserByUserName("jduke4, Duke")); LDAPRoleImpl role = (LDAPRoleImpl)roleModule.findRoleByName("Echo1"); membershipModule.assignUsers(role,users); @@ -160,7 +160,7 @@ } assertTrue(names.contains((prefix + "=jduke1,ou=People," + suffix).toLowerCase())); - assertTrue(names.contains((prefix + "=jduke4,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke4\\, Duke,ou=People," + suffix).toLowerCase())); } @@ -169,7 +169,7 @@ { Set users = new HashSet(); users.add(userModule.findUserByUserName("jduke3")); - users.add(userModule.findUserByUserName("jduke4")); + users.add(userModule.findUserByUserName("jduke4, Duke")); LDAPRoleImpl role = (LDAPRoleImpl)roleModule.findRoleByName("Echo1"); membershipModule.assignUsers(role,users); @@ -186,7 +186,7 @@ } assertTrue(names.contains((prefix + "=jduke3,ou=People," + suffix).toLowerCase())); - assertTrue(names.contains((prefix + "=jduke4,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke4\\, Duke,ou=People," + suffix).toLowerCase())); } Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/opends-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/opends-config.xml 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/opends-config.xml 2007-08-20 20:49:59 UTC (rev 8004) @@ -110,7 +110,7 @@ <option> <name>roleCtxDN</name> <value>ou=Roles,dc=example,dc=com</value> - <value>ou=Roles1,dc=example,dc=com</value> + <!--<value>ou=Roles1,dc=example,dc=com</value>--> </option> </option-group> </options> Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/openldap-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/openldap-config.xml 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/openldap-config.xml 2007-08-20 20:49:59 UTC (rev 8004) @@ -106,7 +106,7 @@ <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> - <value>ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + <!--<value>ou=Roles1,dc=testsuite,dc=portal,dc=my-domain,dc=com</value>--> </option> <option> <name>userSearchFilter</name> Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/rhds-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/rhds-config.xml 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/rhds-config.xml 2007-08-20 20:49:59 UTC (rev 8004) @@ -106,7 +106,7 @@ <option> <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> - <value>ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <!--<value>ou=Roles1,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>--> </option> <option> <name>userSearchFilter</name> Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/sunds-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/sunds-config.xml 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/config/extuser/sunds-config.xml 2007-08-20 20:49:59 UTC (rev 8004) @@ -110,7 +110,7 @@ <option> <name>roleCtxDN</name> <value>ou=Roles,dc=example,dc=com</value> - <value>ou=Roles1,dc=example,dc=com</value> + <!--<value>ou=Roles1,dc=example,dc=com</value>--> </option> </option-group> </options> Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-opends.ldif =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-opends.ldif 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-opends.ldif 2007-08-20 20:49:59 UTC (rev 8004) @@ -51,11 +51,11 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke4,ou=People,dc=example,dc=com +dn: uid=jduke4\, Duke,ou=People,dc=example,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person -uid: jduke4 +uid: jduke4, Duke cn: Java Duke4 sn: Duke4 userPassword: theduke @@ -124,7 +124,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=example,dc=com member: uid=jduke3,ou=People,dc=example,dc=com -member: uid=jduke4,ou=People,dc=example,dc=com +member: uid=jduke4\, Duke,ou=People,dc=example,dc=com dn: cn=Echo1,ou=Roles,dc=example,dc=com objectClass: top @@ -154,7 +154,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=example,dc=com member: uid=jduke3,ou=People,dc=example,dc=com -member: uid=jduke4,ou=People,dc=example,dc=com +member: uid=jduke4\, Duke,ou=People,dc=example,dc=com dn: ou=Roles2,dc=example,dc=com objectclass: top @@ -168,7 +168,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=example,dc=com member: uid=jduke3,ou=People,dc=example,dc=com -member: uid=jduke4,ou=People,dc=example,dc=com +member: uid=jduke4\, Duke,ou=People,dc=example,dc=com Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-openldap.ldif =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-openldap.ldif 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-openldap.ldif 2007-08-20 20:49:59 UTC (rev 8004) @@ -51,11 +51,11 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +dn: uid=jduke4\, Duke,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person -uid: jduke4 +uid: jduke4, Duke cn: Java Duke4 sn: Duke4 userPassword: theduke @@ -124,7 +124,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com -member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke4\, Duke,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com dn: cn=Echo1,ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com objectClass: top @@ -155,7 +155,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com -member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke4\, Duke,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com dn: ou=Roles2,dc=testsuite,dc=portal,dc=my-domain,dc=com objectclass: top @@ -169,7 +169,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com -member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke4\, Duke,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com # tree2 Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-sunds.ldif =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-sunds.ldif 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa-sunds.ldif 2007-08-20 20:49:59 UTC (rev 8004) @@ -51,11 +51,11 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke4,ou=People,dc=example,dc=com +dn: uid=jduke4\, Duke,ou=People,dc=example,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person -uid: jduke4 +uid: jduke4, Duke cn: Java Duke4 sn: Duke4 userPassword: theduke @@ -124,7 +124,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=example,dc=com member: uid=jduke3,ou=People,dc=example,dc=com -member: uid=jduke4,ou=People,dc=example,dc=com +member: uid=jduke4\, Duke,ou=People,dc=example,dc=com dn: cn=Echo1,ou=Roles,dc=example,dc=com objectClass: top @@ -154,7 +154,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=example,dc=com member: uid=jduke3,ou=People,dc=example,dc=com -member: uid=jduke4,ou=People,dc=example,dc=com +member: uid=jduke4\, Duke,ou=People,dc=example,dc=com dn: ou=Roles2,dc=example,dc=com objectclass: top @@ -168,7 +168,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=example,dc=com member: uid=jduke3,ou=People,dc=example,dc=com -member: uid=jduke4,ou=People,dc=example,dc=com +member: uid=jduke4\, Duke,ou=People,dc=example,dc=com Modified: branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa.ldif =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa.ldif 2007-08-20 14:46:16 UTC (rev 8003) +++ branches/JBoss_Portal_Branch_2_6/identity/src/resources/test/ldif/initial-tests-qa.ldif 2007-08-20 20:49:59 UTC (rev 8004) @@ -51,11 +51,11 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: uid=jduke4\, Duke,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person -uid: jduke4 +uid: jduke4, Duke cn: Java Duke4 sn: Duke4 userPassword: theduke @@ -124,7 +124,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke4\, Duke,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com dn: cn=Echo1,ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectClass: top @@ -154,7 +154,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke4\, Duke,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com dn: ou=Roles2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com objectclass: top @@ -168,7 +168,7 @@ description: the JBossAdmin group member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke4\, Duke,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com # tree2