Author: bdaw Date: 2007-03-08 15:04:02 -0500 (Thu, 08 Mar 2007) New Revision: 6603 Added: trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated-opends.ldif trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated.ldif trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif Removed: trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated.ldif Modified: trunk/identity/src/resources/example/portal-sample-local.ldif trunk/identity/src/resources/test/config/extrole/opends-config.xml 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/opends-config.xml trunk/identity/src/resources/test/config/staticrole/opends-config.xml trunk/test/src/etc/directories-extrolemodule.xml trunk/test/src/etc/directories-extusermodule.xml trunk/test/src/etc/directories-identity.xml trunk/test/src/etc/directories-simplerolemodule.xml trunk/test/src/etc/directories-simpleusermodule.xml trunk/test/src/etc/directories-staticgroupmembership.xml trunk/test/src/etc/directories-staticrolemembership.xml trunk/test/src/etc/directories-userprofilemodule.xml trunk/test/src/etc/directories.xml trunk/test/src/etc/opends/config/config.ldif Log: - change root suffix for OpenDS Modified: trunk/identity/src/resources/example/portal-sample-local.ldif =================================================================== --- trunk/identity/src/resources/example/portal-sample-local.ldif 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/identity/src/resources/example/portal-sample-local.ldif 2007-03-08 20:04:02 UTC (rev 6603) @@ -1,15 +1,27 @@ -dn: o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: dc=example,dc=com objectclass: top +objectclass: dcObject objectclass: organization +dc: example +o: example + +dn: dc=portal,dc=example,dc=com +objectclass: top +objectclass: organization +o: portal + +dn: o=test,dc=portal,dc=example,dc=com +objectclass: top +objectclass: organization o: test -dn: ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: ou=People,o=test,dc=portal,dc=example,dc=com objectclass: top objectclass: organizationalUnit ou: People -dn: uid=admin,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: uid=admin,ou=People,o=test,dc=portal,dc=example,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -19,7 +31,7 @@ userPassword: admin mail: email(a)email.com -dn: uid=user,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: uid=user,ou=People,o=test,dc=portal,dc=example,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -29,7 +41,7 @@ userPassword: user mail: email(a)email.com -dn: uid=jduke,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: uid=jduke,ou=People,o=test,dc=portal,dc=example,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -39,7 +51,7 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke1,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: uid=jduke1,ou=People,o=test,dc=portal,dc=example,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -50,7 +62,7 @@ mail: email(a)email.com -dn: uid=jduke2,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: uid=jduke2,ou=People,o=test,dc=portal,dc=example,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -60,7 +72,7 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke3,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: uid=jduke3,ou=People,o=test,dc=portal,dc=example,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -70,7 +82,7 @@ userPassword: theduke mail: email(a)email.com -dn: uid=jduke4,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: uid=jduke4,ou=People,o=test,dc=portal,dc=example,dc=com objectclass: top objectclass: inetOrgPerson objectclass: person @@ -80,53 +92,53 @@ userPassword: theduke mail: email(a)email.com -dn: ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: ou=Roles,o=test,dc=portal,dc=example,dc=com objectclass: top objectclass: organizationalUnit ou: Roles -dn: cn=Admin,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: cn=Admin,ou=Roles,o=test,dc=portal,dc=example,dc=com objectClass: top objectClass: groupOfNames cn: Admin description: Portal admin role -member: uid=admin,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=admin,ou=People,o=test,dc=portal,dc=example,dc=com -dn: cn=User,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: cn=User,ou=Roles,o=test,dc=portal,dc=example,dc=com objectClass: top objectClass: groupOfNames cn: User description: Portal user role -member: uid=admin,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=user,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke1,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke2,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke3,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke4,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=admin,ou=People,o=test,dc=portal,dc=example,dc=com +member: uid=user,ou=People,o=test,dc=portal,dc=example,dc=com +member: uid=jduke,ou=People,o=test,dc=portal,dc=example,dc=com +member: uid=jduke1,ou=People,o=test,dc=portal,dc=example,dc=com +member: uid=jduke2,ou=People,o=test,dc=portal,dc=example,dc=com +member: uid=jduke3,ou=People,o=test,dc=portal,dc=example,dc=com +member: uid=jduke4,ou=People,o=test,dc=portal,dc=example,dc=com -dn: cn=Echo,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: cn=Echo,ou=Roles,o=test,dc=portal,dc=example,dc=com objectClass: top objectClass: groupOfNames cn: Echo description: the JBossAdmin group -member: uid=jduke1,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke3,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke4,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke1,ou=People,o=test,dc=portal,dc=example,dc=com +member: uid=jduke3,ou=People,o=test,dc=portal,dc=example,dc=com +member: uid=jduke4,ou=People,o=test,dc=portal,dc=example,dc=com -dn: cn=Echo1,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: cn=Echo1,ou=Roles,o=test,dc=portal,dc=example,dc=com objectClass: top objectClass: groupOfNames cn: Echo1 description: the JBossAdmin group 2 -member: uid=jduke2,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -member: uid=jduke3,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +member: uid=jduke2,ou=People,o=test,dc=portal,dc=example,dc=com +member: uid=jduke3,ou=People,o=test,dc=portal,dc=example,dc=com -dn: cn=TheDuke,ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +dn: cn=TheDuke,ou=Roles,o=test,dc=portal,dc=example,dc=com objectClass: groupOfNames objectClass: top cn: TheDuke description: TheDuke role context -member: uid=jduke,ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com \ No newline at end of file +member: uid=jduke,ou=People,o=test,dc=portal,dc=example,dc=com \ No newline at end of file Modified: trunk/identity/src/resources/test/config/extrole/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -101,7 +101,7 @@ <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> + <value>ou=People,dc=example,dc=com</value> </option> <option> <name>userSearchFilter</name> @@ -109,7 +109,7 @@ </option> <option> <name>roleCtxDN</name> - <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles,dc=example,dc=com</value> </option> <option> <name>roleSearchFilter</name> @@ -131,7 +131,7 @@ <!--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> + <value>uid=admin,ou=People,dc=example,dc=com</value> </option> </option-group> </options> Modified: trunk/identity/src/resources/test/config/extuser/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -100,7 +100,7 @@ <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> + <value>ou=People,dc=example,dc=com</value> </option> <option> <name>userSearchFilter</name> @@ -108,7 +108,7 @@ </option> <option> <name>roleCtxDN</name> - <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles,dc=example,dc=com</value> </option> </option-group> <option-group> @@ -122,7 +122,7 @@ <!--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> + <value>uid=admin,ou=People,dc=example,dc=com</value> </option> </option-group> </options> Modified: trunk/identity/src/resources/test/config/identity/opends-config-staticrole.xml =================================================================== --- trunk/identity/src/resources/test/config/identity/opends-config-staticrole.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/identity/src/resources/test/config/identity/opends-config-staticrole.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -100,11 +100,11 @@ <group-name>common</group-name> <option> <name>userCtxDN</name> - <value>ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=People,o=example2,dc=example,dc=com</value> </option> <option> <name>roleCtxDN</name> - <value>ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles,o=example2,dc=example,dc=com</value> </option> <option> <name>membershipAttributeID</name> Modified: trunk/identity/src/resources/test/config/identity/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/identity/opends-config.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/identity/src/resources/test/config/identity/opends-config.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -99,11 +99,11 @@ <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> + <value>ou=People,dc=example,dc=com</value> </option> <option> <name>roleCtxDN</name> - <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles,dc=example,dc=com</value> </option> </option-group> <option-group> @@ -136,7 +136,7 @@ <!--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> + <value>uid=admin,ou=People,dc=example,dc=com</value> </option> </option-group> </options> Modified: trunk/identity/src/resources/test/config/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/opends-config.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/identity/src/resources/test/config/opends-config.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -99,11 +99,11 @@ <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> + <value>ou=People,dc=example,dc=com</value> </option> <option> <name>roleCtxDN</name> - <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles,dc=example,dc=com</value> </option> </option-group> <option-group> Modified: trunk/identity/src/resources/test/config/staticrole/opends-config.xml =================================================================== --- trunk/identity/src/resources/test/config/staticrole/opends-config.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/identity/src/resources/test/config/staticrole/opends-config.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -100,11 +100,11 @@ <group-name>common</group-name> <option> <name>userCtxDN</name> - <value>ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=People,o=example2,dc=example,dc=com</value> </option> <option> <name>roleCtxDN</name> - <value>ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + <value>ou=Roles,o=example2,dc=example,dc=com</value> </option> <option> <name>membershipAttributeID</name> Modified: trunk/test/src/etc/directories-extrolemodule.xml =================================================================== --- trunk/test/src/etc/directories-extrolemodule.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/directories-extrolemodule.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -31,8 +31,8 @@ <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> + <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> Modified: trunk/test/src/etc/directories-extusermodule.xml =================================================================== --- trunk/test/src/etc/directories-extusermodule.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/directories-extusermodule.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -31,8 +31,8 @@ <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> + <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> Modified: trunk/test/src/etc/directories-identity.xml =================================================================== --- trunk/test/src/etc/directories-identity.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/directories-identity.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -32,8 +32,8 @@ <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-notpopulated.ldif</populate-ldif> - <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + <populate-ldif>ldap/ldif/initial-tests-notpopulated-opends.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> <directory-name>OpenDS - StaticRoleMembership</directory-name> @@ -44,8 +44,8 @@ <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-notpopulated.ldif</populate-ldif> - <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + <populate-ldif>ldap/ldif/initial-tests-notpopulated-opends.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> <directory-name>RedHatDS</directory-name> Modified: trunk/test/src/etc/directories-simplerolemodule.xml =================================================================== --- trunk/test/src/etc/directories-simplerolemodule.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/directories-simplerolemodule.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -33,9 +33,9 @@ <admin-dn>cn=Directory Manager</admin-dn> <admin-password>password</admin-password> <!--ldif from which LDAP will be populated before each test--> - <populate-ldif>ldap/ldif/initial-tests-qa.ldif</populate-ldif> + <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <!--DN that will be removed to perform cleanup after each test--> - <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> <directory-name>RedHatDS</directory-name> Modified: trunk/test/src/etc/directories-simpleusermodule.xml =================================================================== --- trunk/test/src/etc/directories-simpleusermodule.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/directories-simpleusermodule.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -33,9 +33,9 @@ <admin-dn>cn=Directory Manager</admin-dn> <admin-password>password</admin-password> <!--ldif from which LDAP will be populated before each test--> - <populate-ldif>ldap/ldif/initial-tests-qa.ldif</populate-ldif> + <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <!--DN that will be removed to perform cleanup after each test--> - <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> <directory-name>RedHatDS</directory-name> Modified: trunk/test/src/etc/directories-staticgroupmembership.xml =================================================================== --- trunk/test/src/etc/directories-staticgroupmembership.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/directories-staticgroupmembership.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -33,9 +33,9 @@ <admin-dn>cn=Directory Manager</admin-dn> <admin-password>password</admin-password> <!--ldif from which LDAP will be populated before each test--> - <populate-ldif>ldap/ldif/initial-tests-qa.ldif</populate-ldif> + <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <!--DN that will be removed to perform cleanup after each test--> - <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> <directory-name>RedHatDS</directory-name> Modified: trunk/test/src/etc/directories-staticrolemembership.xml =================================================================== --- trunk/test/src/etc/directories-staticrolemembership.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/directories-staticrolemembership.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -33,9 +33,9 @@ <admin-dn>cn=Directory Manager</admin-dn> <admin-password>password</admin-password> <!--ldif from which LDAP will be populated before each test--> - <populate-ldif>ldap/ldif/initial-tests-qa.ldif</populate-ldif> + <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <!--DN that will be removed to perform cleanup after each test--> - <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> <directory-name>RedHatDS</directory-name> Modified: trunk/test/src/etc/directories-userprofilemodule.xml =================================================================== --- trunk/test/src/etc/directories-userprofilemodule.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/directories-userprofilemodule.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -33,9 +33,9 @@ <admin-dn>cn=Directory Manager</admin-dn> <admin-password>password</admin-password> <!--ldif from which LDAP will be populated before each test--> - <populate-ldif>ldap/ldif/initial-tests-qa.ldif</populate-ldif> + <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <!--DN that will be removed to perform cleanup after each test--> - <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> <directory-name>RedHatDS</directory-name> Modified: trunk/test/src/etc/directories.xml =================================================================== --- trunk/test/src/etc/directories.xml 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/directories.xml 2007-03-08 20:04:02 UTC (rev 6603) @@ -33,11 +33,11 @@ <admin-dn>cn=Directory Manager</admin-dn> <admin-password>password</admin-password> <!--ldif from which LDAP will be populated before each test--> - <populate-ldif>ldap/ldif/initial-tests-qa.ldif</populate-ldif> + <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <!--DN that will be removed to perform cleanup after each test--> - <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> - <!--<directory> + <directory> <directory-name>RedHatDS</directory-name> <description>RedHat 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> Copied: trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated-opends.ldif (from rev 6601, trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated.ldif) =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated-opends.ldif (rev 0) +++ trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated-opends.ldif 2007-03-08 20:04:02 UTC (rev 6603) @@ -0,0 +1,35 @@ +dn: dc=example,dc=com +objectclass: top +objectclass: dcObject +objectclass: organization +dc: example +o: example + +dn: ou=People,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: ou=Roles,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles + +# tree2 +dn: o=example2,dc=example,dc=com +objectclass: top +objectclass: organization +o: example2 + +dn: ou=People,o=example2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: ou=Roles,o=example2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles + + + Deleted: trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated.ldif 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated.ldif 2007-03-08 20:04:02 UTC (rev 6603) @@ -1,35 +0,0 @@ -dn: dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -objectclass: top -objectclass: dcObject -objectclass: organization -dc: testsuite -o: testsuite - -dn: ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -objectclass: top -objectclass: organizationalUnit -ou: People - -dn: ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -objectclass: top -objectclass: organizationalUnit -ou: Roles - -# tree2 -dn: o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -objectclass: top -objectclass: organization -o: example2 - -dn: ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -objectclass: top -objectclass: organizationalUnit -ou: People - -dn: ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com -objectclass: top -objectclass: organizationalUnit -ou: Roles - - - Added: trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated.ldif (rev 0) +++ trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated.ldif 2007-03-08 20:04:02 UTC (rev 6603) @@ -0,0 +1,35 @@ +dn: dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: dcObject +objectclass: organization +dc: testsuite +o: testsuite + +dn: ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles + +# tree2 +dn: o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organization +o: example2 + +dn: ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles + + + Added: trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif (rev 0) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-opends.ldif 2007-03-08 20:04:02 UTC (rev 6603) @@ -0,0 +1,194 @@ +dn: dc=example,dc=com +objectclass: top +objectclass: dcObject +objectclass: organization +dc: example +o: example + +dn: ou=People,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: uid=jduke,ou=People,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: jduke +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=jduke1,ou=People,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: jduke1 +cn: Java Duke1 +sn: Duke1 +userPassword: theduke +mail: email(a)email.com + + +dn: uid=jduke2,ou=People,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: jduke2 +cn: Java Duke2 +sn: Duke2 +userPassword: theduke +mail: email(a)email.com + +dn: uid=jduke3,ou=People,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: jduke3 +cn: Java Duke3 +sn: Duke3 +userPassword: theduke +mail: email(a)email.com + +dn: uid=jduke4,ou=People,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: jduke4 +cn: Java Duke4 +sn: Duke4 +userPassword: theduke +mail: email(a)email.com + +dn: ou=Roles,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles + +dn: cn=Echo,ou=Roles,dc=example,dc=com +objectClass: top +objectClass: groupOfNames +cn: Echo +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 + +dn: cn=Echo1,ou=Roles,dc=example,dc=com +objectClass: top +objectClass: groupOfNames +cn: Echo1 +description: the JBossAdmin group 2 +member: uid=jduke2,ou=People,dc=example,dc=com +member: uid=jduke3,ou=People,dc=example,dc=com +member: uid=jduke5,ou=People,dc=example,dc=com + +dn: cn=TheDuke,ou=Roles,dc=example,dc=com +objectClass: groupOfNames +objectClass: top +cn: TheDuke +description: TheDuke role context +member: uid=jduke,ou=People,dc=example,dc=com + + +# tree2 +dn: o=example2,dc=example,dc=com +objectclass: top +objectclass: organization +o: example2 + +dn: ou=People,o=example2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: uid=jduke,ou=People,o=example2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: inetUser +uid: jduke +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com +memberOf: cn=Echo,ou=Roles,o=example2,dc=example,dc=com + +dn: uid=jduke1,ou=People,o=example2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: inetUser +uid: jduke1 +cn: Java Duke1 +sn: Duke1 +userPassword: theduke +mail: email(a)email.com +memberOf: cn=Echo,ou=Roles,o=example2,dc=example,dc=com +memberOf: cn=Echo1,ou=Roles,o=example2,dc=example,dc=com + + +dn: uid=jduke2,ou=People,o=example2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: inetUser +uid: jduke2 +cn: Java Duke2 +sn: Duke2 +userPassword: theduke +mail: email(a)email.com +memberOf: cn=Echo,ou=Roles,o=example2,dc=example,dc=com +memberOf: cn=Echo1,ou=Roles,o=example2,dc=example,dc=com +memberOf: cn=TheDuke,ou=Roles,o=example2,dc=example,dc=com + + +dn: uid=jduke3,ou=People,o=example2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: inetUser +uid: jduke3 +cn: Java Duke3 +sn: Duke3 +userPassword: theduke +mail: email(a)email.com + +dn: uid=jduke4,ou=People,o=example2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: inetUser +uid: jduke4 +cn: Java Duke4 +sn: Duke4 +userPassword: theduke +mail: email(a)email.com + +dn: ou=Roles,o=example2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles + +dn: cn=Echo,ou=Roles,o=example2,dc=example,dc=com +objectClass: top +objectClass: organizationalRole +cn: Echo +description: the JBossAdmin group + +dn: cn=Echo1,ou=Roles,o=example2,dc=example,dc=com +objectClass: top +objectClass: organizationalRole +cn: Echo1 +description: the JBossAdmin group 2 + + +dn: cn=TheDuke,ou=Roles,o=example2,dc=example,dc=com +objectClass: top +objectClass: organizationalRole +cn: TheDuke +description: TheDuke role context + +dn: cn=EmptyRole,ou=Roles,o=example2,dc=example,dc=com +objectClass: top +objectClass: organizationalRole +cn: EmptyRole +description: EmptyRole role context + + Modified: trunk/test/src/etc/opends/config/config.ldif =================================================================== --- trunk/test/src/etc/opends/config/config.ldif 2007-03-08 14:56:49 UTC (rev 6602) +++ trunk/test/src/etc/opends/config/config.ldif 2007-03-08 20:04:02 UTC (rev 6603) @@ -132,7 +132,7 @@ ds-cfg-backend-index-entry-limit: 4000 ds-cfg-backend-writability-mode: enabled ds-cfg-backend-preload-time-limit: 0 seconds -ds-cfg-backend-base-dn: dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com +ds-cfg-backend-base-dn: dc=example,dc=com ds-cfg-backend-entries-compressed: false ds-cfg-backend-import-temp-directory: importTmp ds-cfg-backend-id: userRoot