Author: bdaw Date: 2009-08-07 19:09:26 -0400 (Fri, 07 Aug 2009) New Revision: 682 Added: idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-msad-local.ldif idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad-local.xml Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/directories.xml idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-msad.ldif idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml Log: MSAD test configuration fix Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/directories.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/datasources/directories.xml 2009-08-07 22:56:43 UTC (rev 681) +++ idm/trunk/idm-testsuite/src/test/resources/datasources/directories.xml 2009-08-07 23:09:26 UTC (rev 682) @@ -84,7 +84,7 @@ </directory> <directory> <directory-name>MSAD</directory-name> - <description>Microsoft Active Directory in QA Labs (need vpn access)</description> + <description>ldap://dev44.qa.atl.jboss.com:389</description> <config-file>test-identity-config-msad.xml</config-file> <host>dev44.qa.atl.jboss.com</host> @@ -95,20 +95,20 @@ <populate-ldif>ldap/initial-empty-msad.ldif</populate-ldif> - <cleanup-dn>o=jbid,dc=test,dc=domain</cleanup-dn> + <cleanup-dn>o=jbid,dc=jboss,dc=test</cleanup-dn> </directory> <directory> <directory-name>MSAD-local</directory-name> <description>ldap://192.168.56.101:389</description> - <config-file>test-identity-config-msad.xml</config-file> + <config-file>test-identity-config-msad-local.xml</config-file> <host>192.168.56.101</host> <port>389</port> <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> <admin-dn>TEST\Administrator</admin-dn> <admin-password>!Q2w3e4r</admin-password> - <populate-ldif>ldap/initial-empty-msad.ldif</populate-ldif> + <populate-ldif>ldap/initial-empty-msad-local.ldif</populate-ldif> <cleanup-dn>o=jbid,dc=test,dc=domain</cleanup-dn> </directory> Copied: idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-msad-local.ldif (from rev 681, idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-msad.ldif) =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-msad-local.ldif (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-msad-local.ldif 2009-08-07 23:09:26 UTC (rev 682) @@ -0,0 +1,55 @@ +dn: o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organization +o: jbid + +dn: ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: idm + +dn: ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: trunk + +dn: ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: test + +dn: ou=People,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: ou=Roles,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: Roles + +dn: ou=Groups,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: Groups + +dn: ou=Organizations,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: Organizations + +dn: ou=OrganizationUnits,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: OrganizationUnits + +dn: ou=Departments,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: Departments + +dn: ou=Offices,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +objectclass: top +objectclass: organizationalUnit +ou: Offices + Modified: idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-msad.ldif =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-msad.ldif 2009-08-07 22:56:43 UTC (rev 681) +++ idm/trunk/idm-testsuite/src/test/resources/ldap/initial-empty-msad.ldif 2009-08-07 23:09:26 UTC (rev 682) @@ -1,54 +1,54 @@ -dn: o=jbid,dc=test,dc=domain +dn: o=jbid,dc=jboss,dc=test objectclass: top objectclass: organization o: jbid -dn: ou=idm,o=jbid,dc=test,dc=domain +dn: ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: idm -dn: ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +dn: ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: trunk -dn: ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +dn: ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: test -dn: ou=People,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +dn: ou=People,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: People -dn: ou=Roles,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +dn: ou=Roles,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: Roles -dn: ou=Groups,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +dn: ou=Groups,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: Groups -dn: ou=Organizations,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +dn: ou=Organizations,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: Organizations -dn: ou=OrganizationUnits,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +dn: ou=OrganizationUnits,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: OrganizationUnits -dn: ou=Departments,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +dn: ou=Departments,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: Departments -dn: ou=Offices,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain +dn: ou=Offices,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test objectclass: top objectclass: organizationalUnit ou: Offices Copied: idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad-local.xml (from rev 681, idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml) =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad-local.xml (rev 0) +++ idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad-local.xml 2009-08-07 23:09:26 UTC (rev 682) @@ -0,0 +1,931 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> + <realms> + <realm> + <id>realm://RedHat/DB</id> + <repository-id-ref>RedHat Repository DB</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://portal/SamplePortal/DB</id> + <repository-id-ref>Sample Portal Repository DB</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://RedHat/DB_LDAP</id> + <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://portal/SamplePortal/DB_LDAP</id> + <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>RedHat Repository DB</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>Sample Portal Repository DB</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>RedHat Repository DB+LDAP</id> + <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>Hibernate Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>DIVISION</identity-object-type> + <identity-object-type>PROJECT</identity-object-type> + <identity-object-type>PEOPLE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + <identity-store-mapping> + <identity-store-id>LDAP Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>ORGANIZATION</identity-object-type> + <identity-object-type>ORGANIZATION_UNIT</identity-object-type> + <identity-object-type>DEPARTMENT</identity-object-type> + </identity-object-types> + <options> + <option> + <name>cache</name> + <value>false</value> + </option> + <option> + <name>cache.provider.class</name> + <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheProviderImpl</value> + </option> + <option> + <name>cache.config-file</name> + <value>jboss-cache-config.xml</value> + </option> + </options> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>Sample Portal Repository DB+LDAP</id> + <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>Hibernate Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>SYSTEM</identity-object-type> + <identity-object-type>ADMINISTRATION</identity-object-type> + <identity-object-type>COMMUNITY</identity-object-type> + <identity-object-type>DIVISION</identity-object-type> + <identity-object-type>SECURITY</identity-object-type> + <identity-object-type>PEOPLE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + <identity-store-mapping> + <identity-store-id>LDAP Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>DEPARTMENT</identity-object-type> + <identity-object-type>ORGANIZATION</identity-object-type> + <identity-object-type>ORGANIZATION_UNIT</identity-object-type> + <identity-object-type>OFFICE</identity-object-type> + </identity-object-types> + <options> + <option> + <name>cache</name> + <value>false</value> + </option> + <option> + <name>cache.provider.class</name> + <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheProviderImpl</value> + </option> + <option> + <name>cache.config-file</name> + <value>jboss-cache-config.xml</value> + </option> + </options> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>Hibernate Identity Store</id> + <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships> + <!--<relationship>--> + <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> + <!--<identity-object-type-ref>ORGANIZATION</identity-object-type-ref>--> + <!--</relationship>--> + <!--<relationship>--> + <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> + <!--<identity-object-type-ref>COMMUNITY</identity-object-type-ref>--> + <!--</relationship>--> + <!--<relationship>--> + <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> + <!--<identity-object-type-ref>OFFICE</identity-object-type-ref>--> + <!--</relationship>--> + <!--<relationship>--> + <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> + <!--<identity-object-type-ref>SECURITY</identity-object-type-ref>--> + <!--</relationship>--> + <!--<relationship>--> + <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> + <!--<identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>--> + <!--</relationship>--> + <!--<relationship>--> + <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> + <!--<identity-object-type-ref>PROJECT</identity-object-type-ref>--> + <!--</relationship>--> + <!--<relationship>--> + <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> + <!--<identity-object-type-ref>PEOPLE</identity-object-type-ref>--> + <!--</relationship>--> + </relationships> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes> + <attribute> + <name>picture</name> + <mapping>user.picture</mapping> + <type>binary</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + <attribute> + <name>email</name> + <mapping>mail</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + <isUnique>true</isUnique> + </attribute> + </attributes> + <options/> + </identity-object-type> + <identity-object-type> + <name>ORGANIZATION</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DIVISION</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>ORGANIZATION_UNIT</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DIVISION</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>OFFICE</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>PEOPLE</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>PROJECT</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>DIVISION</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>DEPARTMENT</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>PROJECT</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>PEOPLE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>ADMINISTRATION</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>COMMUNITY</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>OFFICE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>SECURITY</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>SYSTEM</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>SECURITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>COMMUNITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <!--<option>--> + <!--<name>hibernateConfiguration</name>--> + <!--<value>hibernate-jboss-identity.cfg.xml</value>--> + <!--</option>--> + <option> + <name>hibernateSessionFactoryJNDIName</name> + <value>java:/jbossidentity/HibernateStoreSessionFactory</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </identity-store> + <identity-store> + <id>LDAP Identity Store</id> + <class>org.jboss.identity.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes> + <attribute> + <name>phone</name> + <mapping>telephoneNumber</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + <attribute> + <name>description</name> + <mapping>description</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + <attribute> + <name>carLicense</name> + <mapping>carLicense</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + <attribute> + <name>email</name> + <mapping>mail</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + <isUnique>true</isUnique> + </attribute> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>passwordAttributeName</name> + <value>unicodePwd</value> + </option> + <option> + <name>enclosePasswordWith</name> + <value>"</value> + </option> + <option> + <name>passwordEncoding</name> + <value>UTF-16LE</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=People,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + </option> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=inetOrgPerson</value> + <value>sn= </value> + <!--<value>cn= </value>--> + </option> + <option> + <name>passwordUpdateAttributeValues</name> + <value>userAccountControl=512</value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>ORGANIZATION</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>OFFICE</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=Organizations,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + </option> + <!--<option>--> + <!--<name>entrySearchFilter</name>--> + <!--<value></value>--> + <!--</option>--> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=group</value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>ORGANIZATION_UNIT</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>OFFICE</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=OrganizationUnits,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + </option> + <!--<option>--> + <!--<name>entrySearchFilter</name>--> + <!--<value></value>--> + <!--</option>--> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=group</value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>DEPARTMENT</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=Departments,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + </option> + <!--<option>--> + <!--<name>entrySearchFilter</name>--> + <!--<value></value>--> + <!--</option>--> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=group</value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>OFFICE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=Offices,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + </option> + <!--<option>--> + <!--<name>entrySearchFilter</name>--> + <!--<value></value>--> + <!--</option>--> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=group</value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>GROUP</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=Groups,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + </option> + <!--<option>--> + <!--<name>entrySearchFilter</name>--> + <!--<value></value>--> + <!--</option>--> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=group</value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>ROLE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=Roles,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + </option> + <!--<option>--> + <!--<name>entrySearchFilter</name>--> + <!--<value></value>--> + <!--</option>--> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=group</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldap://192.168.56.101:636</value> + </option> + <option> + <name>adminDN</name> + <value>TEST\Administrator</value> + </option> + <option> + <name>adminPassword</name> + <value>!Q2w3e4r</value> + </option> + <option> + <name>customJNDIConnectionParameters</name> + <value>java.naming.security.protocol=ssl</value> + </option> + <option> + <name>customSystemProperties</name> + <value>javax.net.ssl.trustStore=d:\Workshop\msad.truststore</value> + <value>javax.net.ssl.trustStorePassword=password</value> + </option> + <option> + <name>searchTimeLimit</name> + <value>10000</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> +</jboss-identity> \ No newline at end of file Modified: idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-08-07 22:56:43 UTC (rev 681) +++ idm/trunk/idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-08-07 23:09:26 UTC (rev 682) @@ -566,7 +566,7 @@ </option> <option> <name>ctxDNs</name> - <value>ou=People,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + <value>ou=People,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value> </option> <option> <name>allowCreateEntry</name> @@ -618,7 +618,7 @@ </option> <option> <name>ctxDNs</name> - <value>ou=Organizations,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + <value>ou=Organizations,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value> </option> <!--<option>--> <!--<name>entrySearchFilter</name>--> @@ -676,7 +676,7 @@ </option> <option> <name>ctxDNs</name> - <value>ou=OrganizationUnits,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + <value>ou=OrganizationUnits,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value> </option> <!--<option>--> <!--<name>entrySearchFilter</name>--> @@ -730,7 +730,7 @@ </option> <option> <name>ctxDNs</name> - <value>ou=Departments,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + <value>ou=Departments,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value> </option> <!--<option>--> <!--<name>entrySearchFilter</name>--> @@ -776,7 +776,7 @@ </option> <option> <name>ctxDNs</name> - <value>ou=Offices,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + <value>ou=Offices,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value> </option> <!--<option>--> <!--<name>entrySearchFilter</name>--> @@ -822,7 +822,7 @@ </option> <option> <name>ctxDNs</name> - <value>ou=Groups,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + <value>ou=Groups,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value> </option> <!--<option>--> <!--<name>entrySearchFilter</name>--> @@ -868,7 +868,7 @@ </option> <option> <name>ctxDNs</name> - <value>ou=Roles,ou=test,ou=trunk,ou=idm,o=jbid,dc=test,dc=domain</value> + <value>ou=Roles,ou=test,ou=trunk,ou=idm,o=jbid,dc=jboss,dc=test</value> </option> <!--<option>--> <!--<name>entrySearchFilter</name>--> @@ -901,26 +901,26 @@ <options> <option> <name>providerURL</name> - <value>ldap://192.168.56.101:636</value> + <value>ldap://dev44.qa.atl.jboss.com:389</value> </option> <option> <name>adminDN</name> - <value>TEST\Administrator</value> + <value>JBOSS\jbossqa</value> </option> <option> <name>adminPassword</name> - <value>!Q2w3e4r</value> + <value>jboss42</value> </option> + <!--<option>--> + <!--<name>customJNDIConnectionParameters</name>--> + <!--<value>java.naming.security.protocol=ssl</value>--> + <!--</option>--> + <!--<option>--> + <!--<name>customSystemProperties</name>--> + <!--<value>javax.net.ssl.trustStore=d:\Workshop\msad.truststore</value>--> + <!--<value>javax.net.ssl.trustStorePassword=password</value>--> + <!--</option>--> <option> - <name>customJNDIConnectionParameters</name> - <value>java.naming.security.protocol=ssl</value> - </option> - <option> - <name>customSystemProperties</name> - <value>javax.net.ssl.trustStore=d:\Workshop\msad.truststore</value> - <value>javax.net.ssl.trustStorePassword=password</value> - </option> - <option> <name>searchTimeLimit</name> <value>10000</value> </option>