portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r483771 [4/5] - in /portals/jetspeed-2/trunk/components/security: etc/ src/java/org/apache/jetspeed/security/spi/impl/ src/java/org/apache/jetspeed/security/spi/impl/ldap/ src/test/JETSPEED-INF/directory/config/apacheds/ src/test/JETSPEED-I...
Date Fri, 08 Dec 2006 01:47:33 GMT
Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/company1.ldif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/company1.ldif?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/company1.ldif (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/company1.ldif Thu Dec  7 17:47:28 2006
@@ -0,0 +1,203 @@
+# Sample LDIF file for populating Lotus LDAP Server
+#
+# Group objectClass = JetspeedGroup
+# Role objectClass = JetspeedRole
+#
+# Roles and groups have an empty uniqueMember attribute (required by schema)
+#
+
+dn: ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: organizationalunit
+ou: OrgUnit1
+
+dn: ou=OrgUnit2,o=sevenSeas
+ou: OrgUnit2
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: ou=OrgUnit3,o=sevenSeas
+ou: OrgUnit3
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=People,ou=OrgUnit1,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit1,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Roles,ou=OrgUnit1,o=sevenSeas
+ou: Roles
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: ou=People,ou=OrgUnit2,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit2,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Roles,ou=OrgUnit2,o=sevenSeas
+ou: Roles
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=People,ou=OrgUnit3,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit3,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Roles,ou=OrgUnit3,o=sevenSeas
+ou: Roles
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: cn=Group1,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedGroup
+uniqueMember:
+uniqueMember: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+uniqueMember: uid=OrgUnit1User1,ou=People,ou=OrgUnit1,o=sevenSeas
+uniqueMember: uid=OrgUnit1User2,ou=People,ou=OrgUnit1,o=sevenSeas
+cn: Group1
+
+dn: cn=Group2,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedGroup
+uniqueMember:
+cn: Group2
+
+dn: cn=Group3,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedGroup
+uniqueMember:
+cn: Group3
+
+dn: cn=admin,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedGroup
+uniqueMember:
+cn: admin
+
+dn: cn=manager,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedGroup
+uniqueMember:
+cn: manager
+
+dn: cn=Role1,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedRole
+member:
+cn: Role1
+
+
+dn: cn=Role2,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedRole
+member:
+cn: Role2
+
+
+dn: cn=Role3,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedRole
+member:
+cn: Role3
+
+dn: cn=admin,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedRole
+member: 
+cn: admin
+
+dn: cn=manager,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: JetspeedRole
+member: 
+cn: manager
+
+dn: uid=OrgUnit1User1,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: OrgUnit1User1
+objectClass: top
+objectClass: JetspeedUser
+userPassword: x
+sn: OrgUnit1User1
+cn: OrgUnit1User1 OrgUnit1User1
+
+dn: uid=OrgUnit1User2,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: OrgUnit1User2
+objectClass: top
+objectClass: JetspeedUser
+userPassword: x
+sn: OrgUnit1User2
+cn: OrgUnit1User2 OrgUnit1User2
+
+dn: uid=OrgUnit2User1,ou=People,ou=OrgUnit2,o=sevenSeas
+uid: OrgUnit2User1
+objectClass: top
+objectClass: JetspeedUser
+userPassword: x
+sn: OrgUnit2User1
+cn: OrgUnit2User1 OrgUnit2User1
+
+dn: uid=OrgUnit2User2,ou=People,ou=OrgUnit2,o=sevenSeas
+uid: OrgUnit2User2
+objectClass: top
+objectClass: JetspeedUser
+userPassword: x
+memberOf: cn=Role1,ou=Roles,ou=OrgUnit1,o=sevenSeas
+memberOf: cn=Role3,ou=Roles,ou=OrgUnit1,o=sevenSeas
+sn: OrgUnit2User2
+cn: OrgUnit2User2 OrgUnit2User2
+
+
+dn: uid=OrgUnit3User1,ou=People,ou=OrgUnit3,o=sevenSeas
+uid: OrgUnit3User1
+objectClass: top
+objectClass: JetspeedUser
+memberOf: cn=Role1,ou=Roles,ou=OrgUnit1,o=sevenSeas
+memberOf: cn=Role2,ou=Roles,ou=OrgUnit1,o=sevenSeas
+userPassword: x
+sn: OrgUnit3User1
+cn: OrgUnit3User1 OrgUnit3User1
+
+dn: uid=OrgUnit3User2,ou=People,ou=OrgUnit3,o=sevenSeas
+uid: OrgUnit3User2
+objectClass: top
+objectClass: JetspeedUser
+memberOf: cn=Role1,ou=Roles,ou=OrgUnit1,o=sevenSeas
+memberOf: cn=Role2,ou=Roles,ou=OrgUnit1,o=sevenSeas
+memberOf: cn=Role3,ou=Roles,ou=OrgUnit1,o=sevenSeas
+userPassword: x
+sn: OrgUnit3User2
+cn: OrgUnit3User2 OrgUnit3User2
+
+dn: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: admin
+objectClass: top
+objectClass: JetspeedUser
+userPassword: admin
+memberOf: cn=admin,ou=Roles,ou=OrgUnit1,o=sevenSeas
+memberOf: cn=Role1,ou=Roles,ou=OrgUnit1,o=sevenSeas
+memberOf: cn=Role2,ou=Roles,ou=OrgUnit1,o=sevenSeas
+memberOf: cn=Role3,ou=Roles,ou=OrgUnit1,o=sevenSeas
+sn: admin
+cn: admin admin

Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/security-spi-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/security-spi-ldap.xml?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/security-spi-ldap.xml (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/security-spi-ldap.xml Thu Dec  7 17:47:28 2006
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+
+
+  <!-- ************** Ldap Configuration ************** -->
+  <bean id="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig"
+      class="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig">
+      <!-- The LDAP initial context factory. -->
+      <constructor-arg index="0"><value>com.sun.jndi.ldap.LdapCtxFactory</value></constructor-arg>
+      <!-- The LDAP server name. -->
+      <constructor-arg index="1"><value>localhost</value></constructor-arg>
+      <!-- The LDAP server port. -->
+      <constructor-arg index="2"><value>389</value></constructor-arg>
+      <!-- The LDAP server root context. -->
+      <constructor-arg index="3"><value>o=sevenSeas</value></constructor-arg>
+      <!-- The LDAP server root dn. -->
+      <constructor-arg index="4"><value>cn=Manager,o=sevenSeas</value></constructor-arg>
+      <!-- The LDAP server root password. -->
+      <constructor-arg index="5"><value>secret</value></constructor-arg>
+      <!-- The roles filter. -->
+      <constructor-arg index="6"><value>(objectclass=JetspeedRole)</value></constructor-arg>
+      <!-- The groups filter. -->
+      <constructor-arg index="7"><value>(objectclass=JetspeedGroup)</value></constructor-arg>
+      <!-- The user filter. -->
+      <constructor-arg index="8"><value>(objectclass=JetspeedPerson)</value></constructor-arg>
+      <!-- The roleMembershipAttributes. -->
+      <constructor-arg index="9"><value></value></constructor-arg>
+      <!-- The userRoleMembershipAttributes. -->
+      <constructor-arg index="10"><value>memberOf</value></constructor-arg>
+      <!-- The groupMembershipAttributes. -->
+      <constructor-arg index="11"><value></value></constructor-arg>
+      <!-- The userGroupMembershipAttributes. -->
+      <constructor-arg index="12"><value>memberOf</value></constructor-arg>
+      <!-- The groupMembershipForRoleAttributes. -->
+      <constructor-arg index="13"><value></value></constructor-arg>
+      <!-- The roleGroupMembershipForRoleAttributes. -->
+      <constructor-arg index="14"><value>memberOf</value></constructor-arg>      
+      <!-- The defaultSearchBase. -->
+      <constructor-arg index="15"><value></value></constructor-arg>
+      <!-- The roleFilterBase. -->
+      <constructor-arg index="16"><value>ou=Roles,ou=OrgUnit1</value></constructor-arg>
+      <!-- The groupFilterBase. -->
+      <constructor-arg index="17"><value>ou=Groups,ou=OrgUnit1</value></constructor-arg>
+      <!-- The userFilterBase. -->
+      <constructor-arg index="18"><value>ou=People,ou=OrgUnit1</value></constructor-arg>
+      <!-- The roleObjectClasses. -->
+      <constructor-arg index="19"><value>top,JetspeedRole</value></constructor-arg>
+      <!-- The groupObjectClasses. -->
+      <constructor-arg index="20"><value>top,JetspeedGroup</value></constructor-arg>
+      <!-- The userObjectClasses. -->
+      <constructor-arg index="21"><value>top,JetspeedPerson</value></constructor-arg>
+      <!-- The roleIdAttribute. -->
+      <constructor-arg index="22"><value>cn</value></constructor-arg>
+      <!-- The groupIdAttribute. -->
+      <constructor-arg index="23"><value>cn</value></constructor-arg>
+	  	<!-- The userIdAttribute. -->
+      <constructor-arg index="24"><value>uid</value></constructor-arg>
+      <!-- The UidAttribute. -->
+      <constructor-arg index="25"><value>uid</value></constructor-arg>
+      <!-- The MemberShipSearchScope. -->
+      <constructor-arg index="26"><value>1</value></constructor-arg>
+      <!-- The roleUidAttribute. -->
+      <constructor-arg index="27"><value>cn</value></constructor-arg>
+      <!-- The groupUidAttribute. -->
+      <constructor-arg index="28"><value>cn</value></constructor-arg>
+	  <!-- The userUidAttribute. -->
+      <constructor-arg index="29"><value>uid</value></constructor-arg>
+	  <!-- The roleObjectRequiredAttributeClasses. -->
+      <constructor-arg index="30"><value>member</value></constructor-arg>
+	  <!-- The groupObjectRequiredAttributeClasses. -->
+      <constructor-arg index="31"><value>uniqueMember</value></constructor-arg>
+	  <!-- The userAttributes. -->
+      <constructor-arg index="32"><value>sn={u},cn={u}</value></constructor-arg>
+	  <!-- The roleAttributes. -->
+      <constructor-arg index="33"><value></value></constructor-arg>
+	  <!-- The groupAttributes. -->
+      <constructor-arg index="34"><value></value></constructor-arg>
+	  <!-- The userPasswordAttribute. -->
+      <constructor-arg index="35"><value>userPassword</value></constructor-arg>
+	  <!-- The knownAttributes. -->
+      <constructor-arg index="36"><value>cn,sn,o,uid,ou,objectClass,userPassword,member,uniqueMember,memberOf</value></constructor-arg>
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup1/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/company1.ldif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/company1.ldif?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/company1.ldif (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/company1.ldif Thu Dec  7 17:47:28 2006
@@ -0,0 +1,221 @@
+# Sample LDIF file for populating Lotus LDAP Server
+#
+# Group objectClass = groupOfUniqueNames
+# Role objectClass = groupOfUniqueNames
+#
+# Roles and groups have an empty uniqueMember attribute (required by schema)
+#
+dn: ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: organizationalunit
+ou: OrgUnit1
+
+dn: ou=OrgUnit2,o=sevenSeas
+ou: OrgUnit2
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: ou=OrgUnit3,o=sevenSeas
+ou: OrgUnit3
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=People,ou=OrgUnit1,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit1,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Roles,ou=OrgUnit1,o=sevenSeas
+ou: Roles
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: ou=People,ou=OrgUnit2,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit2,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Roles,ou=OrgUnit2,o=sevenSeas
+ou: Roles
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=People,ou=OrgUnit3,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit3,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Roles,ou=OrgUnit3,o=sevenSeas
+ou: Roles
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: cn=Group1,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+uniqueMember: uid=OrgUnit1User1,ou=People,ou=OrgUnit1,o=sevenSeas
+uniqueMember: uid=OrgUnit1User2,ou=People,ou=OrgUnit1,o=sevenSeas
+uniqueMember: uid=OrgUnit2User1,ou=People,ou=OrgUnit2,o=sevenSeas
+uniqueMember: uid=OrgUnit2User2,ou=People,ou=OrgUnit2,o=sevenSeas
+uniqueMember: uid=OrgUnit3User1,ou=People,ou=OrgUnit3,o=sevenSeas
+uniqueMember: uid=OrgUnit3User2,ou=People,ou=OrgUnit3,o=sevenSeas
+cn: Group1
+
+dn: cn=Group2,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+uniqueMember: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+uniqueMember: uid=OrgUnit1User1,ou=People,ou=OrgUnit1,o=sevenSeas
+uniqueMember: uid=OrgUnit2User1,ou=People,ou=OrgUnit2,o=sevenSeas
+uniqueMember: uid=OrgUnit3User1,ou=People,ou=OrgUnit3,o=sevenSeas
+cn: Group2
+
+dn: cn=Group3,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+uniqueMember: uid=OrgUnit1User1,ou=People,ou=OrgUnit1,o=sevenSeas
+cn: Group3
+
+dn: cn=admin,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:uid=admin,ou=People,ou=OrgUnit1
+cn: admin
+
+dn: cn=manager,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:uid=admin,ou=People,ou=OrgUnit1
+cn: manager
+
+dn: cn=Role1,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+cn: Role1
+
+
+dn: cn=Role2,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+cn: Role2
+
+
+dn: cn=Role3,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+cn: Role3
+
+dn: cn=admin,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+cn: admin
+
+dn: cn=manager,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+cn: manager
+
+dn: uid=OrgUnit1User1,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: OrgUnit1User1
+givenName: OrgUnit1User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit1User1
+cn: OrgUnit1User1 OrgUnit1User1
+
+dn: uid=OrgUnit1User2,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: OrgUnit1User2
+givenName: OrgUnit1User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit1User2
+cn: OrgUnit1User2 OrgUnit1User2
+
+dn: uid=OrgUnit2User1,ou=People,ou=OrgUnit2,o=sevenSeas
+uid: OrgUnit2User1
+givenName: OrgUnit2User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit2User1
+cn: OrgUnit2User1 OrgUnit2User1
+
+dn: uid=OrgUnit2User2,ou=People,ou=OrgUnit2,o=sevenSeas
+uid: OrgUnit2User2
+givenName: OrgUnit2User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit2User2
+cn: OrgUnit2User2 OrgUnit2User2
+
+
+dn: uid=OrgUnit3User1,ou=People,ou=OrgUnit3,o=sevenSeas
+uid: OrgUnit3User1
+givenName: OrgUnit3User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit3User1
+cn: OrgUnit3User1 OrgUnit3User1
+
+dn: uid=OrgUnit3User2,ou=People,ou=OrgUnit3,o=sevenSeas
+uid: OrgUnit3User2
+givenName: OrgUnit3User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit3User2
+cn: OrgUnit3User2 OrgUnit3User2
+
+dn: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: admin
+givenName: admin
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: admin
+sn: admin
+cn: admin admin
+

Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/security-spi-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/security-spi-ldap.xml?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/security-spi-ldap.xml (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/security-spi-ldap.xml Thu Dec  7 17:47:28 2006
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+
+
+  <!-- ************** Ldap Configuration ************** -->
+  <bean id="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig"
+      class="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig">
+      <!-- The LDAP initial context factory. -->
+      <constructor-arg index="0"><value>com.sun.jndi.ldap.LdapCtxFactory</value></constructor-arg>
+      <!-- The LDAP server name. -->
+      <constructor-arg index="1"><value>localhost</value></constructor-arg>
+      <!-- The LDAP server port. -->
+      <constructor-arg index="2"><value>389</value></constructor-arg>
+      <!-- The LDAP server root context. -->
+      <constructor-arg index="3"><value>o=sevenSeas</value></constructor-arg>
+      <!-- The LDAP server root dn. -->
+      <constructor-arg index="4"><value>cn=Manager,o=sevenSeas</value></constructor-arg>
+      <!-- The LDAP server root password. -->
+      <constructor-arg index="5"><value>secret</value></constructor-arg>
+      <!-- The roles filter. -->
+      <constructor-arg index="6"><value>(objectclass=groupOfUniqueNames)</value></constructor-arg>
+      <!-- The groups filter. -->
+      <constructor-arg index="7"><value>(objectclass=groupOfUniqueNames)</value></constructor-arg>
+      <!-- The user filter. -->
+      <constructor-arg index="8"><value>(objectclass=inetorgperson)(objectclass=organizationalPerson)</value></constructor-arg>
+      <!-- The roleMembershipAttributes. -->
+      <constructor-arg index="9"><value>uniqueMember</value></constructor-arg>
+      <!-- The userRoleMembershipAttributes. -->
+      <constructor-arg index="10"><value></value></constructor-arg>
+      <!-- The groupMembershipAttributes. -->
+      <constructor-arg index="11"><value>uniqueMember</value></constructor-arg>
+      <!-- The userGroupMembershipAttributes. -->
+      <constructor-arg index="12"><value></value></constructor-arg>
+      <!-- The groupMembershipForRoleAttributes. -->
+      <constructor-arg index="13"><value>uniqueMember</value></constructor-arg>
+      <!-- The roleGroupMembershipForRoleAttributes. -->
+      <constructor-arg index="14"><value></value></constructor-arg>      
+      <!-- The defaultSearchBase. -->
+      <constructor-arg index="15"><value></value></constructor-arg>
+      <!-- The roleFilterBase. -->
+      <constructor-arg index="16"><value>ou=Roles,ou=OrgUnit1</value></constructor-arg>
+      <!-- The groupFilterBase. -->
+      <constructor-arg index="17"><value>ou=Groups,ou=OrgUnit1</value></constructor-arg>
+      <!-- The userFilterBase. -->
+      <constructor-arg index="18"><value>ou=People,ou=OrgUnit1</value></constructor-arg>
+      <!-- The roleObjectClasses. -->
+      <constructor-arg index="19"><value>top,groupOfUniqueNames</value></constructor-arg>
+      <!-- The groupObjectClasses. -->
+      <constructor-arg index="20"><value>top,groupOfUniqueNames</value></constructor-arg>
+      <!-- The userObjectClasses. -->
+      <constructor-arg index="21"><value>top,person,organizationalPerson,inetorgperson</value></constructor-arg>
+      <!-- The roleIdAttribute. -->
+      <constructor-arg index="22"><value>cn</value></constructor-arg>
+      <!-- The groupIdAttribute. -->
+      <constructor-arg index="23"><value>cn</value></constructor-arg>
+	  	<!-- The userIdAttribute. -->
+      <constructor-arg index="24"><value>uid</value></constructor-arg>
+      <!-- The UidAttribute. -->
+      <constructor-arg index="25"><value>uid</value></constructor-arg>
+      <!-- The MemberShipSearchScope. -->
+      <constructor-arg index="26"><value>1</value></constructor-arg>
+      <!-- The roleUidAttribute. -->
+      <constructor-arg index="27"><value>cn</value></constructor-arg>
+      <!-- The groupUidAttribute. -->
+      <constructor-arg index="28"><value>cn</value></constructor-arg>
+	  <!-- The userUidAttribute. -->
+      <constructor-arg index="29"><value>uid</value></constructor-arg>
+	  <!-- The roleObjectRequiredAttributeClasses. -->
+      <constructor-arg index="30"><value>uniqueMember</value></constructor-arg>
+	  <!-- The groupObjectRequiredAttributeClasses. -->
+      <constructor-arg index="31"><value>uniqueMember</value></constructor-arg>
+	  <!-- The userAttributes. -->
+      <constructor-arg index="32"><value>sn={u},cn={u}</value></constructor-arg>
+	  <!-- The roleAttributes. -->
+      <constructor-arg index="33"><value></value></constructor-arg>
+	  <!-- The groupAttributes. -->
+      <constructor-arg index="34"><value></value></constructor-arg>
+	  <!-- The userPasswordAttribute. -->
+      <constructor-arg index="35"><value>userPassword</value></constructor-arg>
+	  <!-- The knownAttributes. -->
+      <constructor-arg index="36"><value>cn,sn,o,uid,ou,objectClass,userPassword,member,uniqueMember,memberOf</value></constructor-arg>
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup2/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/company1.ldif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/company1.ldif?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/company1.ldif (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/company1.ldif Thu Dec  7 17:47:28 2006
@@ -0,0 +1,219 @@
+# Sample LDIF file for populating Lotus LDAP Server
+#
+# Group objectClass = groupOfUniqueNames
+# Role objectClass = groupOfUniqueNames
+#
+# Roles and groups have an empty uniqueMember attribute (required by schema)
+#
+dn: ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: organizationalunit
+ou: OrgUnit1
+
+dn: ou=OrgUnit2,o=sevenSeas
+ou: OrgUnit2
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: ou=OrgUnit3,o=sevenSeas
+ou: OrgUnit3
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=People,ou=OrgUnit1,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit1,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Roles,ou=OrgUnit1,o=sevenSeas
+ou: Roles
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: ou=People,ou=OrgUnit2,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit2,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Roles,ou=OrgUnit2,o=sevenSeas
+ou: Roles
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=People,ou=OrgUnit3,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit3,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Roles,ou=OrgUnit3,o=sevenSeas
+ou: Roles
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: cn=Group1,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember: uid=admin,ou=People,ou=OrgUnit1
+cn: Group1
+
+dn: cn=Group2,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+cn: Group2
+
+dn: cn=Group3,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+cn: Group3
+
+dn: cn=admin,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:uid=admin,ou=People,ou=OrgUnit1
+cn: admin
+
+dn: cn=manager,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:uid=admin,ou=People,ou=OrgUnit1
+cn: manager
+
+dn: uid=Role1,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+objectClass: uidObject
+member:
+cn: Role1
+uid: Role1
+
+
+dn: uid=Role2,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+objectClass: uidObject
+member:
+cn: Role2
+uid: Role2
+
+
+dn: uid=Role3,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+objectClass: uidObject
+member:
+cn: Role3
+uid: Role3
+
+dn: uid=admin,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+objectClass: uidObject
+member: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+cn: admin
+uid: admin
+
+dn: uid=manager,ou=Roles,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+objectClass: uidObject
+member: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+cn: manager
+uid: manager
+
+dn: uid=OrgUnit1User1,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: OrgUnit1User1
+givenName: OrgUnit1User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit1User1
+cn: OrgUnit1User1
+
+dn: uid=OrgUnit1User2,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: OrgUnit1User2
+givenName: OrgUnit1User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit1User2
+cn: OrgUnit1User2
+
+dn: uid=OrgUnit2User1,ou=People,ou=OrgUnit2,o=sevenSeas
+uid: OrgUnit2User1
+givenName: OrgUnit2User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit2User1
+cn: OrgUnit2User1
+
+dn: uid=OrgUnit2User2,ou=People,ou=OrgUnit2,o=sevenSeas
+uid: OrgUnit2User2
+givenName: OrgUnit2User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit2User2
+cn: OrgUnit2User2
+
+
+dn: uid=OrgUnit3User1,ou=People,ou=OrgUnit3,o=sevenSeas
+uid: OrgUnit3User1
+givenName: OrgUnit3User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit3User1
+cn: OrgUnit3User1
+
+dn: uid=OrgUnit3User2,ou=People,ou=OrgUnit3,o=sevenSeas
+uid: OrgUnit3User2
+givenName: OrgUnit3User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit3User2
+cn: OrgUnit3User2
+
+dn: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: admin
+givenName: admin
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: admin
+sn: admin
+cn: admin

Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/security-spi-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/security-spi-ldap.xml?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/security-spi-ldap.xml (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/security-spi-ldap.xml Thu Dec  7 17:47:28 2006
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+
+
+  <!-- ************** Ldap Configuration ************** -->
+  <bean id="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig"
+      class="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig">
+      <!-- The LDAP initial context factory. -->
+      <constructor-arg index="0"><value>com.sun.jndi.ldap.LdapCtxFactory</value></constructor-arg>
+      <!-- The LDAP server name. -->
+      <constructor-arg index="1"><value>localhost</value></constructor-arg>
+      <!-- The LDAP server port. -->
+      <constructor-arg index="2"><value>389</value></constructor-arg>
+      <!-- The LDAP server root context. -->
+      <constructor-arg index="3"><value>o=sevenSeas</value></constructor-arg>
+      <!-- The LDAP server root dn. -->
+      <constructor-arg index="4"><value>cn=Manager,o=sevenSeas</value></constructor-arg>
+      <!-- The LDAP server root password. -->
+      <constructor-arg index="5"><value>secret</value></constructor-arg>
+      <!-- The roles filter. -->
+      <constructor-arg index="6"><value>(objectclass=groupOfNames)</value></constructor-arg>
+      <!-- The groups filter. -->
+      <constructor-arg index="7"><value>(objectclass=groupOfUniqueNames)</value></constructor-arg>
+      <!-- The user filter. -->
+      <constructor-arg index="8"><value>(objectclass=inetorgperson)(objectclass=organizationalPerson)</value></constructor-arg>
+      <!-- The roleMembershipAttributes. -->
+      <constructor-arg index="9"><value>member</value></constructor-arg>
+      <!-- The userRoleMembershipAttributes. -->
+      <constructor-arg index="10"><value></value></constructor-arg>
+      <!-- The groupMembershipAttributes. -->
+      <constructor-arg index="11"><value>uniqueMember</value></constructor-arg>
+      <!-- The userGroupMembershipAttributes. -->
+      <constructor-arg index="12"><value></value></constructor-arg>
+      <!-- The groupMembershipForRoleAttributes. -->
+      <constructor-arg index="13"><value>uniqueMember</value></constructor-arg>
+      <!-- The roleGroupMembershipForRoleAttributes. -->
+      <constructor-arg index="14"><value></value></constructor-arg>      
+      <!-- The defaultSearchBase. -->
+      <constructor-arg index="15"><value></value></constructor-arg>
+      <!-- The roleFilterBase. -->
+      <constructor-arg index="16"><value>ou=Roles,ou=OrgUnit1</value></constructor-arg>
+      <!-- The groupFilterBase. -->
+      <constructor-arg index="17"><value>ou=Groups,ou=OrgUnit1</value></constructor-arg>
+      <!-- The userFilterBase. -->
+      <constructor-arg index="18"><value>ou=People,ou=OrgUnit1</value></constructor-arg>
+      <!-- The roleObjectClasses. -->
+      <constructor-arg index="19"><value>top,uidObject,groupOfNames</value></constructor-arg>
+      <!-- The groupObjectClasses. -->
+      <constructor-arg index="20"><value>top,groupOfUniqueNames</value></constructor-arg>
+      <!-- The userObjectClasses. -->
+      <constructor-arg index="21"><value>top,person,organizationalPerson,inetorgperson</value></constructor-arg>
+      <!-- The roleIdAttribute. -->
+      <constructor-arg index="22"><value>uid</value></constructor-arg>
+      <!-- The groupIdAttribute. -->
+      <constructor-arg index="23"><value>cn</value></constructor-arg>
+	  	<!-- The userIdAttribute. -->
+      <constructor-arg index="24"><value>uid</value></constructor-arg>
+      <!-- The UidAttribute. -->
+      <constructor-arg index="25"><value>uid</value></constructor-arg>
+      <!-- The MemberShipSearchScope. -->
+      <constructor-arg index="26"><value>1</value></constructor-arg>
+      <!-- The roleUidAttribute. -->
+      <constructor-arg index="27"><value>uid</value></constructor-arg>
+      <!-- The groupUidAttribute. -->
+      <constructor-arg index="28"><value>cn</value></constructor-arg>
+	  <!-- The userUidAttribute. -->
+      <constructor-arg index="29"><value>uid</value></constructor-arg>
+	  <!-- The roleObjectRequiredAttributeClasses. -->
+      <constructor-arg index="30"><value>member</value></constructor-arg>
+	  <!-- The groupObjectRequiredAttributeClasses. -->
+      <constructor-arg index="31"><value>uniqueMember</value></constructor-arg>
+	  <!-- The userAttributes. -->
+      <constructor-arg index="32"><value>sn={u},uid={u}</value></constructor-arg>
+	  <!-- The roleAttributes. -->
+      <constructor-arg index="33"><value>cn={u}</value></constructor-arg>
+	  <!-- The groupAttributes. -->
+      <constructor-arg index="34"><value></value></constructor-arg>
+	  <!-- The userPasswordAttribute. -->
+      <constructor-arg index="35"><value>userPassword</value></constructor-arg>
+	  <!-- The knownAttributes. -->
+      <constructor-arg index="36"><value>cn,sn,o,uid,ou,objectClass,userPassword,member,uniqueMember,memberOf</value></constructor-arg>
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup3/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/company1.ldif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/company1.ldif?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/company1.ldif (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/company1.ldif Thu Dec  7 17:47:28 2006
@@ -0,0 +1,176 @@
+# Sample LDIF file for populating Lotus LDAP Server
+#
+# Group objectClass = groupOfUniqueNames
+# Role objectClass = groupOfUniqueNames
+#
+# Roles and groups have an empty uniqueMember attribute (required by schema)
+#
+dn: ou=People,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: cn=Group1,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+uniqueMember: cn=OrgUnit1User1,ou=People,o=sevenSeas
+uniqueMember: cn=OrgUnit1User2,ou=People,o=sevenSeas
+uniqueMember: cn=OrgUnit2User1,ou=People,o=sevenSeas
+uniqueMember: cn=OrgUnit2User2,ou=People,o=sevenSeas
+uniqueMember: cn=OrgUnit3User1,ou=People,o=sevenSeas
+uniqueMember: cn=OrgUnit3User2,ou=People,o=sevenSeas
+uniqueMember: cn=adminuser,ou=People,o=sevenSeas
+cn: Group1
+
+dn: cn=Group2,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+uniqueMember: cn=OrgUnit1User1,ou=People,o=sevenSeas
+uniqueMember: cn=OrgUnit2User1,ou=People,o=sevenSeas
+uniqueMember: cn=OrgUnit3User1,ou=People,o=sevenSeas
+uniqueMember: cn=adminuser,ou=People,o=sevenSeas
+cn: Group2
+
+dn: cn=Group3,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+uniqueMember: cn=OrgUnit1User1,ou=People,o=sevenSeas
+cn: Group3
+
+dn: cn=adminGroup,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember:
+cn: adminGroup
+
+dn: cn=managerGroup,o=sevenSeas
+objectClass: top
+objectClass: groupOfUniqueNames
+uniqueMember: cn=adminuser,ou=People,o=sevenSeas
+cn: managerGroup
+
+dn: cn=Role1,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+member:
+member: cn=OrgUnit1User2,ou=People,o=sevenSeas
+cn: Role1
+
+
+dn: cn=Role2,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+member:
+member: cn=OrgUnit1User2,ou=People,o=sevenSeas
+member: cn=OrgUnit2User2,ou=People,o=sevenSeas
+member: cn=OrgUnit3User2,ou=People,o=sevenSeas
+cn: Role2
+
+
+dn: cn=Role3,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+member:
+member: cn=OrgUnit1User1,ou=People,o=sevenSeas
+member: cn=OrgUnit1User2,ou=People,o=sevenSeas
+member: cn=OrgUnit2User1,ou=People,o=sevenSeas
+member: cn=OrgUnit2User2,ou=People,o=sevenSeas
+member: cn=OrgUnit3User1,ou=People,o=sevenSeas
+member: cn=OrgUnit3User2,ou=People,o=sevenSeas
+member: cn=adminuser,ou=People,o=sevenSeas
+cn: Role3
+
+dn: cn=admin,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+member: cn=adminuser,ou=People,o=sevenSeas
+cn: admin
+
+dn: cn=manager,o=sevenSeas
+objectClass: top
+objectClass: groupOfNames
+member: cn=adminuser,ou=People,o=sevenSeas
+cn: manager
+
+dn: cn=OrgUnit1User1,ou=People,o=sevenSeas
+uid: OrgUnit1User1
+givenName: OrgUnit1User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit1User1
+cn: OrgUnit1User1
+
+dn: cn=OrgUnit1User2,ou=People,o=sevenSeas
+uid: OrgUnit1User2
+givenName: OrgUnit1User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit1User2
+cn: OrgUnit1User2
+
+dn: cn=OrgUnit2User1,ou=People,o=sevenSeas
+uid: OrgUnit2User1
+givenName: OrgUnit2User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit2User1
+cn: OrgUnit2User1
+
+dn: cn=OrgUnit2User2,ou=People,o=sevenSeas
+uid: OrgUnit2User2
+givenName: OrgUnit2User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit2User2
+cn: OrgUnit2User2
+
+
+dn: cn=OrgUnit3User1,ou=People,o=sevenSeas
+uid: OrgUnit3User1
+givenName: OrgUnit3User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit3User1
+cn: OrgUnit3User1
+
+dn: cn=OrgUnit3User2,ou=People,o=sevenSeas
+uid: OrgUnit3User2
+givenName: OrgUnit3User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit3User2
+cn: OrgUnit3User2
+
+dn: cn=adminuser,ou=People,o=sevenSeas
+uid: adminuser
+givenName: admin
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: admin
+sn: adminuser
+cn: adminuser
+

Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/security-spi-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/security-spi-ldap.xml?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/security-spi-ldap.xml (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/security-spi-ldap.xml Thu Dec  7 17:47:28 2006
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+
+
+  <!-- ************** Ldap Configuration ************** -->
+  <bean id="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig"
+      class="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig">
+      <!-- The LDAP initial context factory. -->
+      <constructor-arg index="0"><value>com.sun.jndi.ldap.LdapCtxFactory</value></constructor-arg>
+      <!-- The LDAP server name. -->
+      <constructor-arg index="1"><value>localhost</value></constructor-arg>
+      <!-- The LDAP server port. -->
+      <constructor-arg index="2"><value>389</value></constructor-arg>
+      <!-- The LDAP server root context. -->
+      <constructor-arg index="3"><value>o=sevenSeas</value></constructor-arg>
+      <!-- The LDAP server root dn. -->
+      <constructor-arg index="4"><value>cn=Manager,o=sevenSeas</value></constructor-arg>
+      <!-- The LDAP server root password. -->
+      <constructor-arg index="5"><value>secret</value></constructor-arg>
+      <!-- The roles filter. -->
+      <constructor-arg index="6"><value>(objectclass=groupOfNames)</value></constructor-arg>
+      <!-- The groups filter. -->
+      <constructor-arg index="7"><value>(objectclass=groupOfUniqueNames)</value></constructor-arg>
+      <!-- The user filter. -->
+      <constructor-arg index="8"><value>(objectclass=inetorgperson)(objectclass=organizationalPerson)</value></constructor-arg>
+      <!-- The roleMembershipAttributes. -->
+      <constructor-arg index="9"><value>member</value></constructor-arg>
+      <!-- The userRoleMembershipAttributes. -->
+      <constructor-arg index="10"><value></value></constructor-arg>
+      <!-- The groupMembershipAttributes. -->
+      <constructor-arg index="11"><value>uniqueMember</value></constructor-arg>
+      <!-- The userGroupMembershipAttributes. -->
+      <constructor-arg index="12"><value></value></constructor-arg>
+      <!-- The groupMembershipForRoleAttributes. -->
+      <constructor-arg index="13"><value>uniqueMember</value></constructor-arg>
+      <!-- The roleGroupMembershipForRoleAttributes. -->
+      <constructor-arg index="14"><value></value></constructor-arg>      
+      <!-- The defaultSearchBase. -->
+      <constructor-arg index="15"><value></value></constructor-arg>
+      <!-- The roleFilterBase. -->
+      <constructor-arg index="16"><value></value></constructor-arg>
+      <!-- The groupFilterBase. -->
+      <constructor-arg index="17"><value></value></constructor-arg>
+      <!-- The userFilterBase. -->
+      <constructor-arg index="18"><value>ou=People</value></constructor-arg>
+      <!-- The roleObjectClasses. -->
+      <constructor-arg index="19"><value>top,groupOfNames</value></constructor-arg>
+      <!-- The groupObjectClasses. -->
+      <constructor-arg index="20"><value>top,groupOfUniqueNames</value></constructor-arg>
+      <!-- The userObjectClasses. -->
+      <constructor-arg index="21"><value>top,person,organizationalPerson,inetorgperson</value></constructor-arg>
+      <!-- The roleIdAttribute. -->
+      <constructor-arg index="22"><value>cn</value></constructor-arg>
+      <!-- The groupIdAttribute. -->
+      <constructor-arg index="23"><value>cn</value></constructor-arg>
+	  	<!-- The userIdAttribute. -->
+      <constructor-arg index="24"><value>cn</value></constructor-arg>
+      <!-- The UidAttribute. -->
+      <constructor-arg index="25"><value>uid</value></constructor-arg>
+      <!-- The MemberShipSearchScope. -->
+      <constructor-arg index="26"><value>1</value></constructor-arg>
+      <!-- The roleUidAttribute. -->
+      <constructor-arg index="27"><value>cn</value></constructor-arg>
+      <!-- The groupUidAttribute. -->
+      <constructor-arg index="28"><value>cn</value></constructor-arg>
+	  <!-- The userUidAttribute. -->
+      <constructor-arg index="29"><value>uid</value></constructor-arg>
+	  <!-- The roleObjectRequiredAttributeClasses. -->
+      <constructor-arg index="30"><value>member</value></constructor-arg>
+	  <!-- The groupObjectRequiredAttributeClasses. -->
+      <constructor-arg index="31"><value>uniqueMember</value></constructor-arg>
+	  <!-- The userAttributes. -->
+      <constructor-arg index="32"><value>sn={u},uid={u}</value></constructor-arg>
+	  <!-- The roleAttributes. -->
+      <constructor-arg index="33"><value></value></constructor-arg>
+	  <!-- The groupAttributes. -->
+      <constructor-arg index="34"><value></value></constructor-arg>
+	  <!-- The userPasswordAttribute. -->
+      <constructor-arg index="35"><value>userPassword</value></constructor-arg>
+	  <!-- The knownAttributes. -->
+      <constructor-arg index="36"><value>cn,sn,o,uid,ou,objectClass,userPassword,member,uniqueMember,memberOf</value></constructor-arg>
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/openldap/setup4/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/company1.ldif
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/company1.ldif?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/company1.ldif (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/company1.ldif Thu Dec  7 17:47:28 2006
@@ -0,0 +1,194 @@
+#
+# filters
+#   USER FILTER
+#   (&(uid=OrgUnit3User2)(objectClass=inetorgperson))
+#
+#   GROUP FILTER
+#   (objectclass=groupofuniquenames)
+#
+#   ROLE FILTER
+#
+#   (objectclass=nsroledefinition)
+#
+#
+#
+#
+
+
+
+
+
+dn: ou=OrgUnit1,o=sevenSeas
+ou: OrgUnit1
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=Groups,ou=OrgUnit1,o=sevenSeas
+ou: Groups
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: cn=Group1,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupofuniquenames
+cn: Group1
+
+
+dn: cn=Group2,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupofuniquenames
+uniqueMember: uid=OrgUnit2User1,ou=People,ou=OrgUnit2,o=sevenSeas
+uniqueMember: uid=OrgUnit2User2,ou=People,ou=OrgUnit2,o=sevenSeas
+cn: Group2
+
+
+dn: cn=Group3,ou=Groups,ou=OrgUnit1,o=sevenSeas
+objectClass: top
+objectClass: groupofuniquenames
+cn: Group3
+
+
+dn: ou=OrgUnit2,o=sevenSeas
+ou: OrgUnit2
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: ou=OrgUnit3,o=sevenSeas
+ou: OrgUnit3
+objectClass: top
+objectClass: organizationalunit
+
+
+dn: cn=Role1,o=sevenSeas
+objectClass: top
+objectClass: ldapsubentry
+objectClass: nsroledefinition
+objectClass: nssimpleroledefinition
+objectClass: nsmanagedroledefinition
+cn: Role1
+
+
+dn: cn=Role2,o=sevenSeas
+objectClass: top
+objectClass: ldapsubentry
+objectClass: nsroledefinition
+objectClass: nssimpleroledefinition
+objectClass: nsmanagedroledefinition
+cn: Role2
+
+
+dn: cn=Role3,o=sevenSeas
+objectClass: top
+objectClass: ldapsubentry
+objectClass: nsroledefinition
+objectClass: nssimpleroledefinition
+objectClass: nsmanagedroledefinition
+cn: Role3
+
+dn: cn=admin,o=sevenSeas
+objectClass: top
+objectClass: ldapsubentry
+objectClass: nsroledefinition
+objectClass: nssimpleroledefinition
+objectClass: nsmanagedroledefinition
+cn: admin
+
+
+dn: ou=People,ou=OrgUnit1,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=People,ou=OrgUnit2,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: ou=People,ou=OrgUnit3,o=sevenSeas
+ou: People
+objectClass: top
+objectClass: organizationalunit
+
+dn: uid=OrgUnit1User1,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: OrgUnit1User1
+givenName: OrgUnit1User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+nsroledn: cn=Role1,o=sevenSeas
+nsrole: cn=role1,o=sevenSeas
+sn: OrgUnit1User1
+cn: OrgUnit1User1 OrgUnit1User1
+
+dn: uid=OrgUnit1User2,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: OrgUnit1User2
+givenName: OrgUnit1User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit1User2
+cn: OrgUnit1User2 OrgUnit1User2
+
+dn: uid=admin,ou=People,ou=OrgUnit1,o=sevenSeas
+uid: admin
+givenName: admin
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: admin
+nsroledn: cn=admin,o=sevenSeas
+nsrole: cn=admin,o=sevenSeas
+sn: admin
+cn: admin admin
+
+dn: uid=OrgUnit2User1,ou=People,ou=OrgUnit2,o=sevenSeas
+uid: OrgUnit2User1
+givenName: OrgUnit2User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit2User1
+cn: OrgUnit2User1 OrgUnit2User1
+
+dn: uid=OrgUnit2User2,ou=People,ou=OrgUnit2,o=sevenSeas
+uid: OrgUnit2User2
+givenName: OrgUnit2User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit2User2
+cn: OrgUnit2User2 OrgUnit2User2
+
+
+dn: uid=OrgUnit3User1,ou=People,ou=OrgUnit3,o=sevenSeas
+uid: OrgUnit3User1
+givenName: OrgUnit3User1
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit3User1
+cn: OrgUnit3User1 OrgUnit3User1
+
+dn: uid=OrgUnit3User2,ou=People,ou=OrgUnit3,o=sevenSeas
+uid: OrgUnit3User2
+givenName: OrgUnit3User2
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetorgperson
+userPassword: x
+sn: OrgUnit3User2
+cn: OrgUnit3User2 OrgUnit3User2s

Added: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/security-spi-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/security-spi-ldap.xml?view=auto&rev=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/security-spi-ldap.xml (added)
+++ portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/security-spi-ldap.xml Thu Dec  7 17:47:28 2006
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+
+
+  <!-- ************** Ldap Configuration ************** -->
+  <bean id="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig"
+      class="org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig">
+      <!-- The LDAP initial context factory. -->
+      <constructor-arg index="0"><value>com.sun.jndi.ldap.LdapCtxFactory</value></constructor-arg>
+      <!-- The LDAP server name. -->
+      <constructor-arg index="1"><value>localhost</value></constructor-arg>
+      <!-- The LDAP server port. -->
+      <constructor-arg index="2"><value>389</value></constructor-arg>
+      <!-- The LDAP server root context. -->
+      <constructor-arg index="3"><value>o=sevenSeas</value></constructor-arg>
+      <!-- The LDAP server root dn. -->
+      <constructor-arg index="4"><value>cn=Directory Manager</value></constructor-arg>
+      <!-- The LDAP server root password. -->
+      <constructor-arg index="5"><value>adminadmin</value></constructor-arg>
+      <!-- The roles filter. -->
+      <constructor-arg index="6"><value>(objectclass=ldapsubentry) (objectclass=nsroledefinition)</value></constructor-arg>
+      <!-- The groups filter. -->
+      <constructor-arg index="7"><value>(objectclass=groupOfUniqueNames)</value></constructor-arg>
+      <!-- The user filter. -->
+      <constructor-arg index="8"><value>(objectclass=inetorgperson)(objectclass=organizationalPerson)</value></constructor-arg>
+      <!-- The roleMembershipAttributes. -->
+      <constructor-arg index="9"><value></value></constructor-arg>
+      <!-- The userRoleMembershipAttributes. -->
+      <constructor-arg index="10"><value>nsroledn</value></constructor-arg>
+      <!-- The groupMembershipAttributes. -->
+      <constructor-arg index="11"><value>uniqueMember</value></constructor-arg>
+      <!-- The userGroupMembershipAttributes. -->
+      <constructor-arg index="12"><value></value></constructor-arg>
+      <!-- The groupMembershipForRoleAttributes. -->
+      <constructor-arg index="13"><value>uniqueMember</value></constructor-arg>
+      <!-- The roleGroupMembershipForRoleAttributes. -->
+      <constructor-arg index="14"><value></value></constructor-arg>      
+      <!-- The defaultSearchBase. -->
+      <constructor-arg index="15"><value>o=sevenSeass</value></constructor-arg>
+      <!-- The roleFilterBase. -->
+      <constructor-arg index="16"><value></value></constructor-arg>
+      <!-- The groupFilterBase. -->
+      <constructor-arg index="17"><value>ou=Groups,ou=OrgUnit1</value></constructor-arg>
+      <!-- The userFilterBase. -->
+      <constructor-arg index="18"><value>ou=People,ou=OrgUnit1</value></constructor-arg>
+      <!-- The roleObjectClasses. -->
+      <constructor-arg index="19"><value>top,ldapsubentry,nsroledefinition,nssimpleroledefinition,nsmanagedroledefinition</value></constructor-arg>
+      <!-- The groupObjectClasses. -->
+      <constructor-arg index="20"><value>top,groupofuniquenames</value></constructor-arg>
+      <!-- The userObjectClasses. -->
+      <constructor-arg index="21"><value>top,person,organizationalPerson,inetorgperson</value></constructor-arg>
+      <!-- The roleIdAttribute. -->
+      <constructor-arg index="22"><value>cn</value></constructor-arg>
+      <!-- The groupIdAttribute. -->
+      <constructor-arg index="23"><value>cn</value></constructor-arg>
+	  	<!-- The userIdAttribute. -->
+      <constructor-arg index="24"><value>uid</value></constructor-arg>
+      <!-- The UidAttribute. -->
+      <constructor-arg index="25"><value>uid</value></constructor-arg>
+      <!-- The MemberShipSearchScope. -->
+      <constructor-arg index="26"><value>1</value></constructor-arg>
+      <!-- The roleUidAttribute. -->
+      <constructor-arg index="27"><value>cn</value></constructor-arg>
+      <!-- The groupUidAttribute. -->
+      <constructor-arg index="28"><value>cn</value></constructor-arg>
+	  <!-- The userUidAttribute. -->
+      <constructor-arg index="29"><value>uid</value></constructor-arg>
+	  <!-- The roleObjectRequiredAttributeClasses. -->
+      <constructor-arg index="30"><value></value></constructor-arg>
+	  <!-- The groupObjectRequiredAttributeClasses. -->
+      <constructor-arg index="31"><value>uniqueMember</value></constructor-arg>
+	  <!-- The userAttributes. -->
+      <constructor-arg index="32"><value>sn={u},cn={u}</value></constructor-arg>
+	  <!-- The roleAttributes. -->
+      <constructor-arg index="33"><value>cn={u}</value></constructor-arg>
+	  <!-- The groupAttributes. -->
+      <constructor-arg index="34"><value>cn={u}</value></constructor-arg>
+	  <!-- The userPasswordAttribute. -->
+      <constructor-arg index="35"><value>userPassword</value></constructor-arg>
+	  <!-- The knownAttributes. -->
+      <constructor-arg index="36"><value>cn,sn,o,uid,ou,objectClass,userPassword,member,nsroledn,uniqueMember,memberOf</value></constructor-arg>
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/components/security/src/test/JETSPEED-INF/directory/config/sunds/setup1/security-spi-ldap.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/AbstractLdapTest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/AbstractLdapTest.java?view=diff&rev=483771&r1=483770&r2=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/AbstractLdapTest.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/AbstractLdapTest.java Thu Dec  7 17:47:28 2006
@@ -16,8 +16,11 @@
 
 import java.util.Random;
 
-import junit.framework.TestCase;
+import javax.naming.NamingException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.components.test.AbstractSpringTestCase;
 import org.apache.jetspeed.security.spi.CredentialHandler;
 import org.apache.jetspeed.security.spi.GroupSecurityHandler;
 import org.apache.jetspeed.security.spi.RoleSecurityHandler;
@@ -28,6 +31,7 @@
 import org.apache.jetspeed.security.spi.impl.LdapRoleSecurityHandler;
 import org.apache.jetspeed.security.spi.impl.LdapSecurityMappingHandler;
 import org.apache.jetspeed.security.spi.impl.LdapUserSecurityHandler;
+import org.apache.jetspeed.security.spi.impl.ldap.InitLdapSchema;
 import org.apache.jetspeed.security.spi.impl.ldap.LdapBindingConfig;
 import org.apache.jetspeed.security.spi.impl.ldap.LdapGroupDaoImpl;
 import org.apache.jetspeed.security.spi.impl.ldap.LdapMemberShipDaoImpl;
@@ -47,8 +51,13 @@
  * @author <a href="mailto:mike.long@dataline.com">Mike Long </a>, <a href="mailto:dlestrat@apache.org">David Le Strat</a>
  * 
  */
-public abstract class AbstractLdapTest extends TestCase
+public abstract class AbstractLdapTest extends AbstractSpringTestCase
 {
+    /** The logger. */
+    private static final Log logger = LogFactory.getLog(AbstractLdapTest.class);
+    
+	private static final String LDAP_CONFIG = "openldap/setup2";
+	
     /** The {@link UserSecurityHandler}. */
     UserSecurityHandler userHandler;
 
@@ -101,6 +110,7 @@
 
     /** The test password. */
     protected String password = "fred";
+    
 
     /**
      * @see junit.framework.TestCase#setUp()
@@ -108,7 +118,25 @@
     protected void setUp() throws Exception
     {
         super.setUp();
-        LdapBindingConfig ldapConfig = new LdapBindingConfig("apacheds");
+        LdapBindingConfig ldapConfig = (LdapBindingConfig)ctx.getBean(LdapBindingConfig.class.getName());
+        InitLdapSchema ldapSchema = new InitLdapSchema(ldapConfig);
+        try
+        {
+            // make sure standard test case schema exists
+            ldapSchema.initOu("OrgUnit1");
+            ldapSchema.initOu("People");
+            ldapSchema.initOu("Roles");
+            ldapSchema.initOu("People","ou=OrgUnit1");
+            ldapSchema.initOu("Groups","ou=OrgUnit1");
+            ldapSchema.initOu("Roles","ou=OrgUnit1");
+
+        }
+        catch (NamingException se)
+        {
+            logger.error("Initializing the LDAP directory failed:", se);
+            throw se;
+        }
+
         ldapCredDao = new LdapUserCredentialDaoImpl(ldapConfig);
         ldapPrincipalDao = new LdapUserPrincipalDaoImpl(ldapConfig);
 
@@ -116,8 +144,6 @@
         crHandler = new LdapCredentialHandler(ldapCredDao);
         LdapDataHelper.setUserSecurityHandler(userHandler);
         LdapDataHelper.setCredentialHandler(crHandler);
-//        uid1 = Integer.toString(rand.nextInt());
-//        uid2 = Integer.toString(rand.nextInt());
         
         ldapGroupDao = new LdapGroupDaoImpl(ldapConfig);
         ldapRoleDao = new LdapRoleDaoImpl(ldapConfig);
@@ -126,11 +152,6 @@
         roleHandler = new LdapRoleSecurityHandler(ldapRoleDao);
         LdapDataHelper.setGroupSecurityHandler(grHandler);
         LdapDataHelper.setRoleSecurityHandler(roleHandler);
-//        gpUid1 = Integer.toString(rand.nextInt());
-//        gpUid2 = Integer.toString(rand.nextInt());
-//        
-//        roleUid1 = Integer.toString(rand.nextInt());
-//        roleUid2 = Integer.toString(rand.nextInt());        
         
         secHandler = new LdapSecurityMappingHandler(ldapPrincipalDao, ldapGroupDao, ldapRoleDao);
     }
@@ -143,4 +164,8 @@
         super.tearDown();
     }
 
+    protected String[] getConfigurations()
+    {
+        return new String[] {"JETSPEED-INF/directory/config/" + LDAP_CONFIG + "/security-spi-ldap.xml" };
+    }    
 }

Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java?view=diff&rev=483771&r1=483770&r2=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java Thu Dec  7 17:47:28 2006
@@ -1,131 +1,130 @@
-/*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.security.spi.ldap;
-
-import java.util.List;
-
-import org.apache.jetspeed.security.RolePrincipal;
-import org.apache.jetspeed.security.impl.RolePrincipalImpl;
-
-/**
- * @author <a href="mailto:mike.long@dataline.com">Mike Long </a>, <a
- *         href="mailto:dlestrat@apache.org">David Le Strat</a>
- */
-public class TestLdapRoleSecurityHandler extends AbstractLdapTest
-{
-
-    /**
-     * @see org.apache.jetspeed.security.spi.ldap.AbstractLdapTest#setUp()
-     */
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        LdapDataHelper.seedRoleData(roleUid1);
-    }
-
-    /**
-     * @see org.apache.jetspeed.security.spi.ldap.AbstractLdapTest#tearDown()
-     */
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-        LdapDataHelper.removeRoleData(roleUid1);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testGetRolePrincipal() throws Exception
-    {
-        String fullPath = (new RolePrincipalImpl(roleUid1)).getFullPath();
-        //RolePrincipal rolePrincipal = grHandler.getRolePrincipal(fullPath);
-        RolePrincipal rolePrincipal = roleHandler.getRolePrincipal(roleUid1);
-        assertNotNull("Role was not found.", rolePrincipal);
-        assertEquals(roleUid1,rolePrincipal.getName());
-        assertEquals(fullPath,rolePrincipal.getFullPath());
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testAddDuplicateRolePrincipal() throws Exception
-    {
-    	roleHandler.setRolePrincipal(new RolePrincipalImpl(roleUid1));
-        List roles = roleHandler.getRolePrincipals("");
-        assertEquals(1,roles.size());
-    }
-    
-    /**
-     * @throws Exception
-     */
-    public void testGetNonExistingRolePrincipal() throws Exception
-    {
-        RolePrincipal role = roleHandler.getRolePrincipal(roleUid1 + "FAKE");
-        assertNull(role);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testRemoveExistantUserPrincipal() throws Exception
-    {
-        RolePrincipal gp = new RolePrincipalImpl(roleUid1);
-        roleHandler.removeRolePrincipal(gp);
-        RolePrincipal rolePrincipal = roleHandler.getRolePrincipal(gp.getFullPath());
-        assertNull("Role was found and should have been removed.", rolePrincipal);
-        List roles = roleHandler.getRolePrincipals("");
-        assertEquals(0,roles.size());        
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testRemoveNonExistantUserPrincipal() throws Exception
-    {
-        String localUid = Integer.toString(rand.nextInt()).toString();
-        RolePrincipal localPrin = new RolePrincipalImpl(localUid);
-        roleHandler.removeRolePrincipal(localPrin);
-        List roles = roleHandler.getRolePrincipals("");
-        assertEquals(1,roles.size());
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testGetRolePrincipals() throws Exception
-    {
-        try
-        {
-            LdapDataHelper.seedRoleData(gpUid2);
-            assertTrue("getUserPrincipals should have returned more than one user.", roleHandler.getRolePrincipals("*")
-                    .size() > 1);
-
-            String fullPath = (new RolePrincipalImpl(roleUid1)).getFullPath();
-            List roles = roleHandler.getRolePrincipals(fullPath);
-            assertTrue("getRolePrincipals should have returned one role.", roles.size() == 1);
-            assertTrue("List should have consisted of RolePrincipal objects.", roles.get(0) instanceof RolePrincipal);
-
-            String localUid = Integer.toString(rand.nextInt()).toString();
-            assertTrue("getRolePrincipals should not have found any roles with the specified filter.", roleHandler
-                    .getRolePrincipals(new RolePrincipalImpl(localUid).getFullPath()).isEmpty());
-        }
-        finally
-        {
-            LdapDataHelper.removeRoleData(gpUid2);
-        }
-    }
-
-}
+/*
+ * Copyright 2000-2001,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.security.spi.ldap;
+
+import java.util.List;
+
+import org.apache.jetspeed.security.RolePrincipal;
+import org.apache.jetspeed.security.impl.RolePrincipalImpl;
+
+/**
+ * @author <a href="mailto:mike.long@dataline.com">Mike Long </a>, <a
+ *         href="mailto:dlestrat@apache.org">David Le Strat</a>
+ */
+public class TestLdapRoleSecurityHandler extends AbstractLdapTest
+{
+
+    /**
+     * @see org.apache.jetspeed.security.spi.ldap.AbstractLdapTest#setUp()
+     */
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        LdapDataHelper.seedRoleData(roleUid1);
+    }
+
+    /**
+     * @see org.apache.jetspeed.security.spi.ldap.AbstractLdapTest#tearDown()
+     */
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        LdapDataHelper.removeRoleData(roleUid1);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public void testGetRolePrincipal() throws Exception
+    {
+        String fullPath = (new RolePrincipalImpl(roleUid1)).getFullPath();
+        RolePrincipal rolePrincipal = roleHandler.getRolePrincipal(roleUid1);
+        assertNotNull("Role was not found.", rolePrincipal);
+        assertEquals(roleUid1,rolePrincipal.getName());
+        assertEquals(fullPath,rolePrincipal.getFullPath());
+    }
+
+    /**
+     * @throws Exception
+     */
+    public void testAddDuplicateRolePrincipal() throws Exception
+    {
+    	roleHandler.setRolePrincipal(new RolePrincipalImpl(roleUid1));
+        List roles = roleHandler.getRolePrincipals("");
+        assertEquals(1,roles.size());
+    }
+    
+    /**
+     * @throws Exception
+     */
+    public void testGetNonExistingRolePrincipal() throws Exception
+    {
+        RolePrincipal role = roleHandler.getRolePrincipal(roleUid1 + "FAKE");
+        assertNull(role);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public void testRemoveExistantUserPrincipal() throws Exception
+    {
+        RolePrincipal gp = new RolePrincipalImpl(roleUid1);
+        roleHandler.removeRolePrincipal(gp);
+        RolePrincipal rolePrincipal = roleHandler.getRolePrincipal(gp.getFullPath());
+        assertNull("Role was found and should have been removed.", rolePrincipal);
+        List roles = roleHandler.getRolePrincipals("");
+        assertEquals(0,roles.size());        
+    }
+
+    /**
+     * @throws Exception
+     */
+    public void testRemoveNonExistantUserPrincipal() throws Exception
+    {
+        String localUid = Integer.toString(rand.nextInt()).toString();
+        RolePrincipal localPrin = new RolePrincipalImpl(localUid);
+        roleHandler.removeRolePrincipal(localPrin);
+        List roles = roleHandler.getRolePrincipals("");
+        assertEquals(1,roles.size());
+    }
+
+    /**
+     * @throws Exception
+     */
+    public void testGetRolePrincipals() throws Exception
+    {
+        try
+        {
+            LdapDataHelper.seedRoleData(gpUid2);
+            assertTrue("getUserPrincipals should have returned more than one user.", roleHandler.getRolePrincipals("*")
+                    .size() > 1);
+
+            String fullPath = (new RolePrincipalImpl(roleUid1)).getFullPath();
+            List roles = roleHandler.getRolePrincipals(fullPath);
+            assertTrue("getRolePrincipals should have returned one role.", roles.size() == 1);
+            assertTrue("List should have consisted of RolePrincipal objects.", roles.get(0) instanceof RolePrincipal);
+
+            String localUid = Integer.toString(rand.nextInt()).toString();
+            assertTrue("getRolePrincipals should not have found any roles with the specified filter.", roleHandler
+                    .getRolePrincipals(new RolePrincipalImpl(localUid).getFullPath()).isEmpty());
+        }
+        finally
+        {
+            LdapDataHelper.removeRoleData(gpUid2);
+        }
+    }
+
+}

Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapSecurityMappingHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapSecurityMappingHandler.java?view=diff&rev=483771&r1=483770&r2=483771
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapSecurityMappingHandler.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapSecurityMappingHandler.java Thu Dec  7 17:47:28 2006
@@ -98,8 +98,6 @@
         String fullPathName = new GroupPrincipalImpl(gpUid1).getName();
         logger.debug("Group full path name from testGetUserPrincipalsInGroup()[" + fullPathName + "]");
         Set userPrincipals = secHandler.getUserPrincipalsInGroup(fullPathName);
-        //assertTrue(userPrincipals.contains(new UserPrincipalImpl("uid=" + uid1 + ",ou=People,ou=OrgUnit1")));
-        //assertTrue(userPrincipals.contains(new UserPrincipalImpl("uid=" + uid2 + ",ou=People,ou=OrgUnit1")));
         assertTrue(userPrincipals.contains(new UserPrincipalImpl(uid1)));
         assertTrue(userPrincipals.contains(new UserPrincipalImpl(uid2)));
         
@@ -144,10 +142,10 @@
 
         assertEquals("The user should have been in two groups.", 2, secHandler.getGroupPrincipals(uid1).size());
 
-        secHandler.removeUserPrincipalInGroup(uid1, gp1.getName());
+        secHandler.removeUserPrincipalInGroup(uid1, gp2.getName());
         assertEquals("The user should have been in one groups.", 1, secHandler.getGroupPrincipals(uid1).size());
 
-        secHandler.removeUserPrincipalInGroup(uid1, gp2.getName());
+        secHandler.removeUserPrincipalInGroup(uid1, gp1.getName());
         assertEquals("The user should have been in two groups.", 0, secHandler.getGroupPrincipals(uid1).size());
     }
 
@@ -215,13 +213,33 @@
         secHandler.setRolePrincipalInGroup(gpUid1, ro1.getName());
         secHandler.setRolePrincipalInGroup(gpUid1, ro2.getName());
         secHandler.setRolePrincipalInGroup(gpUid2, ro1.getName());
+        
 
+        String fullPathName = new RolePrincipalImpl(roleUid1).getName();
+        logger.debug("Role full path name from testGetUserPrincipalsInRole()[" + fullPathName + "]");
+        assertEquals("The group should have 2 roles.", 2, secHandler.getRolePrincipalsInGroup(gpUid1).size());
+        assertEquals("The group should have 1 role.", 1, secHandler.getRolePrincipalsInGroup(gpUid2).size());
+    }
+    
+    /**
+     * Adds 2 roles + 1 user to a group and checks their presence in the group.
+     * 
+     * @throws Exception
+     */
+    public void testGetRolePrincipalInGroupWithUsersInIt() throws Exception
+    {
+        secHandler.setRolePrincipalInGroup(gpUid1, ro1.getName());
+        secHandler.setRolePrincipalInGroup(gpUid1, ro2.getName());
+        secHandler.setRolePrincipalInGroup(gpUid2, ro1.getName());
+        secHandler.setUserPrincipalInGroup(uid1,gpUid1);
+        
 
         String fullPathName = new RolePrincipalImpl(roleUid1).getName();
         logger.debug("Role full path name from testGetUserPrincipalsInRole()[" + fullPathName + "]");
         assertEquals("The group should have 2 roles.", 2, secHandler.getRolePrincipalsInGroup(gpUid1).size());
         assertEquals("The group should have 1 role.", 1, secHandler.getRolePrincipalsInGroup(gpUid2).size());
-    } 
+    }     
+    
     
     /**
      * Adds 2 users to a group and checks their presence in the group
@@ -281,17 +299,32 @@
     {
         secHandler.setUserPrincipalInRole(uid1, ro1.getName());
         secHandler.setUserPrincipalInRole(uid1, ro2.getName());
-
         assertEquals("The user should have been in two roles.", 2, secHandler.getRolePrincipals(uid1).size());
 
         secHandler.removeUserPrincipalInRole(uid1, ro1.getName());
         assertEquals("The user should have been in one roles.", 1, secHandler.getRolePrincipals(uid1).size());
 
         secHandler.removeUserPrincipalInRole(uid1, ro2.getName());
-        assertEquals("The user should have been in two roles.", 0, secHandler.getRolePrincipals(uid1).size());
+        assertEquals("The user should have been in zero roles.", 0, secHandler.getRolePrincipals(uid1).size());
     }
     
    
+    /**
+     * @throws Exception
+     */
+    public void testRemoveRolePrincipalInGroup() throws Exception
+    {
+        secHandler.setRolePrincipalInGroup(gpUid1, ro1.getName());
+        secHandler.setRolePrincipalInGroup(gpUid1, ro2.getName());
+        assertEquals("The role should have been in two groups.", 2, secHandler.getRolePrincipalsInGroup(gpUid1).size());
+
+        secHandler.removeRolePrincipalInGroup(gpUid1,ro1.getName());
+        assertEquals("The role should have been in one group.", 1, secHandler.getRolePrincipalsInGroup(gpUid1).size());
+
+        secHandler.removeRolePrincipalInGroup(gpUid1, ro2.getName());
+        assertEquals("The role should have been in 0 roles.", 0, secHandler.getRolePrincipalsInGroup(gpUid1).size());
+    }
+    
 
     /**
      * @throws Exception

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupFilterBase.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupFilterBase.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupFilterBase.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipAttributes1.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipAttributes1.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipAttributes1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipAttributes2.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipAttributes2.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipAttributes2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipForRoleAttributes1.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipForRoleAttributes1.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipForRoleAttributes1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipForRoleAttributes2.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipForRoleAttributes2.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupMembershipForRoleAttributes2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupObjectClasses.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupObjectClasses.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/GroupObjectClasses.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/IdAttributes.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/IdAttributes.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/IdAttributes.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/ObjectFilterBase.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/ObjectFilterBase.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/ObjectFilterBase.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleFilterBase.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleFilterBase.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleFilterBase.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleGroupMembershipForRoleAttributes1.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleGroupMembershipForRoleAttributes1.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleGroupMembershipForRoleAttributes1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleGroupMembershipForRoleAttributes2.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleGroupMembershipForRoleAttributes2.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleGroupMembershipForRoleAttributes2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleMembershipAttributes1.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleMembershipAttributes1.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleMembershipAttributes1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleMembershipAttributes2.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleMembershipAttributes2.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleMembershipAttributes2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleObjectClasses.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleObjectClasses.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/RoleObjectClasses.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/UserFilterBase.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/UserFilterBase.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/UserFilterBase.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/UserGroupMembershipAttributes1.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/UserGroupMembershipAttributes1.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/UserGroupMembershipAttributes1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/UserGroupMembershipAttributes2.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/xdocs/images/ldap/UserGroupMembershipAttributes2.png?view=auto&rev=483771
==============================================================================
Binary file - no diff available.



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message