Author: bdaw Date: 2007-08-01 07:36:06 -0400 (Wed, 01 Aug 2007) New Revision: 7855 Added: trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated-sunds.ldif trunk/test/src/etc/ldap/ldif/initial-tests-qa-sunds.ldif Modified: 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 Log: add Sun Directory Server in QA lab to the testsuite Modified: trunk/test/src/etc/directories-extrolemodule.xml =================================================================== --- trunk/test/src/etc/directories-extrolemodule.xml 2007-08-01 10:52:34 UTC (rev 7854) +++ trunk/test/src/etc/directories-extrolemodule.xml 2007-08-01 11:36:06 UTC (rev 7855) @@ -35,6 +35,18 @@ <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <config-file>test/config/extrole/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <populate-ldif>ldap/ldif/initial-tests-qa-sunds.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)</description> Modified: trunk/test/src/etc/directories-extusermodule.xml =================================================================== --- trunk/test/src/etc/directories-extusermodule.xml 2007-08-01 10:52:34 UTC (rev 7854) +++ trunk/test/src/etc/directories-extusermodule.xml 2007-08-01 11:36:06 UTC (rev 7855) @@ -35,6 +35,18 @@ <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <config-file>test/config/extuser/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <populate-ldif>ldap/ldif/initial-tests-qa-sunds.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)</description> <config-file>test/config/extuser/rhds-config.xml</config-file> Modified: trunk/test/src/etc/directories-identity.xml =================================================================== --- trunk/test/src/etc/directories-identity.xml 2007-08-01 10:52:34 UTC (rev 7854) +++ trunk/test/src/etc/directories-identity.xml 2007-08-01 11:36:06 UTC (rev 7855) @@ -48,6 +48,31 @@ <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs - StaticGroupMembership config</description> + + <config-file>test/config/identity/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <populate-ldif>ldap/ldif/initial-tests-notpopulated-sunds.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS - StaticRoleMembership</directory-name> + <description>Sun DS in QA Labs - StaticRoleMembership config</description> + <config-file>test/config/identity/sunds-config-staticrole.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <populate-ldif>ldap/ldif/initial-tests-notpopulated-sunds.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> Modified: trunk/test/src/etc/directories-simplerolemodule.xml =================================================================== --- trunk/test/src/etc/directories-simplerolemodule.xml 2007-08-01 10:52:34 UTC (rev 7854) +++ trunk/test/src/etc/directories-simplerolemodule.xml 2007-08-01 11:36:06 UTC (rev 7855) @@ -38,6 +38,21 @@ <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <!--identity configuration file--> + <config-file>test/config/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <!--ldif from which LDAP will be populated before each test--> + <populate-ldif>ldap/ldif/initial-tests-qa-sunds.ldif</populate-ldif> + <!--DN that will be removed to perform cleanup after each test--> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> <directory-name>RedHatDS</directory-name> <description>RedHat Directory in QA Labs (need vpn access)</description> Modified: trunk/test/src/etc/directories-simpleusermodule.xml =================================================================== --- trunk/test/src/etc/directories-simpleusermodule.xml 2007-08-01 10:52:34 UTC (rev 7854) +++ trunk/test/src/etc/directories-simpleusermodule.xml 2007-08-01 11:36:06 UTC (rev 7855) @@ -38,6 +38,21 @@ <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <!--identity configuration file--> + <config-file>test/config/sunds-config.xml</config-file> + <host>localhost</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <!--ldif from which LDAP will be populated before each test--> + <populate-ldif>ldap/ldif/initial-tests-qa-sunds.ldif</populate-ldif> + <!--DN that will be removed to perform cleanup after each test--> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> <directory-name>RedHatDS</directory-name> <description>RedHat Directory in QA Labs (need vpn access)</description> Modified: trunk/test/src/etc/directories-staticgroupmembership.xml =================================================================== --- trunk/test/src/etc/directories-staticgroupmembership.xml 2007-08-01 10:52:34 UTC (rev 7854) +++ trunk/test/src/etc/directories-staticgroupmembership.xml 2007-08-01 11:36:06 UTC (rev 7855) @@ -38,6 +38,21 @@ <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <!--identity configuration file--> + <config-file>test/config/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <!--ldif from which LDAP will be populated before each test--> + <populate-ldif>ldap/ldif/initial-tests-qa-sunds.ldif</populate-ldif> + <!--DN that will be removed to perform cleanup after each test--> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> <directory-name>RedHatDS</directory-name> <description>RedHat Directory in QA Labs (need vpn access)</description> Modified: trunk/test/src/etc/directories-staticrolemembership.xml =================================================================== --- trunk/test/src/etc/directories-staticrolemembership.xml 2007-08-01 10:52:34 UTC (rev 7854) +++ trunk/test/src/etc/directories-staticrolemembership.xml 2007-08-01 11:36:06 UTC (rev 7855) @@ -38,6 +38,21 @@ <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <!--identity configuration file--> + <config-file>test/config/staticrole/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <!--ldif from which LDAP will be populated before each test--> + <populate-ldif>ldap/ldif/initial-tests-qa-sunds.ldif</populate-ldif> + <!--DN that will be removed to perform cleanup after each test--> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> <directory-name>RedHatDS</directory-name> <description>RedHat Directory in QA Labs (need vpn access)</description> Modified: trunk/test/src/etc/directories-userprofilemodule.xml =================================================================== --- trunk/test/src/etc/directories-userprofilemodule.xml 2007-08-01 10:52:34 UTC (rev 7854) +++ trunk/test/src/etc/directories-userprofilemodule.xml 2007-08-01 11:36:06 UTC (rev 7855) @@ -38,6 +38,21 @@ <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <!--identity configuration file--> + <config-file>test/config/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <!--ldif from which LDAP will be populated before each test--> + <populate-ldif>ldap/ldif/initial-tests-qa-sunds.ldif</populate-ldif> + <!--DN that will be removed to perform cleanup after each test--> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> <directory-name>RedHatDS</directory-name> <description>RedHat Directory in QA Labs (need vpn access)</description> Modified: trunk/test/src/etc/directories.xml =================================================================== --- trunk/test/src/etc/directories.xml 2007-08-01 10:52:34 UTC (rev 7854) +++ trunk/test/src/etc/directories.xml 2007-08-01 11:36:06 UTC (rev 7855) @@ -38,6 +38,21 @@ <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <!--identity configuration file--> + <config-file>test/config/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <!--ldif from which LDAP will be populated before each test--> + <populate-ldif>ldap/ldif/initial-tests-qa-sunds.ldif</populate-ldif> + <!--DN that will be removed to perform cleanup after each test--> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> <directory-name>RedHatDS</directory-name> <description>RedHat Directory in QA Labs (need vpn access)</description> @@ -52,7 +67,7 @@ <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> </directory> - <directory> + <!-- <directory> <directory-name>MSAD</directory-name> <description>Microsoft Active Directory in QA Labs (need vpn access)</description> @@ -66,7 +81,7 @@ <populate-ldif>ldap/ldif/initial-tests-qa-msad.ldif</populate-ldif> <cleanup-dn>ou=testsuite,ou=portal,dc=jboss,dc=test</cleanup-dn> - </directory> + </directory>--> <directory> <directory-name>OpenLDAP</directory-name> <description>OpenLDAP Directory in QA Labs (need vpn access)</description> Copied: trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated-sunds.ldif (from rev 7851, branches/JBoss_Portal_Branch_2_6/test/src/etc/ldap/ldif/initial-tests-notpopulated-sunds.ldif) =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated-sunds.ldif (rev 0) +++ trunk/test/src/etc/ldap/ldif/initial-tests-notpopulated-sunds.ldif 2007-08-01 11:36:06 UTC (rev 7855) @@ -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 + + + Copied: trunk/test/src/etc/ldap/ldif/initial-tests-qa-sunds.ldif (from rev 7851, branches/JBoss_Portal_Branch_2_6/test/src/etc/ldap/ldif/initial-tests-qa-sunds.ldif) =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa-sunds.ldif (rev 0) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-sunds.ldif 2007-08-01 11:36:06 UTC (rev 7855) @@ -0,0 +1,275 @@ +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=People1,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People1 + +dn: uid=user11,ou=People1,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user11 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user12,ou=People1,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user12 +cn: Java Duke1 +sn: Duke1 +userPassword: theduke +mail: email(a)email.com + +dn: ou=People2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People2 + +dn: uid=user21,ou=People2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user21 +cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: uid=user22,ou=People2,dc=example,dc=com +objectclass: top +objectclass: inetOrgPerson +objectclass: person +uid: user22 +cn: Java Duke1 +sn: Duke1 +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 + +dn: ou=Roles1,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles1 + +dn: cn=User11,ou=Roles1,dc=example,dc=com +objectClass: top +objectClass: groupOfNames +cn: User11 +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: ou=Roles2,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles2 + +dn: cn=User21,ou=Roles2,dc=example,dc=com +objectClass: top +objectClass: groupOfNames +cn: User21 +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 + + + + +# 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 + +