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

Author: bdaw Date: 2007-01-24 11:55:18 -0500 (Wed, 24 Jan 2007) New Revision: 6089 Added: trunk/identity/src/resources/test/config/msad-config.xml trunk/identity/src/resources/test/config/openldap-config.xml trunk/test/src/etc/ldap/ldif/initial-tests-qa-msad.ldif trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml trunk/identity/build.xml trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java trunk/test/src/etc/directories.xml trunk/test/src/etc/opends/config/schema/05-other.ldif Log: - added OpenLDAP into testsuite - small corrections in tests Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-01-24 12:09:26 UTC (rev 6088) +++ trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-01-24 16:55:18 UTC (rev 6089) @@ -41,14 +41,14 @@ that are not mapped as attribute you may have LDAP user synchronized into DB with no password set. Please see HibernateUserProfileImpl module options "synchronizeNonExistingUsers", "acceptOtherImplementations" "defaultSynchronizePassword" or "randomSynchronizePassword" to manage this behaviour--> - <!--<login-module code = "org.jboss.portal.identity.auth.DBIdentityLoginModule" flag="sufficient"> + <login-module code = "org.jboss.portal.identity.auth.DBIdentityLoginModule" flag="sufficient"> <module-option name="dsJndiName">java:/PortalDS</module-option> <module-option name="principalsQuery">SELECT jbp_password FROM jbp_users WHERE jbp_uname=?</module-option> <module-option name="rolesQuery">SELECT jbp_roles.jbp_name, 'Roles' FROM jbp_role_membership INNER JOIN jbp_roles ON jbp_role_membership.jbp_rid = jbp_roles.jbp_rid INNER JOIN jbp_users ON jbp_role_membership.jbp_uid = jbp_users.jbp_uid WHERE jbp_users.jbp_uname=?</module-option> <module-option name="hashAlgorithm">MD5</module-option> <module-option name="hashEncoding">HEX</module-option> <module-option name="additionalRole">Authenticated</module-option> - </login-module>--> + </login-module> <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required"> <module-option name="unauthenticatedIdentity">guest</module-option> Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2007-01-24 12:09:26 UTC (rev 6088) +++ trunk/identity/build.xml 2007-01-24 16:55:18 UTC (rev 6089) @@ -454,10 +454,10 @@ <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/>--> <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.UserProtoTestCase"/>--> <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ConfigurationTestCase"/>--> - <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleUserModuleTestCase"/> + <!--<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.LDAPStaticRoleMembershipModuleTestCase"/> <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/>--> </x-test> <x-classpath> Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java 2007-01-24 12:09:26 UTC (rev 6088) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java 2007-01-24 16:55:18 UTC (rev 6089) @@ -157,7 +157,7 @@ try { - log.debug("getUsers(): user DN = " + ldapRole.getDn()); + log.debug("getUsers(): role DN = " + ldapRole.getDn()); String memberOfName = ""; Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java 2007-01-24 12:09:26 UTC (rev 6088) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java 2007-01-24 16:55:18 UTC (rev 6089) @@ -85,21 +85,23 @@ roleModule = (RoleModule)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE); membershipModule = (MembershipModule)identityContext.getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE); + suffix = getDirectoryServerConfigParameter().getCleanUpDN(); + IdentityConfiguration configuration = (IdentityConfiguration)identityContext.getObject(IdentityContext.TYPE_IDENTITY_CONFIGURATION); Set values = new HashSet(); - values.add("ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com"); + values.add("ou=Roles,o=example2," + suffix); configuration.setValues(IdentityConfiguration.GROUP_COMMON,IdentityConfiguration.ROLE_CONTAINER_DN, values); values = new HashSet(); - values.add("ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com"); + values.add("ou=People,o=example2," + suffix); configuration.setValues(IdentityConfiguration.GROUP_COMMON, IdentityConfiguration.USER_CONTAINER_DN, values); values = new HashSet(); values.add("memberOf"); configuration.setValues(IdentityConfiguration.GROUP_COMMON,IdentityConfiguration.MEMBERSHIP_ATTRIBUTE_ID, values); - suffix = getDirectoryServerConfigParameter().getCleanUpDN(); + populate(); } Added: trunk/identity/src/resources/test/config/msad-config.xml =================================================================== --- trunk/identity/src/resources/test/config/msad-config.xml (rev 0) +++ trunk/identity/src/resources/test/config/msad-config.xml 2007-01-24 16:55:18 UTC (rev 6089) @@ -0,0 +1,129 @@ +<?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>dev44.qa.atl.jboss.com</value> + </option> + <option> + <name>port</name> + <value>389</value> + </option> + <option> + <name>adminDN</name> + <value>JBOSS\jbossqa</value> + </option> + <option> + <name>adminPassword</name> + <value>jboss42</value> + </option> + </config> + </datasource> + </datasources> + <modules> + <module> + <!--type used to correctly map in IdentityContext registry--> + <type>User</type> + <implementation>LDAP</implementation> + <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>userContainerDN</name> + <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + </option> + <option> + <name>roleContainerDN</name> + <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + </option> + </option-group> + <option-group> + <group-name>userCreateAttibutes</group-name> + <option> + <name>objectClass</name> + <!--This objectclasses should work with Red Hat Directory--> + <value>top</value> + <value>person</value> + <value>inetOrgPerson</value> + </option> + <!--Schema requires those to have initial value--> + <option> + <name>cn</name> + <value>none</value> + </option> + <option> + <name>sn</name> + <value>none</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Added: trunk/identity/src/resources/test/config/openldap-config.xml =================================================================== --- trunk/identity/src/resources/test/config/openldap-config.xml (rev 0) +++ trunk/identity/src/resources/test/config/openldap-config.xml 2007-01-24 16:55:18 UTC (rev 6089) @@ -0,0 +1,129 @@ +<?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>dev09.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> + <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>userContainerDN</name> + <value>ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + </option> + <option> + <name>roleContainerDN</name> + <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + </option> + </option-group> + <option-group> + <group-name>userCreateAttibutes</group-name> + <option> + <name>objectClass</name> + <!--This objectclasses should work with Red Hat Directory--> + <value>top</value> + <value>person</value> + <value>inetOrgPerson</value> + </option> + <!--Schema requires those to have initial value--> + <option> + <name>cn</name> + <value>none</value> + </option> + <option> + <name>sn</name> + <value>none</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Modified: trunk/test/src/etc/directories.xml =================================================================== --- trunk/test/src/etc/directories.xml 2007-01-24 12:09:26 UTC (rev 6088) +++ trunk/test/src/etc/directories.xml 2007-01-24 16:55:18 UTC (rev 6089) @@ -52,4 +52,34 @@ <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,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>dc=testsuite,ou=portal,dc=jboss,dc=com</cleanup-dn> + </directory>--> + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> + + <config-file>test/config/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-qa-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory> </directories> Added: trunk/test/src/etc/ldap/ldif/initial-tests-qa-msad.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa-msad.ldif (rev 0) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-msad.ldif 2007-01-24 16:55:18 UTC (rev 6089) @@ -0,0 +1,188 @@ +dn: ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: organizationalUnit +ou: testsuite + +dn: ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: cn=jduke,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: inetOrgPerson +objectclass: person +#uid: jduke +cn: jduke +sn: Duke +userPassword: theduke +mail: email(a)email.com + +dn: cn=jduke1,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: inetOrgPerson +objectclass: person +cn: jduke1 +#cn: Java Duke1 +sn: Duke1 +userPassword: theduke +mail: email(a)email.com + +dn: cn=jduke2,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: inetOrgPerson +objectclass: person +cn: jduke2 +#cn: Java Duke2 +sn: Duke2 +userPassword: theduke +mail: email(a)email.com + +dn: cn=jduke3,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: inetOrgPerson +objectclass: person +cn: jduke3 +#cn: Java Duke3 +sn: Duke3 +userPassword: theduke +mail: email(a)email.com + +dn: cn=jduke4,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: inetOrgPerson +objectclass: person +cn: jduke4 +#cn: Java Duke4 +sn: Duke4 +userPassword: theduke +mail: email(a)email.com + +dn: ou=Roles,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: organizationalUnit +ou: Roles + +dn: cn=Echo,ou=Roles,ou=testsuite,ou=portal,dc=jboss,dc=test +objectClass: top +objectClass: groupOfNames +cn: Echo +description: the JBossAdmin group +member: cn=jduke1,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +member: cn=jduke3,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +member: cn=jduke4,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test + +dn: cn=Echo1,ou=Roles,ou=testsuite,ou=portal,dc=jboss,dc=test +objectClass: top +objectClass: groupOfNames +cn: Echo1 +description: the JBossAdmin group 2 +member: cn=jduke2,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +member: cn=jduke3,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test +member: cn=jduke,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test + +dn: cn=TheDuke,ou=Roles,ou=testsuite,ou=portal,dc=jboss,dc=test +objectClass: groupOfNames +objectClass: top +cn: TheDuke +description: TheDuke role context +member: cn=jduke,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test + +# tree2 +dn: ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: organizationalUnit +ou: example2 + +dn: ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: organizationalUnit +ou: Roles + +dn: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectClass: top +objectClass: organizationalRole +cn: Echo +description: the JBossAdmin group + +dn: cn=Echo1,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectClass: top +objectClass: organizationalRole +cn: Echo1 +description: the JBossAdmin group 2 + +dn: cn=TheDuke,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectClass: top +objectClass: organizationalRole +cn: TheDuke +description: TheDuke role context + +dn: cn=EmptyRole,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectClass: top +objectClass: organizationalRole +cn: EmptyRole +description: EmptyRole role context + +dn: ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: cn=jduke,ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: person +objectclass: organizationalPerson +objectclass: user +cn: jduke +#cn: Java Duke +sn: Duke +userPassword: theduke +mail: email(a)email.com +member: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test + +dn: cn=jduke1,ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: inetOrgPerson +objectclass: inetUser +cn: jduke1 +#cn: Java Duke1 +sn: Duke1 +userPassword: theduke +mail: email(a)email.com +member: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +member: cn=Echo1,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test + +dn: cn=jduke2,ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: inetOrgPerson +objectclass: inetUser +cn: jduke2 +#cn: Java Duke2 +sn: Duke2 +userPassword: theduke +mail: email(a)email.com +member: cn=Echo,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +member: cn=Echo1,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +member: cn=TheDuke,ou=Roles,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test + +dn: cn=jduke3,ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: inetOrgPerson +objectclass: inetUser +cn: jduke3 +#cn: Java Duke3 +sn: Duke3 +userPassword: theduke +mail: email(a)email.com + +dn: cn=jduke4,ou=People,ou=example2,ou=testsuite,ou=portal,dc=jboss,dc=test +objectclass: top +objectclass: inetOrgPerson +objectclass: inetUser +cn: jduke4 +#cn: Java Duke4 +sn: Duke4 +userPassword: theduke +mail: email(a)email.com + + Added: trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif =================================================================== --- trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif (rev 0) +++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-openldap.ldif 2007-01-24 16:55:18 UTC (rev 6089) @@ -0,0 +1,194 @@ +dn: dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: dcObject +objectclass: organization +dc: testsuite +o: testsuite + +dn: ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: uid=jduke,ou=People,dc=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles + +dn: cn=Echo,ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: groupOfNames +cn: Echo +description: the JBossAdmin group +member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com + +dn: cn=Echo1,ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: groupOfNames +cn: Echo1 +description: the JBossAdmin group 2 +member: uid=jduke2,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com +member: uid=jduke5,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com + +dn: cn=TheDuke,ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: groupOfNames +objectClass: top +cn: TheDuke +description: TheDuke role context +member: uid=jduke,ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com + + +# tree2 +dn: o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organization +o: example2 + +dn: ou=People,o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: uid=jduke,ou=People,o=example2,dc=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,dc=com + +dn: uid=jduke1,ou=People,o=example2,dc=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,dc=com +memberOf: cn=Echo1,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com + + +dn: uid=jduke2,ou=People,o=example2,dc=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,dc=com +memberOf: cn=Echo1,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com +memberOf: cn=TheDuke,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com + + +dn: uid=jduke3,ou=People,o=example2,dc=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,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=testsuite,dc=portal,dc=my-domain,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Roles + +dn: cn=Echo,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: organizationalRole +cn: Echo +description: the JBossAdmin group + +dn: cn=Echo1,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: organizationalRole +cn: Echo1 +description: the JBossAdmin group 2 + + +dn: cn=TheDuke,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: organizationalRole +cn: TheDuke +description: TheDuke role context + +dn: cn=EmptyRole,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=my-domain,dc=com +objectClass: top +objectClass: organizationalRole +cn: EmptyRole +description: EmptyRole role context + + Modified: trunk/test/src/etc/opends/config/schema/05-other.ldif =================================================================== --- trunk/test/src/etc/opends/config/schema/05-other.ldif 2007-01-24 12:09:26 UTC (rev 6088) +++ trunk/test/src/etc/opends/config/schema/05-other.ldif 2007-01-24 16:55:18 UTC (rev 6089) @@ -1,26 +1,3 @@ -#--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# ~ 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. ~ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -# # Some schema parts that were missing in standard set # #