[jboss-svn-commits] JBoss Portal SVN: r5608 - in trunk: identity identity/src/main/org/jboss/portal/identity2/ldap test/src/etc test/src/etc/identityconfig test/src/etc/ldap/ldif test/src/etc/opends/config test/src/main/org/jboss/portal/test/framework/embedded
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 8 19:19:35 EST 2006
Author: bdaw
Date: 2006-11-08 19:19:18 -0500 (Wed, 08 Nov 2006)
New Revision: 5608
Added:
trunk/test/src/etc/identityconfig/rhds-config.xml
trunk/test/src/etc/ldap/ldif/example3.ldif
trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif
trunk/test/src/etc/ldap/ldif/initial-tests.ldif
Removed:
trunk/test/src/etc/ldap/ldif/example1.ldif
trunk/test/src/etc/ldap/ldif/example2.ldif
Modified:
trunk/identity/build.xml
trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPStaticGroupMembershipModuleImpl.java
trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserModuleImpl.java
trunk/test/src/etc/directories.xml
trunk/test/src/etc/identityconfig/opends-config.xml
trunk/test/src/etc/opends/config/config.ldif
trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java
Log:
- make testsuite run with RedHat DS
- add RedHat DS instance in QA to the testsuite
Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/identity/build.xml 2006-11-09 00:19:18 UTC (rev 5608)
@@ -97,6 +97,7 @@
<path refid="hibernate.hibernate.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="junit.junit.classpath"/>
+ <pathelement location="${project.tools}/lib/ant.jar"/>
<!--<path refid="sun.opends.classpath"/>-->
</path>
@@ -425,4 +426,59 @@
<antcall target="undeploy-ldap"/>
</target>
+
+
+
+ <target name="tests-dev" depends="init" if="HAVE_JDK_1.5">
+ <property name="proto-libs" value="${project.root}/proto-libs"/>
+ <execute-tests>
+<!--
+
+ <x-sysproperty>
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
+ </x-sysproperty>
+-->
+
+
+ <x-test>
+ <!--<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.LDAPSimpleRoleModuleTestCase"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticGroupMembershipModuleTestCase"/>
+
+
+ </x-test>
+ <x-classpath>
+ <pathelement location="${build.lib}/portal-identity-lib.jar"/>
+ <pathelement location="${build.lib}/portal-identity-test-lib.jar"/>
+ <pathelement location="${jboss.portal-test.root}/etc"/>
+ <pathelement location="${build.resources}/hibernate"/>
+
+
+ <path refid="apache.commons.classpath"/>
+ <path refid="sun.opends.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="hibernate.hibernate.classpath"/>
+ <path refid="antlr.antlr.classpath"/>
+ <path refid="asm.asm.classpath"/>
+ <path refid="apache.collections.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ <path refid="cglib.cglib.classpath"/>
+ <path refid="jboss.portal-test.classpath"/>
+ <path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
+ <path refid="sleepycat.sleepycat.classpath"/>
+ <path refid="sun.jaf.classpath"/>
+ </x-classpath>
+ </execute-tests>
+ </target>
</project>
Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPStaticGroupMembershipModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPStaticGroupMembershipModuleImpl.java 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPStaticGroupMembershipModuleImpl.java 2006-11-09 00:19:18 UTC (rev 5608)
@@ -190,15 +190,18 @@
String value = values.nextElement().toString();
String name = value;
- //if user is pointed as DN get only it's name
- if (isUidAttributeIsDN())
- {
- name = LDAPTools.stripDnToName(name);
- }
-
try
{
+ //if user is pointed as DN get only it's name
+ if (!isUidAttributeIsDN())
+ {
+ name = LDAPTools.stripDnToName(name);
users.add(getUserModule().findUserByUserName(name));
+ }
+ else
+ {
+ users.add(getUserModule().findUserByDN(name));
+ }
}
catch(IdentityException ie)
{
Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserModuleImpl.java 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserModuleImpl.java 2006-11-09 00:19:18 UTC (rev 5608)
@@ -41,6 +41,7 @@
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import javax.naming.directory.DirContext;
import javax.naming.ldap.LdapContext;
import java.util.List;
import java.util.NoSuchElementException;
@@ -151,7 +152,7 @@
throw new IdentityException("Found more than one user with id: " + userName + "" +
"Posible data inconsistency");
}
- return createUserInstance((SearchResult)sr.iterator().next());
+ return createUserInstance(((SearchResult)sr.iterator().next()).getAttributes());
}
catch (NoSuchElementException e)
@@ -189,7 +190,7 @@
* method not belonging to UserModule interface - ldap specific.
*
*/
- /*public User findUserByDN(String dn) throws IdentityException, IllegalArgumentException, NoSuchUserException
+ public User findUserByDN(String dn) throws IdentityException, IllegalArgumentException, NoSuchUserException
{
try
{
@@ -200,26 +201,24 @@
throw new IdentityException("User dn canot be null");
}
- *//*SearchControls controls = new SearchControls();
- controls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
+ /*SearchControls controls = new SearchControls();
+ controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
String filter = getUidAttributeID().concat("=").concat(userName);
- log.debug("Search filter: " + filter);*//*
+ log.debug("Search filter: " + filter);*/
+ Attributes attrs = getConnectionContext().createInitialContext().getAttributes(dn);
-
- NamingEnumeration results = getConnectionContext().createInitialContext().search(getContainerDN(), filter, controls);
- List sr = Tools.toList(results);
- if (sr.size() > 1)
+ if (attrs == null)
{
- throw new IdentityException("Found more than one user with id: " + userName + "" +
- "Posible data inconsistency");
+ throw new IdentityException("Can't find user entry with DN: " + dn);
}
- return createUserInstance((SearchResult)sr.iterator().next());
+ return createUserInstance(attrs);
+
}
catch (NoSuchElementException e)
{
- log.debug("No user found with name: " + userName, e);
+ log.debug("No user found with dn: " + dn, e);
}
catch (NamingException e)
{
@@ -227,7 +226,7 @@
}
return null;
- }*/
+ }
//TODO:how to properly store password? encoding and let specify the method?
public User createUser(String userName, String password, String realEmail) throws IdentityException, IllegalArgumentException
@@ -358,7 +357,7 @@
while (results.hasMoreElements())
{
SearchResult res = (SearchResult)results.nextElement();
- uf.add(createUserInstance(res));
+ uf.add(createUserInstance(res.getAttributes()));
}
//return sr.size();
@@ -408,16 +407,16 @@
- protected LDAPUserImpl createUserInstance(SearchResult sr) throws IdentityException
+ protected LDAPUserImpl createUserInstance(Attributes attrs) throws IdentityException
{
LDAPUserImpl ldapu = null;
try
{
- log.debug("SearchResult: " + sr);
+ /*log.debug("SearchResult: " + sr);
- Attributes attrs = sr.getAttributes();
+ Attributes attrs = sr.getAttributes();*/
log.debug("Search result attributes: " + attrs);
Modified: trunk/test/src/etc/directories.xml
===================================================================
--- trunk/test/src/etc/directories.xml 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/test/src/etc/directories.xml 2006-11-09 00:19:18 UTC (rev 5608)
@@ -33,8 +33,23 @@
<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/example1.ldif</populate-ldif>
+ <populate-ldif>ldap/ldif/initial-tests-qa.ldif</populate-ldif>
<!--DN that will be removed to perform cleanup after each test-->
- <cleanup-dn>dc=jboss,dc=org</cleanup-dn>
+ <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn>
</directory>
+ <directory>
+ <name>RedHatDS</name>
+ <description>RedHat Directory in QA Labs (need vpn access)</description>
+ <!--identity configuration file-->
+ <config-file>identityconfig/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>
+ <!--ldif from which LDAP will be populated before each test-->
+ <populate-ldif>ldap/ldif/initial-tests-qa.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>
+ </directory>
</directories>
Modified: trunk/test/src/etc/identityconfig/opends-config.xml
===================================================================
--- trunk/test/src/etc/identityconfig/opends-config.xml 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/test/src/etc/identityconfig/opends-config.xml 2006-11-09 00:19:18 UTC (rev 5608)
@@ -49,7 +49,7 @@
<group-name>common</group-name>
<option>
<name>userContainerDN</name>
- <value>ou=People,dc=jboss,dc=org</value>
+ <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
</option>
<option>
<name>uidAttributeId</name>
@@ -57,7 +57,7 @@
</option>
<option>
<name>roleContainerDN</name>
- <value>ou=Roles,dc=jboss,dc=org</value>
+ <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
</option>
<option>
<name>ridAttributeId</name>
@@ -81,7 +81,7 @@
<option>
<name>objectClass</name>
<value>top</value>
- <value>uidObject</value>
+ <value>inetOrgPerson</value>
<value>person</value>
</option>
<!--Schema requires those to have initial value-->
@@ -110,7 +110,7 @@
<!--For safety reasons point to the admin user here-->
<option>
<name>member</name>
- <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value>
+ <value>uid=dummynonexistinguser,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
</option>
</option-group>
</identity-configuration>
\ No newline at end of file
Added: trunk/test/src/etc/identityconfig/rhds-config.xml
===================================================================
--- trunk/test/src/etc/identityconfig/rhds-config.xml 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/test/src/etc/identityconfig/rhds-config.xml 2006-11-09 00:19:18 UTC (rev 5608)
@@ -0,0 +1,116 @@
+<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<identity-configuration>
+ <option-group>
+ <group-name>connection</group-name>
+ <option>
+ <name>host</name>
+ <value>dev39.qa.atl.jboss.com</value>
+ </option>
+ <option>
+ <name>port</name>
+ <value>10389</value>
+ </option>
+ <option>
+ <name>context-factory</name>
+ <value>com.sun.jndi.ldap.LdapCtxFactory</value>
+ </option>
+ <option>
+ <name>admin-dn</name>
+ <value>cn=Directory Manager</value>
+ </option>
+ <option>
+ <name>admin-password</name>
+ <value>qpq123qpq</value>
+ </option>
+ </option-group>
+ <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>uidAttributeId</name>
+ <value>uid</value>
+ </option>
+ <option>
+ <name>roleContainerDN</name>
+ <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+ </option>
+ <option>
+ <name>ridAttributeId</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>roleDisplayNameAttributeID</name>
+ <value>cn</value>
+ </option>
+ <option>
+ <name>roleMemberAttributeID</name>
+ <value>member</value>
+ </option>
+ <option>
+ <name>memberAttributeIsDN</name>
+ <value>true</value>
+ </option>
+ </option-group>
+ <option-group>
+ <group-name>userCreateAttibutes</group-name>
+ <option>
+ <name>objectClass</name>
+ <value>top</value>
+ <value>inetOrgPerson</value>
+ <value>person</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>
+ <option-group>
+ <group-name>roleCreateAttibutes</group-name>
+ <option>
+ <name>objectClass</name>
+ <value>top</value>
+ <value>groupOfNames</value>
+ </option>
+ <!--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=dummynonexistinguser,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+ </option>
+ </option-group>
+</identity-configuration>
\ No newline at end of file
Deleted: trunk/test/src/etc/ldap/ldif/example1.ldif
===================================================================
--- trunk/test/src/etc/ldap/ldif/example1.ldif 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/test/src/etc/ldap/ldif/example1.ldif 2006-11-09 00:19:18 UTC (rev 5608)
@@ -1,80 +0,0 @@
-dn: dc=jboss,dc=org
-objectclass: top
-objectclass: dcObject
-objectclass: organization
-dc: jboss
-o: JBoss
-
-dn: ou=People,dc=jboss,dc=org
-objectclass: top
-objectclass: organizationalUnit
-ou: People
-
-dn: uid=jduke,ou=People,dc=jboss,dc=org
-objectclass: top
-objectclass: uidObject
-objectclass: person
-uid: jduke
-cn: Java Duke
-sn: Duke
-userPassword: theduke
-
-dn: uid=jduke1,ou=People,dc=jboss,dc=org
-objectclass: top
-objectclass: uidObject
-objectclass: person
-uid: jduke1
-cn: Java Duke1
-sn: Duke1
-userPassword: theduke
-
-
-dn: uid=jduke2,ou=People,dc=jboss,dc=org
-objectclass: top
-objectclass: uidObject
-objectclass: person
-uid: jduke2
-cn: Java Duke2
-sn: Duke2
-userPassword: theduke
-
-dn: uid=jduke3,ou=People,dc=jboss,dc=org
-objectclass: top
-objectclass: uidObject
-objectclass: person
-uid: jduke3
-cn: Java Duke3
-sn: Duke3
-userPassword: theduke
-
-dn: uid=jduke4,ou=People,dc=jboss,dc=org
-objectclass: top
-objectclass: uidObject
-objectclass: person
-uid: jduke4
-cn: Java Duke4
-sn: Duke4
-userPassword: theduke
-
-dn: ou=Roles,dc=jboss,dc=org
-objectclass: top
-objectclass: organizationalUnit
-ou: Roles
-
-dn: cn=Echo,ou=Roles,dc=jboss,dc=org
-objectClass: top
-objectClass: groupOfNames
-cn: Echo
-description: the JBossAdmin group
-member: uid=jduke1,ou=People,dc=jboss,dc=org
-member: uid=jduke3,ou=People,dc=jboss,dc=org
-member: uid=jduke4,ou=People,dc=jboss,dc=org
-
-dn: cn=TheDuke,ou=Roles,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: TheDuke
-description: TheDuke role context
-member: uid=jduke,ou=People,dc=jboss,dc=org
-
-
Deleted: trunk/test/src/etc/ldap/ldif/example2.ldif
===================================================================
--- trunk/test/src/etc/ldap/ldif/example2.ldif 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/test/src/etc/ldap/ldif/example2.ldif 2006-11-09 00:19:18 UTC (rev 5608)
@@ -1,222 +0,0 @@
-dn: o=example2,dc=jboss,dc=org
-objectClass: top
-objectClass: dcObject
-objectClass: organization
-dc: jboss
-o: JBoss
-
-dn: ou=People,o=example2,dc=jboss,dc=org
-objectClass: top
-objectClass: organizationalUnit
-ou: People
-
-dn: uid=jduke,ou=People,o=example2,dc=jboss,dc=org
-objectClass: top
-objectClass: uidObject
-objectClass: person
-objectClass: inetOrgPerson
-cn: Java Duke
-employeeNumber: judke-123
-sn: Duke
-uid: jduke
-userPassword:: dGhlZHVrZQ==
-
-dn: uid=jduke2,ou=People,o=example2,dc=jboss,dc=org
-objectClass: top
-objectClass: uidObject
-objectClass: person
-objectClass: inetOrgPerson
-cn: Java Duke2
-employeeNumber: judke2-123
-sn: Duke2
-uid: jduke2
-userPassword:: dGhlZHVrZTI=
-
-dn: ou=Roles,o=example2,dc=jboss,dc=org
-objectClass: top
-objectClass: organizationalUnit
-ou: Roles
-
-dn: uid=jduke,ou=Roles,o=example2,dc=jboss,dc=org
-objectClass: top
-memberOf: cn=Echo,ou=Roles,o=example2,dc=jboss,dc=org
-memberOf: cn=TheDuke,ou=Roles,o=example2,dc=jboss,dc=org
-uid: jduke
-
-dn: uid=jduke2,ou=Roles,o=example2,dc=jboss,dc=org
-objectClass: top
-#objectClass: groupUserEx
-memberOf: cn=Echo2,ou=Roles,o=example2,dc=jboss,dc=org
-memberOf: cn=TheDuke2,ou=Roles,o=example2,dc=jboss,dc=org
-uid: jduke2
-
-dn: cn=Echo,ou=Roles,o=example2,dc=jboss,dc=org
-objectClass: top
-objectClass: groupOfNames
-cn: Echo
-description: the echo role
-member: uid=jduke,ou=People,dc=jboss,dc=org
-
-dn: cn=TheDuke,ou=Roles,o=example2,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: TheDuke
-description: the duke role
-member: uid=jduke,ou=People,o=example2,dc=jboss,dc=org
-
-dn: cn=Echo2,ou=Roles,o=example2,dc=jboss,dc=org
-objectClass: top
-objectClass: groupOfNames
-cn: Echo2
-description: the Echo2 role
-member: uid=jduke2,ou=People,dc=jboss,dc=org
-
-dn: cn=TheDuke2,ou=Roles,o=example2,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: TheDuke2
-description: the duke2 role
-member: uid=jduke2,ou=People,o=example2,dc=jboss,dc=org
-
-dn: cn=JBossAdmin,ou=Roles,o=example2,dc=jboss,dc=org
-objectClass: top
-objectClass: groupOfNames
-cn: JBossAdmin
-description: the JBossAdmin group
-member: uid=jduke,ou=People,dc=jboss,dc=org
-
-
-dn: o=example3,dc=jboss,dc=org
-objectclass: top
-objectclass: dcObject
-objectclass: organization
-dc: jboss
-o: JBoss
-
-dn: ou=People,o=example3,dc=jboss,dc=org
-objectclass: top
-objectclass: organizationalUnit
-ou: People
-
-dn: uid=jduke,ou=People,o=example3,dc=jboss,dc=org
-objectclass: top
-objectclass: uidObject
-objectclass: person
-objectClass: inetOrgPerson
-uid: jduke
-employeeNumber: judke-123
-cn: Java Duke
-sn: Duke
-userPassword: theduke
-
-dn: ou=Roles,o=example3,dc=jboss,dc=org
-objectClass: top
-objectClass: organizationalUnit
-ou: Roles
-
-dn: uid=jduke,ou=Roles,o=example3,dc=jboss,dc=org
-objectClass: top
-#objectClass: groupUserEx
-memberOf: cn=Echo,ou=Roles,o=example3,dc=jboss,dc=org
-memberOf: cn=TheDuke,ou=Roles,o=example3,dc=jboss,dc=org
-uid: jduke
-
-dn: cn=Echo,ou=Roles,o=example3,dc=jboss,dc=org
-objectClass: top
-objectClass: groupOfNames
-cn: Echo
-description: the JBossAdmin group
-member: uid=jduke,ou=People,o=example3,dc=jboss,dc=org
-
-dn: cn=TheDuke,ou=Roles,o=example3,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: TheDuke
-member: uid=jduke,ou=People,o=example3,dc=jboss,dc=org
-
-dn: o=example4,dc=jboss,dc=org
-objectclass: top
-objectclass: dcObject
-objectclass: organization
-dc: jboss
-o: JBoss
-
-dn: ou=People,o=example4,dc=jboss,dc=org
-objectclass: top
-objectclass: organizationalUnit
-ou: People
-
-dn: uid=jduke,ou=People,o=example4,dc=jboss,dc=org
-objectClass: top
-objectClass: uidObject
-objectClass: person
-objectClass: inetOrgPerson
-cn: Java Duke
-employeeNumber: jduke-123
-sn: Duke
-uid: jduke
-userPassword:: dGhlZHVrZQ==
-
-dn: ou=Roles,o=example4,dc=jboss,dc=org
-objectClass: top
-objectClass: organizationalUnit
-ou: Roles
-
-dn: cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: RG1
-member: cn=empty
-
-dn: cn=RG2,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: RG2
-member: cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-member: uid=jduke,ou=People,o=example4,dc=jboss,dc=org
-
-dn: cn=RG3,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: RG3
-member: cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-
-dn: cn=R1,ou=Roles,o=example4,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: R1
-member: cn=RG2,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-
-dn: cn=R2,ou=Roles,o=example4,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: R2
-member: cn=RG2,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-
-dn: cn=R3,ou=Roles,o=example4,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: R3
-member: cn=RG2,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-member: cn=RG3,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-
-dn: cn=R4,ou=Roles,o=example4,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: R4
-member: cn=RG3,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-
-dn: cn=R5,ou=Roles,o=example4,dc=jboss,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: R5
-member: cn=RG3,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
-member: uid=jduke,ou=People,o=example4,dc=jboss,dc=org
-
-
-
-
-
-
-
-
Copied: trunk/test/src/etc/ldap/ldif/example3.ldif (from rev 5599, trunk/test/src/etc/ldap/ldif/example2.ldif)
===================================================================
--- trunk/test/src/etc/ldap/ldif/example2.ldif 2006-11-08 13:14:24 UTC (rev 5599)
+++ trunk/test/src/etc/ldap/ldif/example3.ldif 2006-11-09 00:19:18 UTC (rev 5608)
@@ -0,0 +1,222 @@
+dn: o=example2,dc=jboss,dc=org
+objectClass: top
+objectClass: dcObject
+objectClass: organization
+dc: jboss
+o: JBoss
+
+dn: ou=People,o=example2,dc=jboss,dc=org
+objectClass: top
+objectClass: organizationalUnit
+ou: People
+
+dn: uid=jduke,ou=People,o=example2,dc=jboss,dc=org
+objectClass: top
+objectClass: uidObject
+objectClass: person
+objectClass: inetOrgPerson
+cn: Java Duke
+employeeNumber: judke-123
+sn: Duke
+uid: jduke
+userPassword:: dGhlZHVrZQ==
+
+dn: uid=jduke2,ou=People,o=example2,dc=jboss,dc=org
+objectClass: top
+objectClass: uidObject
+objectClass: person
+objectClass: inetOrgPerson
+cn: Java Duke2
+employeeNumber: judke2-123
+sn: Duke2
+uid: jduke2
+userPassword:: dGhlZHVrZTI=
+
+dn: ou=Roles,o=example2,dc=jboss,dc=org
+objectClass: top
+objectClass: organizationalUnit
+ou: Roles
+
+dn: uid=jduke,ou=Roles,o=example2,dc=jboss,dc=org
+objectClass: top
+memberOf: cn=Echo,ou=Roles,o=example2,dc=jboss,dc=org
+memberOf: cn=TheDuke,ou=Roles,o=example2,dc=jboss,dc=org
+uid: jduke
+
+dn: uid=jduke2,ou=Roles,o=example2,dc=jboss,dc=org
+objectClass: top
+#objectClass: groupUserEx
+memberOf: cn=Echo2,ou=Roles,o=example2,dc=jboss,dc=org
+memberOf: cn=TheDuke2,ou=Roles,o=example2,dc=jboss,dc=org
+uid: jduke2
+
+dn: cn=Echo,ou=Roles,o=example2,dc=jboss,dc=org
+objectClass: top
+objectClass: groupOfNames
+cn: Echo
+description: the echo role
+member: uid=jduke,ou=People,dc=jboss,dc=org
+
+dn: cn=TheDuke,ou=Roles,o=example2,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: TheDuke
+description: the duke role
+member: uid=jduke,ou=People,o=example2,dc=jboss,dc=org
+
+dn: cn=Echo2,ou=Roles,o=example2,dc=jboss,dc=org
+objectClass: top
+objectClass: groupOfNames
+cn: Echo2
+description: the Echo2 role
+member: uid=jduke2,ou=People,dc=jboss,dc=org
+
+dn: cn=TheDuke2,ou=Roles,o=example2,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: TheDuke2
+description: the duke2 role
+member: uid=jduke2,ou=People,o=example2,dc=jboss,dc=org
+
+dn: cn=JBossAdmin,ou=Roles,o=example2,dc=jboss,dc=org
+objectClass: top
+objectClass: groupOfNames
+cn: JBossAdmin
+description: the JBossAdmin group
+member: uid=jduke,ou=People,dc=jboss,dc=org
+
+
+dn: o=example3,dc=jboss,dc=org
+objectclass: top
+objectclass: dcObject
+objectclass: organization
+dc: jboss
+o: JBoss
+
+dn: ou=People,o=example3,dc=jboss,dc=org
+objectclass: top
+objectclass: organizationalUnit
+ou: People
+
+dn: uid=jduke,ou=People,o=example3,dc=jboss,dc=org
+objectclass: top
+objectclass: uidObject
+objectclass: person
+objectClass: inetOrgPerson
+uid: jduke
+employeeNumber: judke-123
+cn: Java Duke
+sn: Duke
+userPassword: theduke
+
+dn: ou=Roles,o=example3,dc=jboss,dc=org
+objectClass: top
+objectClass: organizationalUnit
+ou: Roles
+
+dn: uid=jduke,ou=Roles,o=example3,dc=jboss,dc=org
+objectClass: top
+#objectClass: groupUserEx
+memberOf: cn=Echo,ou=Roles,o=example3,dc=jboss,dc=org
+memberOf: cn=TheDuke,ou=Roles,o=example3,dc=jboss,dc=org
+uid: jduke
+
+dn: cn=Echo,ou=Roles,o=example3,dc=jboss,dc=org
+objectClass: top
+objectClass: groupOfNames
+cn: Echo
+description: the JBossAdmin group
+member: uid=jduke,ou=People,o=example3,dc=jboss,dc=org
+
+dn: cn=TheDuke,ou=Roles,o=example3,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: TheDuke
+member: uid=jduke,ou=People,o=example3,dc=jboss,dc=org
+
+dn: o=example4,dc=jboss,dc=org
+objectclass: top
+objectclass: dcObject
+objectclass: organization
+dc: jboss
+o: JBoss
+
+dn: ou=People,o=example4,dc=jboss,dc=org
+objectclass: top
+objectclass: organizationalUnit
+ou: People
+
+dn: uid=jduke,ou=People,o=example4,dc=jboss,dc=org
+objectClass: top
+objectClass: uidObject
+objectClass: person
+objectClass: inetOrgPerson
+cn: Java Duke
+employeeNumber: jduke-123
+sn: Duke
+uid: jduke
+userPassword:: dGhlZHVrZQ==
+
+dn: ou=Roles,o=example4,dc=jboss,dc=org
+objectClass: top
+objectClass: organizationalUnit
+ou: Roles
+
+dn: cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: RG1
+member: cn=empty
+
+dn: cn=RG2,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: RG2
+member: cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+member: uid=jduke,ou=People,o=example4,dc=jboss,dc=org
+
+dn: cn=RG3,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: RG3
+member: cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+
+dn: cn=R1,ou=Roles,o=example4,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: R1
+member: cn=RG2,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+
+dn: cn=R2,ou=Roles,o=example4,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: R2
+member: cn=RG2,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+
+dn: cn=R3,ou=Roles,o=example4,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: R3
+member: cn=RG2,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+member: cn=RG3,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+
+dn: cn=R4,ou=Roles,o=example4,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: R4
+member: cn=RG3,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+
+dn: cn=R5,ou=Roles,o=example4,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: R5
+member: cn=RG3,cn=RG1,ou=Roles,o=example4,dc=jboss,dc=org
+member: uid=jduke,ou=People,o=example4,dc=jboss,dc=org
+
+
+
+
+
+
+
+
Added: trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif
===================================================================
--- trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/test/src/etc/ldap/ldif/initial-tests-qa.ldif 2006-11-09 00:19:18 UTC (rev 5608)
@@ -0,0 +1,80 @@
+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: uid=jduke,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke
+cn: Java Duke
+sn: Duke
+userPassword: theduke
+
+dn: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke1
+cn: Java Duke1
+sn: Duke1
+userPassword: theduke
+
+
+dn: uid=jduke2,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke2
+cn: Java Duke2
+sn: Duke2
+userPassword: theduke
+
+dn: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke3
+cn: Java Duke3
+sn: Duke3
+userPassword: theduke
+
+dn: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke4
+cn: Java Duke4
+sn: Duke4
+userPassword: theduke
+
+dn: ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: organizationalUnit
+ou: Roles
+
+dn: cn=Echo,ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectClass: top
+objectClass: groupOfNames
+cn: Echo
+description: the JBossAdmin group
+member: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+member: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+member: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+
+dn: cn=TheDuke,ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectClass: groupOfNames
+objectClass: top
+cn: TheDuke
+description: TheDuke role context
+member: uid=jduke,ou=People,dc=jboss,dc=org
+
+
Copied: trunk/test/src/etc/ldap/ldif/initial-tests.ldif (from rev 5599, trunk/test/src/etc/ldap/ldif/example1.ldif)
===================================================================
--- trunk/test/src/etc/ldap/ldif/example1.ldif 2006-11-08 13:14:24 UTC (rev 5599)
+++ trunk/test/src/etc/ldap/ldif/initial-tests.ldif 2006-11-09 00:19:18 UTC (rev 5608)
@@ -0,0 +1,80 @@
+dn: dc=jboss,dc=org
+objectclass: top
+objectclass: dcObject
+objectclass: organization
+dc: jboss
+o: JBoss
+
+dn: ou=People,dc=jboss,dc=org
+objectclass: top
+objectclass: organizationalUnit
+ou: People
+
+dn: uid=jduke,ou=People,dc=jboss,dc=org
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: jduke
+cn: Java Duke
+sn: Duke
+userPassword: theduke
+
+dn: uid=jduke1,ou=People,dc=jboss,dc=org
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: jduke1
+cn: Java Duke1
+sn: Duke1
+userPassword: theduke
+
+
+dn: uid=jduke2,ou=People,dc=jboss,dc=org
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: jduke2
+cn: Java Duke2
+sn: Duke2
+userPassword: theduke
+
+dn: uid=jduke3,ou=People,dc=jboss,dc=org
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: jduke3
+cn: Java Duke3
+sn: Duke3
+userPassword: theduke
+
+dn: uid=jduke4,ou=People,dc=jboss,dc=org
+objectclass: top
+objectclass: uidObject
+objectclass: person
+uid: jduke4
+cn: Java Duke4
+sn: Duke4
+userPassword: theduke
+
+dn: ou=Roles,dc=jboss,dc=org
+objectclass: top
+objectclass: organizationalUnit
+ou: Roles
+
+dn: cn=Echo,ou=Roles,dc=jboss,dc=org
+objectClass: top
+objectClass: groupOfNames
+cn: Echo
+description: the JBossAdmin group
+member: uid=jduke1,ou=People,dc=jboss,dc=org
+member: uid=jduke3,ou=People,dc=jboss,dc=org
+member: uid=jduke4,ou=People,dc=jboss,dc=org
+
+dn: cn=TheDuke,ou=Roles,dc=jboss,dc=org
+objectClass: groupOfNames
+objectClass: top
+cn: TheDuke
+description: TheDuke role context
+member: uid=jduke,ou=People,dc=jboss,dc=org
+
+
Modified: trunk/test/src/etc/opends/config/config.ldif
===================================================================
--- trunk/test/src/etc/opends/config/config.ldif 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/test/src/etc/opends/config/config.ldif 2006-11-09 00:19:18 UTC (rev 5608)
@@ -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=jboss,dc=org
+ds-cfg-backend-base-dn: dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
ds-cfg-backend-entries-compressed: false
ds-cfg-backend-import-temp-directory: importTmp
ds-cfg-backend-id: userRoot
Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2006-11-08 20:00:32 UTC (rev 5607)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2006-11-09 00:19:18 UTC (rev 5608)
@@ -99,12 +99,13 @@
public String toString()
{
return new StringBuffer().append(name).
- append("_").
+ append("-").
append(description).
+ append(";").
append(host).
append(":").
append(port).
- append(":").
+ append("/").
append(configFile).
toString();
}
More information about the jboss-svn-commits
mailing list