[portal-commits] JBoss Portal SVN: r6245 - in trunk: identity and 9 other directories.

Author: bdaw Date: 2007-02-13 07:54:12 -0500 (Tue, 13 Feb 2007) New Revision: 6245 Added: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java trunk/identity/src/resources/test/config/extrole/ trunk/identity/src/resources/test/config/extrole/opends-config.xml trunk/test/src/etc/directories-extrolemodule.xml 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/identity/build.xml trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java trunk/identity/src/resources/test/config/extuser/opends-config.xml trunk/identity/src/resources/test/config/identity/opends-config-staticrole.xml trunk/identity/src/resources/test/config/identity/opends-config.xml trunk/identity/src/resources/test/config/identity/openldap-config.xml trunk/identity/src/resources/test/config/identity/rhds-config-staticrole.xml trunk/identity/src/resources/test/config/identity/rhds-config.xml 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/identity/src/resources/test/config/staticrole/opends-config.xml trunk/identity/src/resources/test/config/staticrole/rhds-config.xml Log: - minor change of parameter naming - base LDAPExtRoleModule testcase 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-02-13 12:50:17 UTC (rev 6244) +++ trunk/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -33,20 +33,24 @@ <config> <option> <name>host</name> - <value>jboss.com</value> + <value>localhost</value> </option> <option> <name>port</name> - <value>10389</value> + <value>636</value> </option> <option> <name>adminDN</name> - <value>cn=Directory Manager</value> + <value>cn=Manager,dc=my-domain,dc=com</value> </option> <option> <name>adminPassword</name> - <value>qpq123qpq</value> + <value>secret</value> </option> + <option> + <name>protocol</name> + <value>ssl</value> + </option> </config> </datasource> </datasources> @@ -98,12 +102,12 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> - <value>ou=People,dc=portal26,dc=jboss,dc=com</value> + <name>userCtxDN</name> + <value>ou=People,o=portal,dc=my-domain,dc=com</value> </option> <option> - <name>roleContainerDN</name> - <value>ou=Roles,dc=portal26,dc=jboss,dc=com</value> + <name>roleCtxDN</name> + <value>ou=Roles,o=portal,dc=my-domain,dc=com</value> </option> </option-group> <option-group> 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-02-13 12:50:17 UTC (rev 6244) +++ trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -329,7 +329,7 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,dc=example,dc=com</value> </option> <option> @@ -341,7 +341,7 @@ <value>userPassword</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,dc=example,dc=com</value> </option> <option> Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/build.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -395,6 +395,7 @@ <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtUserModuleTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtRoleModuleTestCase"/> </x-test> @@ -459,6 +460,7 @@ <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtUserModuleTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtRoleModuleTestCase"/> </x-test> <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/> Modified: trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java 2007-02-13 12:54:12 UTC (rev 6245) @@ -62,7 +62,7 @@ public static final String USER_PRINCIPAL_SUFFIX = "principalDNSuffix"; - public static final String USER_CONTAINER_DN = "userContainerDN"; + //public static final String USER_CONTAINER_DN = "userContainerDN"; public static final String USER_UID_ATTRIBUTE_ID = "uidAttributeID"; @@ -70,11 +70,13 @@ public static final String USER_EMAIL_ATTRIBUTE_ID = "emailAttributeID"; - public static final String USER_SEARCH_CTX_DN = "userSearchCtxDN"; + public static final String USER_CONTEXT_DN = "userCtxDN"; + public static final String USER_CONTAINER_DN = USER_CONTEXT_DN; + public static final String USER_SEARCH_FILTER = "userSearchFilter"; - public static final String ROLE_CONTAINER_DN = "roleContainerDN"; + //public static final String ROLE_CONTAINER_DN = "roleContainerDN"; public static final String ROLE_RID_ATTRIBUTE_ID = "ridAttributeID"; @@ -87,8 +89,9 @@ public static final String ROLE_SEARCH_FILTER = "roleSearchFilter"; //TODO: - public static final String ROLE_CONTEXT_DN = "rolesCtxDN"; + public static final String ROLE_CONTEXT_DN = "roleCtxDN"; + public static final String ROLE_CONTAINER_DN = ROLE_CONTEXT_DN; public static final String MEMBERSHIP_ATTRIBUTE_ID = "membershipAttributeID"; Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java 2007-02-13 12:54:12 UTC (rev 6245) @@ -299,10 +299,10 @@ protected String getUserSearchCtxDN() throws IdentityException { - String searchCtx = getIdentityConfiguration().getValue(IdentityConfiguration.USER_SEARCH_CTX_DN); + String searchCtx = getIdentityConfiguration().getValue(IdentityConfiguration.USER_CONTEXT_DN); if (searchCtx == null) { - throw new IdentityException(IdentityConfiguration.USER_SEARCH_CTX_DN + " missing in configuration"); + throw new IdentityException(IdentityConfiguration.USER_CONTEXT_DN + " missing in configuration"); } else { @@ -331,7 +331,7 @@ protected int getSearchScope() throws IdentityException { int searchScope = SearchControls.ONELEVEL_SCOPE; - String scope = getIdentityConfiguration().getValue(IdentityConfiguration.USER_SEARCH_CTX_DN); + String scope = getIdentityConfiguration().getValue(IdentityConfiguration.USER_CONTEXT_DN); if (scope != null) { if ("OBJECT_SCOPE".equalsIgnoreCase(scope)) Added: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java (rev 0) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTestCase.java 2007-02-13 12:54:12 UTC (rev 6245) @@ -0,0 +1,184 @@ +package org.jboss.portal.test.identity.ldap; + +import junit.framework.TestSuite; +import org.jboss.portal.identity.RoleModule; +import org.jboss.portal.identity.IdentityServiceControllerImpl; +import org.jboss.portal.identity.IdentityContext; +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.ldap.LDAPRoleImpl; + +import java.util.Set; +import java.util.List; +import java.util.LinkedList; +import java.util.Iterator; + +/** + * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public class LDAPExtRoleModuleTestCase extends LDAPTestCase +{ + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LDAPExtRoleModuleTestCase.class); + + public static TestSuite suite() throws Exception + { + return createTestSuite(LDAPExtRoleModuleTestCase.class, "directories-extrolemodule.xml", "datasources.xml"); + } + + RoleModule roleModule; + + private String suffix; + + public void setUp() throws Exception + { + + super.setUp(); + + /*IdentityContextImpl context = new IdentityContextImpl(); + context.start(); + identityContext = context; + + SimpleConfigurationImpl configuration = new SimpleConfigurationImpl(); + configuration.setIdentityContext(identityContext); + configuration.setConfigFile(getDirectoryServerConfigParameter().getConfigFile()); + configuration.start(); + + LDAPConnectionContext connection = new LDAPConnectionContext(); + connection.setIdentityContext(identityContext); + connection.start(); + + LDAPRoleModuleImpl roleModule = new LDAPRoleModuleImpl(); + roleModule.setIdentityContext(identityContext); + //roleModule.setContainerDN("ou=Roles,dc=jboss,dc=org"); + //roleModule.setRidAttributeID("cn"); + roleModule.start(); + this.roleModule = roleModule;*/ + + IdentityServiceControllerImpl controller = new IdentityServiceControllerImpl(); + controller.setConfigFile(getDirectoryServerConfigParameter().getConfigFile()); + controller.setDefaultConfigFile("test/config/standardidentity-config.xml"); + controller.setRegisterMBeans(false); + controller.start(); + identityContext = controller.getIdentityContext(); + this.roleModule = (RoleModule)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE); + + suffix = getDirectoryServerConfigParameter().getCleanUpDN(); + + populate(); + + } + + + /*public void testFirstSimple() throws Exception + { + log.info("test framework works ;]"); + }*/ + + public void testFindRoleByName() throws Exception + { + LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleByName("Echo"); + assertEquals(ldapr.getDn().toLowerCase(), ("cn=Echo,ou=Roles," + suffix).toLowerCase()); + assertEquals(ldapr.getName(), "Echo"); + } + + /*public void testRemoveRole() throws Exception + { + LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleByName("Echo"); + assertEquals(ldapr.getDn().toLowerCase(), ("cn=Echo,ou=Roles," + suffix).toLowerCase()); + assertEquals(ldapr.getName(), "Echo"); + roleModule.removeRole(ldapr.getId()); + try + { + ldapr = (LDAPRoleImpl)roleModule.findRoleByName("Echo"); + fail(); + } + catch (IdentityException e) + { + //expected + } + //assertNull(ldapr); + } + + public void testCreateRole() throws Exception + { + LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.createRole("testRole", "testDisplayName"); + assertNotNull(ldapr); + assertEquals("testRole", ldapr.getName()); + //assertEquals("testDisplayName",ldapr.getDisplayName()); + + ldapr = (LDAPRoleImpl)roleModule.findRoleByName("testRole"); + assertNotNull(ldapr); + roleModule.removeRole(ldapr.getId()); + + + try + { + roleModule.findRoleByName("testRole"); + fail("shouldn reach this"); + } + catch (Exception e) + { + //expected + } + //assertNull(ldapr); + + }*/ + + public void testgetRoleCount() throws Exception + { + LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleByName("Echo"); + assertEquals(ldapr.getDn().toLowerCase(), ("cn=Echo,ou=Roles," + suffix).toLowerCase()); + assertEquals(ldapr.getName(), "Echo"); + + int count = roleModule.getRolesCount(); + assertEquals(3, count); + } + + public void testFindRolesByNames() throws Exception + { + Set roles = roleModule.findRolesByNames(new String[] {"Echo"}); + + assertEquals(1, roles.size()); + + List roleNames = new LinkedList(); + + for (Iterator iterator = roles.iterator(); iterator.hasNext();) + { + LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); + roleNames.add(role.getDn().toLowerCase()); + } + assertTrue(roleNames.contains(("cn=Echo,ou=Roles," + suffix).toLowerCase())); + + + // + roles = roleModule.findRolesByNames(new String[] {"Echo", "Echo1"}); + + assertEquals(2, roles.size()); + + roleNames = new LinkedList(); + + for (Iterator iterator = roles.iterator(); iterator.hasNext();) + { + LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); + roleNames.add(role.getDn().toLowerCase()); + } + 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"}); + + assertEquals(3, roles.size()); + + roleNames = new LinkedList(); + + for (Iterator iterator = roles.iterator(); iterator.hasNext();) + { + LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); + roleNames.add(role.getDn().toLowerCase()); + } + 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())); + } +} Added: trunk/identity/src/resources/test/config/extrole/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/opends-config.xml (rev 0) +++ trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + + <!--<!DOCTYPE identity-configuration PUBLIC + "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" + "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">--> + +<identity-configuration> + <datasources> + <datasource> + <name>LDAP</name> + <config> + <option> + <name>host</name> + <value>localhost</value> + </option> + <option> + <name>port</name> + <value>10389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>password</value> + </option> + </config> + </datasource> + </datasources> + <modules> + <module> + <!--type used to correctly map in IdentityContext registry--> + <type>User</type> + <implementation>LDAP</implementation> + <class>org.jboss.portal.identity.ldap.LDAPExtUserModuleImpl</class> + <config/> + </module> + <module> + <type>Role</type> + <implementation>LDAP</implementation> + <class>org.jboss.portal.identity.ldap.LDAPExtRoleModuleImpl</class> + <config/> + </module> + <module> + <type>Membership</type> + <implementation>LDAP</implementation> + <config/> + </module> + + <module> + <type>UserProfile</type> + <implementation>DELEGATING</implementation> + <config> + <option> + <name>profileConfigFile</name> + <value>test/config/profile-config.xml</value> + </option> + <option> + <name>ldapModuleJNDIName</name> + <value>java:/portal/LDAPUserProfileModule</value> + </option> + </config> + </module> + <module> + <type>DBDelegateUserProfile</type> + <implementation>DB</implementation> + <config/> + </module> + <module> + <type>LDAPDelegateUserProfile</type> + <implementation>LDAP</implementation> + <config/> + </module> + </modules> + + <options> + <option-group> + <group-name>common</group-name> + <option> + <name>userCtxDN</name> + <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + </option> + <option> + <name>userSearchFilter</name> + <value>(uid={0})</value> + </option> + <option> + <name>roleCtxDN</name> + <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + </option> + <option> + <name>roleSearchFilter</name> + <value><![CDATA[(& (objectClass=groupOfNames) (cn={0}))]]></value> + </option> + <option> + <name>searchScope</name> + <value>SUBTREE_SCOPE</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=admin,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Modified: trunk/identity/src/resources/test/config/extuser/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -99,7 +99,7 @@ <option-group> <group-name>common</group-name> <option> - <name>userSearchCtxDN</name> + <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> @@ -107,7 +107,7 @@ <value>(uid={0})</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> </option-group> Modified: trunk/identity/src/resources/test/config/identity/opends-config-staticrole.xml =================================================================== --- trunk/identity/src/resources/test/config/identity/opends-config-staticrole.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/identity/opends-config-staticrole.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -99,11 +99,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> Modified: trunk/identity/src/resources/test/config/identity/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/identity/opends-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/identity/opends-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -98,11 +98,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> </option-group> Modified: trunk/identity/src/resources/test/config/identity/openldap-config.xml =================================================================== --- trunk/identity/src/resources/test/config/identity/openldap-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/identity/openldap-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -98,11 +98,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> </option-group> Modified: trunk/identity/src/resources/test/config/identity/rhds-config-staticrole.xml =================================================================== --- trunk/identity/src/resources/test/config/identity/rhds-config-staticrole.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/identity/rhds-config-staticrole.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -99,11 +99,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> Modified: trunk/identity/src/resources/test/config/identity/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/identity/rhds-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/identity/rhds-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -98,11 +98,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> </option-group> Modified: trunk/identity/src/resources/test/config/msad-config.xml =================================================================== --- trunk/identity/src/resources/test/config/msad-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/msad-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -102,11 +102,11 @@ <value>cn</value> </option> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,ou=testsuite,ou=portal,dc=jboss,dc=test</value> </option> </option-group> Modified: trunk/identity/src/resources/test/config/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/opends-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/opends-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -98,11 +98,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> </option-group> Modified: trunk/identity/src/resources/test/config/openldap-config.xml =================================================================== --- trunk/identity/src/resources/test/config/openldap-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/openldap-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -98,11 +98,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> </option> </option-group> Modified: trunk/identity/src/resources/test/config/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/rhds-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/rhds-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -98,11 +98,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> </option-group> Modified: trunk/identity/src/resources/test/config/standardidentity-config.xml =================================================================== --- trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -327,7 +327,7 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,dc=example,dc=com</value> </option> <option> @@ -339,7 +339,7 @@ <value>userPassword</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,dc=example,dc=com</value> </option> <option> Modified: trunk/identity/src/resources/test/config/staticrole/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/staticrole/opends-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/staticrole/opends-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -99,11 +99,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> Modified: trunk/identity/src/resources/test/config/staticrole/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/staticrole/rhds-config.xml 2007-02-13 12:50:17 UTC (rev 6244) +++ trunk/identity/src/resources/test/config/staticrole/rhds-config.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -99,11 +99,11 @@ <option-group> <group-name>common</group-name> <option> - <name>userContainerDN</name> + <name>userCtxDN</name> <value>ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> - <name>roleContainerDN</name> + <name>roleCtxDN</name> <value>ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> </option> <option> Added: trunk/test/src/etc/directories-extrolemodule.xml =================================================================== --- trunk/test/src/etc/directories-extrolemodule.xml (rev 0) +++ trunk/test/src/etc/directories-extrolemodule.xml 2007-02-13 12:54:12 UTC (rev 6245) @@ -0,0 +1,98 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean - StaticRoleMembership config</description> + <config-file>test/config/extrole/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> + <populate-ldif>ldap/ldif/initial-tests-qa.ldif</populate-ldif> + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <!--<directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access) - StaticGroupMembership config</description> + + <config-file>test/config/identity/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldap/ldif/initial-tests-notpopulated.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access) - StaticRoleMembership config</description> + + <config-file>test/config/identity/rhds-config-staticrole.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldap/ldif/initial-tests-notpopulated.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access) - StaticGroupMembership config</description> + + <config-file>test/config/identity/openldap-config.xml</config-file> + <host>dev09.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> + <admin-password>jbossqa</admin-password> + + <populate-ldif>ldap/ldif/initial-tests-notpopulated-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory>--> + <!--<directory> + <directory-name>MSAD</directory-name> + <description>Microsoft Active Directory in QA Labs (need vpn access)</description> + + <config-file>test/config/msad-config.xml</config-file> + <host>dev44.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>JBOSS\jbossqa</admin-dn> + <admin-password>jboss42</admin-password> + + <populate-ldif>ldap/ldif/initial-tests-qa-msad.ldif</populate-ldif> + + <cleanup-dn>ou=testsuite,ou=portal,dc=jboss,dc=test</cleanup-dn> + </directory>--> +</directories>