Author: bdaw Date: 2007-03-20 06:11:40 -0400 (Tue, 20 Mar 2007) New Revision: 6771 Added: trunk/identity/src/resources/test/config/extrole/openldap-config.xml trunk/identity/src/resources/test/config/extrole/rhds-config.xml trunk/identity/src/resources/test/config/extuser/openldap-config.xml trunk/identity/src/resources/test/config/extuser/rhds-config.xml Modified: trunk/identity/build.xml trunk/identity/src/resources/test/config/extrole/opends-config.xml trunk/identity/src/resources/test/config/extuser/opends-config.xml trunk/test/src/etc/directories-extrolemodule.xml trunk/test/src/etc/directories-extusermodule.xml Log: - test LDAP ext modules on OpenLDAP and RH Directory Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2007-03-20 09:24:08 UTC (rev 6770) +++ trunk/identity/build.xml 2007-03-20 10:11:40 UTC (rev 6771) @@ -453,14 +453,14 @@ <x-test> <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/>--> - <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPIdentityTestCase"/> + <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPIdentityTestCase"/>--> <!--<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.LDAPStaticGroupMembershipModuleTestCase"/> <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"/>--> + <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/resources/test/config/extrole/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-03-20 09:24:08 UTC (rev 6770) +++ trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-03-20 10:11:40 UTC (rev 6771) @@ -120,19 +120,5 @@ <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=example,dc=com</value> - </option> - </option-group> </options> </identity-configuration> \ No newline at end of file Added: trunk/identity/src/resources/test/config/extrole/openldap-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/openldap-config.xml (rev 0) +++ trunk/identity/src/resources/test/config/extrole/openldap-config.xml 2007-03-20 10:11:40 UTC (rev 6771) @@ -0,0 +1,124 @@ +<?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>dev39.qa.atl.jboss.com</value> + </option> + <option> + <name>port</name> + <value>389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Manager,dc=my-domain,dc=com</value> + </option> + <option> + <name>adminPassword</name> + <value>jbossqa</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=my-domain,dc=com</value> + </option> + <option> + <name>roleCtxDN</name> + <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + </option> + <option> + <name>userSearchFilter</name> + <value>(uid={0})</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> + </options> +</identity-configuration> \ No newline at end of file Added: trunk/identity/src/resources/test/config/extrole/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/rhds-config.xml (rev 0) +++ trunk/identity/src/resources/test/config/extrole/rhds-config.xml 2007-03-20 10:11:40 UTC (rev 6771) @@ -0,0 +1,124 @@ +<?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>dev39.qa.atl.jboss.com</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>qpq123qpq</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>roleCtxDN</name> + <value>ou=Roles,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>roleSearchFilter</name> + <value><![CDATA[(& (objectClass=groupOfNames) (cn={0}))]]></value> + </option> + <option> + <name>searchScope</name> + <value>SUBTREE_SCOPE</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-03-20 09:24:08 UTC (rev 6770) +++ trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-03-20 10:11:40 UTC (rev 6771) @@ -111,19 +111,5 @@ <value>ou=Roles,dc=example,dc=com</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=example,dc=com</value> - </option> - </option-group> </options> </identity-configuration> \ No newline at end of file Added: trunk/identity/src/resources/test/config/extuser/openldap-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/openldap-config.xml (rev 0) +++ trunk/identity/src/resources/test/config/extuser/openldap-config.xml 2007-03-20 10:11:40 UTC (rev 6771) @@ -0,0 +1,115 @@ +<?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>dev39.qa.atl.jboss.com</value> + </option> + <option> + <name>port</name> + <value>389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Manager,dc=my-domain,dc=com</value> + </option> + <option> + <name>adminPassword</name> + <value>jbossqa</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> + <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=my-domain,dc=com</value> + </option> + <option> + <name>roleCtxDN</name> + <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + </option> + <option> + <name>userSearchFilter</name> + <value>(uid={0})</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Added: trunk/identity/src/resources/test/config/extuser/rhds-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/rhds-config.xml (rev 0) +++ trunk/identity/src/resources/test/config/extuser/rhds-config.xml 2007-03-20 10:11:40 UTC (rev 6771) @@ -0,0 +1,115 @@ +<?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>dev39.qa.atl.jboss.com</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>qpq123qpq</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> + <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>roleCtxDN</name> + <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + </option> + <option> + <name>userSearchFilter</name> + <value>(uid={0})</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Modified: trunk/test/src/etc/directories-extrolemodule.xml =================================================================== --- trunk/test/src/etc/directories-extrolemodule.xml 2007-03-20 09:24:08 UTC (rev 6770) +++ trunk/test/src/etc/directories-extrolemodule.xml 2007-03-20 10:11:40 UTC (rev 6771) @@ -24,7 +24,7 @@ <directories> <directory> <directory-name>OpenDS</directory-name> - <description>OpenDS service deployed on JBoss AS as an mbean - StaticRoleMembership config</description> + <description>OpenDS service deployed on JBoss AS as an mbean</description> <config-file>test/config/extrole/opends-config.xml</config-file> <host>localhost</host> <port>10389</port> @@ -34,52 +34,36 @@ <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <cleanup-dn>dc=example,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> + <description>RedHat Directory in QA Labs (need vpn access)</description> - <config-file>test/config/identity/rhds-config-staticrole.xml</config-file> + <config-file>test/config/extrole/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> + <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>OpenLDAP</directory-name> - <description>OpenLDAP Directory in QA Labs (need vpn access) - StaticGroupMembership config</description> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> - <config-file>test/config/identity/openldap-config.xml</config-file> + <config-file>test/config/extrole/openldap-config.xml</config-file> <host>dev39.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> + <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> <!--<directory> <directory-name>MSAD</directory-name> <description>Microsoft Active Directory in QA Labs (need vpn access)</description> Modified: trunk/test/src/etc/directories-extusermodule.xml =================================================================== --- trunk/test/src/etc/directories-extusermodule.xml 2007-03-20 09:24:08 UTC (rev 6770) +++ trunk/test/src/etc/directories-extusermodule.xml 2007-03-20 10:11:40 UTC (rev 6771) @@ -24,7 +24,7 @@ <directories> <directory> <directory-name>OpenDS</directory-name> - <description>OpenDS service deployed on JBoss AS as an mbean - StaticRoleMembership config</description> + <description>OpenDS service deployed on JBoss AS as an mbean</description> <config-file>test/config/extuser/opends-config.xml</config-file> <host>localhost</host> <port>10389</port> @@ -34,52 +34,36 @@ <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <cleanup-dn>dc=example,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> + <description>RedHat Directory in QA Labs (need vpn access)</description> + <config-file>test/config/extuser/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> + <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>OpenLDAP</directory-name> - <description>OpenLDAP Directory in QA Labs (need vpn access) - StaticGroupMembership config</description> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> - <config-file>test/config/identity/openldap-config.xml</config-file> + <config-file>test/config/extuser/openldap-config.xml</config-file> <host>dev39.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> + <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> <!--<directory> <directory-name>MSAD</directory-name> <description>Microsoft Active Directory in QA Labs (need vpn access)</description>