[jboss-identity-commits] JBoss Identity SVN: r1035 - in migration/idm/trunk: example/simple/src/test/resources and 6 other directories.

Author: bdaw Date: 2009-11-19 07:00:07 -0500 (Thu, 19 Nov 2009) New Revision: 1035 Added: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml Removed: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/dev44-msad.truststore migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml Modified: migration/idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml migration/idm/trunk/example/simple/src/test/resources/example-db-config.xml migration/idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml migration/idm/trunk/example/simple/src/test/resources/example-ldap-config.xml migration/idm/trunk/example/simple/src/test/resources/example-mixed-config.xml migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/AttributesType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/ObjectFactory.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/OptionsType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmsType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RelationshipsType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoriesType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoryType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/StoresType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/package-info.java migration/idm/trunk/picketlink-idm-core/src/test/resources/example-db-config.xml migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xml migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xsd migration/idm/trunk/picketlink-idm-core/src/test/resources/store-test-config.xml migration/idm/trunk/picketlink-idm-core/src/test/resources/test-config.xml migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/identity-config.xsd migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/store-test-config.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-local.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml Log: rename namespace and add MSAD 2k8 Modified: migration/idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml =================================================================== --- migration/idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentity</id> Modified: migration/idm/trunk/example/simple/src/test/resources/example-db-config.xml =================================================================== --- migration/idm/trunk/example/simple/src/test/resources/example-db-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/example/simple/src/test/resources/example-db-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentityExample/SampleRealm</id> Modified: migration/idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml =================================================================== --- migration/idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentityExample/SampleRealm</id> Modified: migration/idm/trunk/example/simple/src/test/resources/example-ldap-config.xml =================================================================== --- migration/idm/trunk/example/simple/src/test/resources/example-ldap-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/example/simple/src/test/resources/example-ldap-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentityExample/SampleRealm</id> Modified: migration/idm/trunk/example/simple/src/test/resources/example-mixed-config.xml =================================================================== --- migration/idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentityExample/SampleRealm</id> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/AttributesType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/AttributesType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/AttributesType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -25,7 +25,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="attribute" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="attribute" type="{urn:picketlink:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -32,7 +32,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="relationship" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="relationship" type="{urn:picketlink:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> @@ -54,7 +54,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="attribute" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="attribute" type="{urn:picketlink:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> @@ -65,7 +65,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> @@ -231,7 +231,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="attribute" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="attribute" type="{urn:picketlink:idm:config:v1_0_0_cr1}attributeType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> @@ -350,7 +350,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> @@ -409,7 +409,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="relationship" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="relationship" type="{urn:picketlink:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -25,8 +25,8 @@ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> * &lt;element name="identity-store-id" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="identity-object-types" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-object-typesType"/> - * &lt;element name="options" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionsType"/> + * &lt;element name="identity-object-types" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-object-typesType"/> + * &lt;element name="options" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionsType"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -26,7 +26,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="identity-store-mapping" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-store-mappingType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="identity-store-mapping" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-store-mappingType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -28,15 +28,15 @@ * &lt;sequence> * &lt;element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="class" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="external-config" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}external-configType"/> - * &lt;element name="supported-relationship-types" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}supported-relationship-typesType"/> - * &lt;element name="supported-identity-object-types" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}supported-identity-object-typesType"/> + * &lt;element name="external-config" type="{urn:picketlink:idm:config:v1_0_0_cr1}external-configType"/> + * &lt;element name="supported-relationship-types" type="{urn:picketlink:idm:config:v1_0_0_cr1}supported-relationship-typesType"/> + * &lt;element name="supported-identity-object-types" type="{urn:picketlink:idm:config:v1_0_0_cr1}supported-identity-object-typesType"/> * &lt;element name="options"> * &lt;complexType> * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> @@ -229,7 +229,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -26,7 +26,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="identity-store" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-storeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="identity-store" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-storeType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -27,7 +27,7 @@ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> * &lt;element name="identity-mapping" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="group-type-mapping" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}group-type-mappingType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="group-type-mapping" type="{urn:picketlink:idm:config:v1_0_0_cr1}group-type-mappingType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -24,9 +24,9 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="realms" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}realmsType"/> - * &lt;element name="repositories" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}repositoriesType"/> - * &lt;element name="stores" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}storesType"/> + * &lt;element name="realms" type="{urn:picketlink:idm:config:v1_0_0_cr1}realmsType"/> + * &lt;element name="repositories" type="{urn:picketlink:idm:config:v1_0_0_cr1}repositoriesType"/> + * &lt;element name="stores" type="{urn:picketlink:idm:config:v1_0_0_cr1}storesType"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/ObjectFactory.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/ObjectFactory.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/ObjectFactory.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -31,7 +31,7 @@ @XmlRegistry public class ObjectFactory { - private final static QName _JbossIdentity_QNAME = new QName("urn:jboss:identity:idm:config:v1_0_0_cr1", "jboss-identity"); + private final static QName _JbossIdentity_QNAME = new QName("urn:picketlink:idm:config:v1_0_0_cr1", "jboss-identity"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.picketlink.impl.configuration.jaxb2.generated @@ -276,7 +276,7 @@ * Create an instance of {@link JAXBElement }{@code <}{@link JbossIdentityType }{@code >}} * */ - @XmlElementDecl(namespace = "urn:jboss:identity:idm:config:v1_0_0_cr1", name = "jboss-identity") + @XmlElementDecl(namespace = "urn:picketlink:idm:config:v1_0_0_cr1", name = "jboss-identity") public JAXBElement<JbossIdentityType> createJbossIdentity(JbossIdentityType value) { return new JAXBElement<JbossIdentityType>(_JbossIdentity_QNAME, JbossIdentityType.class, null, value); } Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/OptionsType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/OptionsType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/OptionsType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -25,7 +25,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -26,8 +26,8 @@ * &lt;sequence> * &lt;element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="repository-id-ref" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="identity-type-mappings" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-type-mappingsType" minOccurs="0"/> - * &lt;element name="options" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionsType" minOccurs="0"/> + * &lt;element name="identity-type-mappings" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-type-mappingsType" minOccurs="0"/> + * &lt;element name="options" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionsType" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmsType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmsType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RealmsType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -25,7 +25,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="realm" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}realmType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="realm" type="{urn:picketlink:idm:config:v1_0_0_cr1}realmType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RelationshipsType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RelationshipsType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RelationshipsType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -25,7 +25,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="relationship" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="relationship" type="{urn:picketlink:idm:config:v1_0_0_cr1}relationshipType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoriesType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoriesType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoriesType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -25,7 +25,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="repository" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}repositoryType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="repository" type="{urn:picketlink:idm:config:v1_0_0_cr1}repositoryType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoryType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoryType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/RepositoryType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -26,11 +26,11 @@ * &lt;sequence> * &lt;element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="class" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="external-config" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}external-configType" minOccurs="0"/> + * &lt;element name="external-config" type="{urn:picketlink:idm:config:v1_0_0_cr1}external-configType" minOccurs="0"/> * &lt;element name="default-identity-store-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * &lt;element name="default-attribute-store-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * &lt;element name="identity-store-mappings" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-store-mappingsType" minOccurs="0"/> - * &lt;element name="options" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}optionsType" minOccurs="0"/> + * &lt;element name="identity-store-mappings" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-store-mappingsType" minOccurs="0"/> + * &lt;element name="options" type="{urn:picketlink:idm:config:v1_0_0_cr1}optionsType" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/StoresType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/StoresType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/StoresType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -25,7 +25,7 @@ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> * &lt;element name="attribute-stores" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="identity-stores" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-storesType"/> + * &lt;element name="identity-stores" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-storesType"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -26,7 +26,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="identity-object-type" type="{urn:jboss:identity:idm:config:v1_0_0_cr1}identity-object-typeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="identity-object-type" type="{urn:picketlink:idm:config:v1_0_0_cr1}identity-object-typeType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/package-info.java =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/package-info.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/generated/package-info.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -5,5 +5,5 @@ // Generated on: 2008.12.18 at 03:00:04 PM CET // -(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity:idm:config:v1_0_0_cr1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:picketlink:idm:config:v1_0_0_cr1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.picketlink.idm.impl.configuration.jaxb2.generated; Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/example-db-config.xml =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/test/resources/example-db-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/test/resources/example-db-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://Example/DB</id> Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xml =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id></id> Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xsd =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xsd 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/test/resources/identity-config.xsd 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" - targetNamespace="urn:jboss:identity:idm:config:v1_0_0_cr1" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="jboss-identity" type="urn:jboss-identityType" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"> + targetNamespace="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="jboss-identity" type="urn:jboss-identityType" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"> <xs:annotation> - <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... + <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... </xs:annotation> </xs:element> <xs:complexType name="identity-object-typesType"> @@ -16,13 +16,13 @@ <xs:element type="xs:string" name="id"/> <xs:element type="xs:string" name="class"/> <xs:element type="urn:external-configType" name="external-config" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="xs:string" name="default-identity-store-id" minOccurs="0"/> <xs:element type="xs:string" name="default-attribute-store-id" minOccurs="0"/> <xs:element type="urn:identity-store-mappingsType" name="identity-store-mappings" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="urn:optionsType" name="options" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="identity-storeType"> @@ -30,16 +30,16 @@ <xs:element type="xs:string" name="id"/> <xs:element type="xs:string" name="class"/> <xs:element type="urn:external-configType" name="external-config" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="urn:supported-relationship-typesType" name="supported-relationship-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="urn:supported-identity-object-typesType" name="supported-identity-object-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element name="options"> <xs:complexType> <xs:sequence> <xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> </xs:element> @@ -55,27 +55,27 @@ <xs:complexType name="identity-store-mappingsType"> <xs:sequence> <xs:element type="urn:identity-store-mappingType" name="identity-store-mapping" maxOccurs="unbounded" - minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + minOccurs="0" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="storesType"> <xs:sequence> <xs:element type="xs:string" name="attribute-stores"/> <xs:element type="urn:identity-storesType" name="identity-stores" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="jboss-identityType"> <xs:sequence> - <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> - <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> - <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> + <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> + <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="supported-identity-object-typesType"> <xs:sequence> <xs:element type="urn:identity-object-typeType" name="identity-object-type" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="optionType"> @@ -98,7 +98,7 @@ <xs:complexType name="repositoriesType"> <xs:sequence> <xs:element type="urn:repositoryType" name="repository" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="realmType"> @@ -106,28 +106,28 @@ <xs:element type="xs:string" name="id"/> <xs:element type="xs:string" name="repository-id-ref"/> <xs:element type="urn:identity-type-mappingsType" name="identity-type-mappings" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="urn:optionsType" name="options" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="relationshipsType"> <xs:sequence> <xs:element type="urn:relationshipType" name="relationship" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="realmsType"> <xs:sequence> <xs:element type="urn:realmType" name="realm" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="identity-type-mappingsType"> <xs:sequence> <xs:element type="xs:string" name="user-mapping"/> <xs:element type="urn:group-type-mappingType" name="group-type-mapping" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="supported-relationship-typesType"> @@ -138,21 +138,21 @@ <xs:complexType name="identity-storesType"> <xs:sequence> <xs:element type="urn:identity-storeType" name="identity-store" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="attributesType"> <xs:sequence> <xs:element type="urn:attributeType" name="attribute" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="identity-store-mappingType"> <xs:sequence> <xs:element type="xs:string" name="identity-store-id"/> <xs:element type="urn:identity-object-typesType" name="identity-object-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> - <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> + <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="relationshipType"> @@ -164,7 +164,7 @@ <xs:complexType name="optionsType"> <xs:sequence> <xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="identity-object-typeType"> @@ -174,7 +174,7 @@ <xs:complexType> <xs:sequence> <xs:element type="urn:relationshipType" name="relationship" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> </xs:element> @@ -189,7 +189,7 @@ <xs:complexType> <xs:sequence> <xs:element type="urn:attributeType" name="attribute" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> </xs:element> @@ -197,7 +197,7 @@ <xs:complexType> <xs:sequence> <xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> </xs:element> Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/store-test-config.xml =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/test/resources/store-test-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/test/resources/store-test-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://Dymmy</id> Modified: migration/idm/trunk/picketlink-idm-core/src/test/resources/test-config.xml =================================================================== --- migration/idm/trunk/picketlink-idm-core/src/test/resources/test-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-core/src/test/resources/test-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>Sample Ralm</id> Modified: migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml =================================================================== --- migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -603,9 +603,9 @@ <programlisting> <![CDATA[ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentityExample/SampleRealm</id> @@ -1686,9 +1686,9 @@ <programlisting> <![CDATA[ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://FlexibleRealm</id> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-19 12:00:07 UTC (rev 1035) @@ -1226,9 +1226,11 @@ } else { - q = hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNames).setCacheable(true);; + q = hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNames); } + q.setCacheable(true); + q.setParameter("realmName", getRealmName(ctx)); if (criteria != null && criteria.getFilter() != null) @@ -1296,9 +1298,10 @@ } else { - q = hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNamesForIdentityObject).setCacheable(true); + q = hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNamesForIdentityObject); } + q.setCacheable(true); q.setParameter("identityObject", hibernateObject); if (criteria != null && criteria.isPaged()) @@ -1343,7 +1346,7 @@ try { HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName) - .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult(); + .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).setCacheable(true).uniqueResult(); if (hiorn == null) { @@ -1374,7 +1377,7 @@ try { HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName) - .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult(); + .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).setCacheable(true).uniqueResult(); if (hiorn == null) { @@ -1403,7 +1406,7 @@ try { HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName) - .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult(); + .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).setCacheable(true).uniqueResult(); if (hiorn == null) { @@ -1438,7 +1441,7 @@ query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE) .setParameter("fromIO", fromIO) .setParameter("toIO", toIO) - .setParameter("typeName", type.getName()); + .setParameter("typeName", type.getName()).setCacheable(true); } else { Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/datasources/directories.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -113,10 +113,10 @@ <cleanup-dn>o=jbid,dc=my-domain,dc=com</cleanup-dn> </directory> <directory> - <directory-name>MSAD</directory-name> + <directory-name>MSAD-2k3</directory-name> <description>ldap://dev44.qa.atl.jboss.com:389</description> - <config-file>test-identity-config-msad.xml</config-file> + <config-file>test-identity-config-msad-2k3.xml</config-file> <host>dev44.qa.atl.jboss.com</host> <port>389</port> <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> @@ -128,6 +128,21 @@ <cleanup-dn>o=jbid,dc=jboss,dc=test</cleanup-dn> </directory> <directory> + <directory-name>MSAD-2k8</directory-name> + <description>ldap://vmg13.mw.lab.eng.bos.redhat.com:389</description> + + <config-file>test-identity-config-msad-2k8.xml</config-file> + <host>dev44.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>JBOSS0\jbossqa</admin-dn> + <admin-password>jboss42</admin-password> + + <populate-ldif>ldap/initial-empty-msad.ldif</populate-ldif> + + <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> Deleted: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/dev44-msad.truststore =================================================================== (Binary files differ) Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/identity-config.xsd =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/identity-config.xsd 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/identity-config.xsd 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" - targetNamespace="urn:jboss:identity:idm:config:v1_0_0_cr1" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="jboss-identity" type="urn:jboss-identityType" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"> + targetNamespace="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="jboss-identity" type="urn:jboss-identityType" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"> <xs:annotation> - <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... + <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... </xs:annotation> </xs:element> <xs:complexType name="identity-object-typesType"> @@ -16,13 +16,13 @@ <xs:element type="xs:string" name="id"/> <xs:element type="xs:string" name="class"/> <xs:element type="urn:external-configType" name="external-config" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="xs:string" name="default-identity-store-id" minOccurs="0"/> <xs:element type="xs:string" name="default-attribute-store-id" minOccurs="0"/> <xs:element type="urn:identity-store-mappingsType" name="identity-store-mappings" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="urn:optionsType" name="options" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="identity-storeType"> @@ -30,16 +30,16 @@ <xs:element type="xs:string" name="id"/> <xs:element type="xs:string" name="class"/> <xs:element type="urn:external-configType" name="external-config" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="urn:supported-relationship-typesType" name="supported-relationship-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="urn:supported-identity-object-typesType" name="supported-identity-object-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element name="options"> <xs:complexType> <xs:sequence> <xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> </xs:element> @@ -55,27 +55,27 @@ <xs:complexType name="identity-store-mappingsType"> <xs:sequence> <xs:element type="urn:identity-store-mappingType" name="identity-store-mapping" maxOccurs="unbounded" - minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + minOccurs="0" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="storesType"> <xs:sequence> <xs:element type="xs:string" name="attribute-stores"/> <xs:element type="urn:identity-storesType" name="identity-stores" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="jboss-identityType"> <xs:sequence> - <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> - <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> - <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> + <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> + <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="supported-identity-object-typesType"> <xs:sequence> <xs:element type="urn:identity-object-typeType" name="identity-object-type" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="optionType"> @@ -98,7 +98,7 @@ <xs:complexType name="repositoriesType"> <xs:sequence> <xs:element type="urn:repositoryType" name="repository" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="realmType"> @@ -106,28 +106,28 @@ <xs:element type="xs:string" name="id"/> <xs:element type="xs:string" name="repository-id-ref"/> <xs:element type="urn:identity-type-mappingsType" name="identity-type-mappings" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> <xs:element type="urn:optionsType" name="options" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="relationshipsType"> <xs:sequence> <xs:element type="urn:relationshipType" name="relationship" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="realmsType"> <xs:sequence> <xs:element type="urn:realmType" name="realm" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="identity-type-mappingsType"> <xs:sequence> <xs:element type="xs:string" name="user-mapping"/> <xs:element type="urn:group-type-mappingType" name="group-type-mapping" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="supported-relationship-typesType"> @@ -138,21 +138,21 @@ <xs:complexType name="identity-storesType"> <xs:sequence> <xs:element type="urn:identity-storeType" name="identity-store" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="attributesType"> <xs:sequence> <xs:element type="urn:attributeType" name="attribute" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="identity-store-mappingType"> <xs:sequence> <xs:element type="xs:string" name="identity-store-id"/> <xs:element type="urn:identity-object-typesType" name="identity-object-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> - <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> + <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="relationshipType"> @@ -164,7 +164,7 @@ <xs:complexType name="optionsType"> <xs:sequence> <xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> <xs:complexType name="identity-object-typeType"> @@ -174,7 +174,7 @@ <xs:complexType> <xs:sequence> <xs:element type="urn:relationshipType" name="relationship" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> </xs:element> @@ -189,7 +189,7 @@ <xs:complexType> <xs:sequence> <xs:element type="urn:attributeType" name="attribute" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> </xs:element> @@ -197,7 +197,7 @@ <xs:complexType> <xs:sequence> <xs:element type="urn:optionType" name="option" maxOccurs="unbounded" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_0_cr1"/> + xmlns:urn="urn:picketlink:idm:config:v1_0_0_cr1"/> </xs:sequence> </xs:complexType> </xs:element> Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://FlexibleRealm</id> Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/store-test-config.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/store-test-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/store-test-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://Dymmy</id> Copied: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml (from rev 1015, migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml) =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml (rev 0) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k3.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -0,0 +1,912 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 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.picketlink.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.picketlink.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.picketlink.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.providerClass</name> + <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value> + </option> + <option> + <name>cache.configFile</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.picketlink.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.providerClass</name> + <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value> + </option> + <option> + <name>cache.configFile</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.picketlink.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> + </relationships> + <credentials> + <credential-type>PASSWORD</credential-type> + <credential-type>BINARY</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.picketlink.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=jboss,dc=test</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>userAccountControl=514</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldaps://dev44.qa.atl.jboss.com:636</value> + </option> + <option> + <name>adminDN</name> + <value>JBOSS\jbossqa</value> + </option> + <option> + <name>adminPassword</name> + <value>jboss42</value> + </option> + <option> + <name>authenticationMethod</name> + <value>simple</value> + </option> + <!--<option>--> + <!--<name>customSystemProperties</name>--> + <!--<value>javax.net.ssl.trustStore=d:\Workshop\dev44-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 Added: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml (rev 0) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-2k8.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -0,0 +1,912 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 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.picketlink.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.picketlink.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.picketlink.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.providerClass</name> + <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value> + </option> + <option> + <name>cache.configFile</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.picketlink.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.providerClass</name> + <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value> + </option> + <option> + <name>cache.configFile</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.picketlink.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> + </relationships> + <credentials> + <credential-type>PASSWORD</credential-type> + <credential-type>BINARY</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.picketlink.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=jboss,dc=test</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>userAccountControl=514</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</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=jboss,dc=test</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> + <value>groupType=8</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldaps://vmg13.mw.lab.eng.bos.redhat.com:636</value> + </option> + <option> + <name>adminDN</name> + <value>JBOSS0\jbossqa</value> + </option> + <option> + <name>adminPassword</name> + <value>jboss42</value> + </option> + <option> + <name>authenticationMethod</name> + <value>simple</value> + </option> + <!--<option>--> + <!--<name>customSystemProperties</name>--> + <!--<value>javax.net.ssl.trustStore=d:\Workshop\vmg13-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: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-local.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-local.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad-local.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://RedHat/DB</id> @@ -911,7 +911,7 @@ </option> <option> <name>adminPassword</name> - <value>1q@W3e4r</value> + <value>1q@W3e4r<4/value> </option> <option> <name>authenticationMethod</name> Deleted: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-msad.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,912 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 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.picketlink.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.picketlink.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.picketlink.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.providerClass</name> - <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value> - </option> - <option> - <name>cache.configFile</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.picketlink.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.providerClass</name> - <value>org.picketlink.idm.impl.cache.JBossCacheIdentityStoreCacheProviderImpl</value> - </option> - <option> - <name>cache.configFile</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.picketlink.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> - </relationships> - <credentials> - <credential-type>PASSWORD</credential-type> - <credential-type>BINARY</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.picketlink.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=jboss,dc=test</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>userAccountControl=514</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=jboss,dc=test</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> - <value>groupType=8</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=jboss,dc=test</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> - <value>groupType=8</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=jboss,dc=test</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> - <value>groupType=8</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=jboss,dc=test</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> - <value>groupType=8</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=jboss,dc=test</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> - <value>groupType=8</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=jboss,dc=test</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> - <value>groupType=8</value> - </option> - </options> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>providerURL</name> - <value>ldaps://dev44.qa.atl.jboss.com:636</value> - </option> - <option> - <name>adminDN</name> - <value>JBOSS\jbossqa</value> - </option> - <option> - <name>adminPassword</name> - <value>jboss42</value> - </option> - <option> - <name>authenticationMethod</name> - <value>simple</value> - </option> - <!--<option>--> - <!--<name>customSystemProperties</name>--> - <!--<value>javax.net.ssl.trustStore=d:\Workshop\dev44-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: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends12.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://RedHat/DB</id> Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-opends20.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://RedHat/DB</id> Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://RedHat/DB</id> Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-redhatds.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://RedHat/DB</id> Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-sunds.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://RedHat/DB</id> Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml 2009-11-19 10:48:12 UTC (rev 1034) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config.xml 2009-11-19 12:00:07 UTC (rev 1035) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> <realms> <realm> <id>realm://RedHat/DB</id>