Author: jeff.yuchang Date: 2009-06-23 05:33:03 -0400 (Tue, 23 Jun 2009) New Revision: 624 Removed: idm/trunk/example/simple/src/test/resources/identity-config.xsd Modified: idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml idm/trunk/example/simple/src/test/resources/example-db-config.xml idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml idm/trunk/example/simple/src/test/resources/example-ldap-config.xml idm/trunk/example/simple/src/test/resources/example-mixed-config.xml idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/AttributesType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/ObjectFactory.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/OptionsType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RealmType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RealmsType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RelationshipsType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RepositoriesType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RepositoryType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/StoresType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/package-info.java idm/trunk/idm-core/src/test/resources/example-db-config.xml idm/trunk/idm-core/src/test/resources/identity-config.xml idm/trunk/idm-core/src/test/resources/identity-config.xsd idm/trunk/idm-core/src/test/resources/store-test-config.xml idm/trunk/idm-core/src/test/resources/test-config.xml idm/trunk/idm-testsuite/src/test/resources/identity-config.xsd idm/trunk/idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml idm/trunk/idm-testsuite/src/test/resources/store-test-config.xml idm/trunk/idm-testsuite/src/test/resources/test-identity-config.xml idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/InitializerType.java idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/ObjectFactory.java idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/OptionsType.java idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/package-info.java idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml Log: * Update the configuration xsd namespace, from alpha to beta. Modified: idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml =================================================================== --- idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/example/auth/src/main/resources/jboss.idm.cfg.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentity</id> Modified: idm/trunk/example/simple/src/test/resources/example-db-config.xml =================================================================== --- idm/trunk/example/simple/src/test/resources/example-db-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/example/simple/src/test/resources/example-db-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentityExample/SampleRealm</id> Modified: idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml =================================================================== --- idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/example/simple/src/test/resources/example-db-inject-sf-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentityExample/SampleRealm</id> Modified: idm/trunk/example/simple/src/test/resources/example-ldap-config.xml =================================================================== --- idm/trunk/example/simple/src/test/resources/example-ldap-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/example/simple/src/test/resources/example-ldap-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentityExample/SampleRealm</id> Modified: idm/trunk/example/simple/src/test/resources/example-mixed-config.xml =================================================================== --- idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentityExample/SampleRealm</id> Deleted: idm/trunk/example/simple/src/test/resources/identity-config.xsd =================================================================== --- idm/trunk/example/simple/src/test/resources/identity-config.xsd 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/example/simple/src/test/resources/identity-config.xsd 2009-06-23 09:33:03 UTC (rev 624) @@ -1,208 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:jboss:identity:idm:config:v1_0_alpha" 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_alpha"> - <xs:annotation> - <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... - </xs:annotation> - </xs:element> - <xs:complexType name="identity-object-typesType"> - <xs:sequence> - <xs:element type="xs:string" name="identity-object-type" maxOccurs="unbounded" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="repositoryType"> - <xs:sequence> - <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_alpha"/> - <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_alpha"/> - <xs:element type="urn:optionsType" name="options" minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="identity-storeType"> - <xs:sequence> - <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_alpha"/> - <xs:element type="urn:supported-relationship-typesType" name="supported-relationship-types" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - <xs:element type="urn:supported-identity-object-typesType" name="supported-identity-object-types" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - <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_alpha"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="external-configType"> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute type="xs:string" name="override" use="optional"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - <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_alpha"/> - </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_alpha"/> - </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_alpha"/> - <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - </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_alpha"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="optionType"> - <xs:sequence> - <xs:element type="xs:string" name="name"/> - <xs:element type="xs:string" name="value" maxOccurs="unbounded" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="group-type-mappingType"> - <xs:sequence> - <xs:element type="xs:string" name="group-type-name"/> - <xs:element type="xs:string" name="identity-object-type-name"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="credentialsType"> - <xs:sequence> - <xs:element type="xs:string" name="credential-type" maxOccurs="unbounded" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - <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_alpha"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="realmType"> - <xs:sequence> - <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_alpha"/> - <xs:element type="urn:optionsType" name="options" minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - </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_alpha"/> - </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_alpha"/> - </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_alpha"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="supported-relationship-typesType"> - <xs:sequence> - <xs:element type="xs:string" name="relationship-type" maxOccurs="unbounded" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - <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_alpha"/> - </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_alpha"/> - </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_alpha"/> - <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="relationshipType"> - <xs:sequence> - <xs:element type="xs:string" name="relationship-type-ref"/> - <xs:element type="xs:string" name="identity-object-type-ref"/> - </xs:sequence> - </xs:complexType> - <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_alpha"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="identity-object-typeType"> - <xs:sequence> - <xs:element type="xs:string" name="name"/> - <xs:element name="relationships"> - <xs:complexType> - <xs:sequence> - <xs:element type="urn:relationshipType" name="relationship" maxOccurs="unbounded" minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="credentials"> - <xs:complexType> - <xs:sequence> - <xs:element type="xs:string" name="credential-type" maxOccurs="unbounded" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="attributes"> - <xs:complexType> - <xs:sequence> - <xs:element type="urn:attributeType" name="attribute" maxOccurs="unbounded" minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <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_alpha"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="attributeType"> - <xs:sequence> - <xs:element type="xs:string" name="name"/> - <xs:element type="xs:string" name="mapping"/> - <xs:element type="xs:string" name="type"/> - <xs:element name="isRequired"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value=""/> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="isMultivalued"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value=""/> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element type="xs:string" name="isReadOnly" minOccurs="0"/> - </xs:sequence> - </xs:complexType> -</xs:schema> \ No newline at end of file Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/AttributesType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/AttributesType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/AttributesType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}attributeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="attribute" type="{urn:jboss:identity:idm:config:v1_0_beta}attributeType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityObjectTypeType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}relationshipType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="relationship" type="{urn:jboss:identity:idm:config:v1_0_beta}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_alpha}attributeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="attribute" type="{urn:jboss:identity:idm:config:v1_0_beta}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_alpha}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_beta}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_alpha}attributeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="attribute" type="{urn:jboss:identity:idm:config:v1_0_beta}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_alpha}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_beta}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_alpha}relationshipType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="relationship" type="{urn:jboss:identity:idm:config:v1_0_beta}relationshipType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}identity-object-typesType"/> - * &lt;element name="options" type="{urn:jboss:identity:idm:config:v1_0_alpha}optionsType"/> + * &lt;element name="identity-object-types" type="{urn:jboss:identity:idm:config:v1_0_beta}identity-object-typesType"/> + * &lt;element name="options" type="{urn:jboss:identity:idm:config:v1_0_beta}optionsType"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreMappingsType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}identity-store-mappingType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="identity-store-mapping" type="{urn:jboss:identity:idm:config:v1_0_beta}identity-store-mappingType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoreType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}external-configType"/> - * &lt;element name="supported-relationship-types" type="{urn:jboss:identity:idm:config:v1_0_alpha}supported-relationship-typesType"/> - * &lt;element name="supported-identity-object-types" type="{urn:jboss:identity:idm:config:v1_0_alpha}supported-identity-object-typesType"/> + * &lt;element name="external-config" type="{urn:jboss:identity:idm:config:v1_0_beta}external-configType"/> + * &lt;element name="supported-relationship-types" type="{urn:jboss:identity:idm:config:v1_0_beta}supported-relationship-typesType"/> + * &lt;element name="supported-identity-object-types" type="{urn:jboss:identity:idm:config:v1_0_beta}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_alpha}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_beta}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_alpha}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_beta}optionType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityStoresType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}identity-storeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="identity-store" type="{urn:jboss:identity:idm:config:v1_0_beta}identity-storeType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/IdentityTypeMappingsType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}group-type-mappingType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="group-type-mapping" type="{urn:jboss:identity:idm:config:v1_0_beta}group-type-mappingType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/JbossIdentityType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}realmsType"/> - * &lt;element name="repositories" type="{urn:jboss:identity:idm:config:v1_0_alpha}repositoriesType"/> - * &lt;element name="stores" type="{urn:jboss:identity:idm:config:v1_0_alpha}storesType"/> + * &lt;element name="realms" type="{urn:jboss:identity:idm:config:v1_0_beta}realmsType"/> + * &lt;element name="repositories" type="{urn:jboss:identity:idm:config:v1_0_beta}repositoriesType"/> + * &lt;element name="stores" type="{urn:jboss:identity:idm:config:v1_0_beta}storesType"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/ObjectFactory.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/ObjectFactory.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/ObjectFactory.java 2009-06-23 09:33:03 UTC (rev 624) @@ -31,7 +31,7 @@ @XmlRegistry public class ObjectFactory { - private final static QName _JbossIdentity_QNAME = new QName("urn:jboss:identity:idm:config:v1_0_alpha", "jboss-identity"); + private final static QName _JbossIdentity_QNAME = new QName("urn:jboss:identity:idm:config:v1_0_beta", "jboss-identity"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.identity.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_alpha", name = "jboss-identity") + @XmlElementDecl(namespace = "urn:jboss:identity:idm:config:v1_0_beta", name = "jboss-identity") public JAXBElement<JbossIdentityType> createJbossIdentity(JbossIdentityType value) { return new JAXBElement<JbossIdentityType>(_JbossIdentity_QNAME, JbossIdentityType.class, null, value); } Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/OptionsType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/OptionsType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/OptionsType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}optionType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="option" type="{urn:jboss:identity:idm:config:v1_0_beta}optionType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RealmType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RealmType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RealmType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}identity-type-mappingsType" minOccurs="0"/> - * &lt;element name="options" type="{urn:jboss:identity:idm:config:v1_0_alpha}optionsType" minOccurs="0"/> + * &lt;element name="identity-type-mappings" type="{urn:jboss:identity:idm:config:v1_0_beta}identity-type-mappingsType" minOccurs="0"/> + * &lt;element name="options" type="{urn:jboss:identity:idm:config:v1_0_beta}optionsType" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RealmsType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RealmsType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RealmsType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}realmType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="realm" type="{urn:jboss:identity:idm:config:v1_0_beta}realmType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RelationshipsType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RelationshipsType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RelationshipsType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}relationshipType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="relationship" type="{urn:jboss:identity:idm:config:v1_0_beta}relationshipType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RepositoriesType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RepositoriesType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RepositoriesType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}repositoryType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="repository" type="{urn:jboss:identity:idm:config:v1_0_beta}repositoryType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RepositoryType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RepositoryType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/RepositoryType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}external-configType" minOccurs="0"/> + * &lt;element name="external-config" type="{urn:jboss:identity:idm:config:v1_0_beta}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_alpha}identity-store-mappingsType" minOccurs="0"/> - * &lt;element name="options" type="{urn:jboss:identity:idm:config:v1_0_alpha}optionsType" minOccurs="0"/> + * &lt;element name="identity-store-mappings" type="{urn:jboss:identity:idm:config:v1_0_beta}identity-store-mappingsType" minOccurs="0"/> + * &lt;element name="options" type="{urn:jboss:identity:idm:config:v1_0_beta}optionsType" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/StoresType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/StoresType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/StoresType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}identity-storesType"/> + * &lt;element name="identity-stores" type="{urn:jboss:identity:idm:config:v1_0_beta}identity-storesType"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/SupportedIdentityObjectTypesType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha}identity-object-typeType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="identity-object-type" type="{urn:jboss:identity:idm:config:v1_0_beta}identity-object-typeType" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/package-info.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/package-info.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/package-info.java 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity:idm:config:v1_0_beta", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.jboss.identity.idm.impl.configuration.jaxb2.generated; Modified: idm/trunk/idm-core/src/test/resources/example-db-config.xml =================================================================== --- idm/trunk/idm-core/src/test/resources/example-db-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/test/resources/example-db-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://Example/DB</id> Modified: idm/trunk/idm-core/src/test/resources/identity-config.xml =================================================================== --- idm/trunk/idm-core/src/test/resources/identity-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/test/resources/identity-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,17 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--<xs:schema--> -<!--attributeFormDefault="unqualified"--> -<!--elementFormDefault="qualified"--> -<!--xmlns:xs="http://www.w3.org/2001/XMLSchema"--> -<!--targetNamespace="urn:jboss:identity:idm:config:v1_0_alpha"--> -<!--xmlns="urn:jboss:identity:idm:config:v1_0_alpha"--> -<!--xmlns:xml="http://www.w3.org/XML/1998/namespace"--> -<!--xmlns:wcc="urn:jboss:identity:idm:config:v1_0_alpha"> --> - -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id></id> Modified: idm/trunk/idm-core/src/test/resources/identity-config.xsd =================================================================== --- idm/trunk/idm-core/src/test/resources/identity-config.xsd 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/test/resources/identity-config.xsd 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha" 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_alpha"> + targetNamespace="urn:jboss:identity:idm:config:v1_0_beta" 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_beta"> <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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <xs:element type="urn:optionsType" name="options" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <xs:element type="urn:supported-relationship-typesType" name="supported-relationship-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <xs:element type="urn:supported-identity-object-typesType" name="supported-identity-object-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> - <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> + <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> + <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <xs:element type="urn:optionsType" name="options" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> - <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> + <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </xs:sequence> </xs:complexType> </xs:element> Modified: idm/trunk/idm-core/src/test/resources/store-test-config.xml =================================================================== --- idm/trunk/idm-core/src/test/resources/store-test-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/test/resources/store-test-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://Dymmy</id> Modified: idm/trunk/idm-core/src/test/resources/test-config.xml =================================================================== --- idm/trunk/idm-core/src/test/resources/test-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-core/src/test/resources/test-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>Sample Ralm</id> Modified: idm/trunk/idm-testsuite/src/test/resources/identity-config.xsd =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/identity-config.xsd 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-testsuite/src/test/resources/identity-config.xsd 2009-06-23 09:33:03 UTC (rev 624) @@ -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_alpha" 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_alpha"> + targetNamespace="urn:jboss:identity:idm:config:v1_0_beta" 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_beta"> <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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <xs:element type="urn:optionsType" name="options" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <xs:element type="urn:supported-relationship-typesType" name="supported-relationship-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <xs:element type="urn:supported-identity-object-typesType" name="supported-identity-object-types" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + minOccurs="0" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> - <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> - <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + <xs:element type="urn:realmsType" name="realms" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> + <xs:element type="urn:repositoriesType" name="repositories" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> + <xs:element type="urn:storesType" name="stores" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> <xs:element type="urn:optionsType" name="options" minOccurs="0" - xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> - <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:jboss:identity:idm:config:v1_0_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> + <xs:element type="urn:optionsType" name="options" xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </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_alpha"/> + xmlns:urn="urn:jboss:identity:idm:config:v1_0_beta"/> </xs:sequence> </xs:complexType> </xs:element> Modified: idm/trunk/idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-testsuite/src/test/resources/minimal-flexible-identity-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://FlexibleRealm</id> Modified: idm/trunk/idm-testsuite/src/test/resources/store-test-config.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/store-test-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-testsuite/src/test/resources/store-test-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://Dymmy</id> Modified: idm/trunk/idm-testsuite/src/test/resources/test-identity-config.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/test-identity-config.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/idm-testsuite/src/test/resources/test-identity-config.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://RedHat/DB</id> Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/InitializerType.java =================================================================== --- idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/InitializerType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/InitializerType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -26,8 +26,8 @@ * &lt;sequence> * &lt;element name="datasource" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;choice> - * &lt;element name="sqlInitializer" type="{urn:jboss:identity:idm:deployer:v1_0_alpha}sqlInitializerType"/> - * &lt;element name="hibernateInitializer" type="{urn:jboss:identity:idm:deployer:v1_0_alpha}hibernateInitializerType"/> + * &lt;element name="sqlInitializer" type="{urn:jboss:identity:idm:deployer:v1_0_beta}sqlInitializerType"/> + * &lt;element name="hibernateInitializer" type="{urn:jboss:identity:idm:deployer:v1_0_beta}hibernateInitializerType"/> * &lt;/choice> * &lt;/sequence> * &lt;/restriction> Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java =================================================================== --- idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -28,9 +28,9 @@ * &lt;sequence> * &lt;element name="JNDIName" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="idmConfigFile" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="hibernateDeployer" type="{urn:jboss:identity:idm:deployer:v1_0_alpha}hibernateDeployerType" minOccurs="0"/> - * &lt;element name="initializers" type="{urn:jboss:identity:idm:deployer:v1_0_alpha}initializerType" minOccurs="0"/> - * &lt;element name="options" type="{urn:jboss:identity:idm:deployer:v1_0_alpha}optionsType" minOccurs="0"/> + * &lt;element name="hibernateDeployer" type="{urn:jboss:identity:idm:deployer:v1_0_beta}hibernateDeployerType" minOccurs="0"/> + * &lt;element name="initializers" type="{urn:jboss:identity:idm:deployer:v1_0_beta}initializerType" minOccurs="0"/> + * &lt;element name="options" type="{urn:jboss:identity:idm:deployer:v1_0_beta}optionsType" minOccurs="0"/> * &lt;element name="depends" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/ObjectFactory.java =================================================================== --- idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-06-23 09:33:03 UTC (rev 624) @@ -31,7 +31,7 @@ @XmlRegistry public class ObjectFactory { - private final static QName _JbossIdmDeployer_QNAME = new QName("urn:jboss:identity:idm:deployer:v1_0_alpha", "jboss-idm-deployer"); + private final static QName _JbossIdmDeployer_QNAME = new QName("urn:jboss:identity:idm:deployer:v1_0_beta", "jboss-idm-deployer"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.identity.idm.integration.jboss5.jaxb2 @@ -100,7 +100,7 @@ * Create an instance of {@link JAXBElement }{@code <}{@link JbossIDMDeployerType }{@code >}} * */ - @XmlElementDecl(namespace = "urn:jboss:identity:idm:deployer:v1_0_alpha", name = "jboss-idm-deployer") + @XmlElementDecl(namespace = "urn:jboss:identity:idm:deployer:v1_0_beta", name = "jboss-idm-deployer") public JAXBElement<JbossIDMDeployerType> createJbossIdmDeployer(JbossIDMDeployerType value) { return new JAXBElement<JbossIDMDeployerType>(_JbossIdmDeployer_QNAME, JbossIDMDeployerType.class, null, value); } Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/OptionsType.java =================================================================== --- idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/OptionsType.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/OptionsType.java 2009-06-23 09:33:03 UTC (rev 624) @@ -26,7 +26,7 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="option" type="{urn:jboss:identity:idm:deployer:v1_0_alpha}optionType" maxOccurs="unbounded"/> + * &lt;element name="option" type="{urn:jboss:identity:idm:deployer:v1_0_beta}optionType" maxOccurs="unbounded"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/package-info.java =================================================================== --- idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/package-info.java 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/jaxb2/package-info.java 2009-06-23 09:33:03 UTC (rev 624) @@ -5,5 +5,5 @@ // Generated on: 2009.05.28 at 11:27:34 PM CST // -(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity:idm:deployer:v1_0_alpha", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity:idm:deployer:v1_0_beta", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.jboss.identity.idm.integration.jboss5.jaxb2; Modified: idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml =================================================================== --- idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_alpha" +<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_alpha identity-deployer.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd"> <JNDIName>java:/IdentitySessionFactory</JNDIName> <idmConfigFile>jboss.idm.cfg.xml</idmConfigFile> <hibernateDeployer> Modified: idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd =================================================================== --- idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd 2009-06-23 09:33:03 UTC (rev 624) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:jboss:identity:idm:deployer:v1_0_alpha" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="jboss-idm-deployer" type="urn:jbossIDMDeployerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_alpha"> +<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:jboss:identity:idm:deployer:v1_0_beta" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="jboss-idm-deployer" type="urn:jbossIDMDeployerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"> <xs:annotation> - <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... + <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... </xs:annotation> </xs:element> @@ -10,9 +10,9 @@ <xs:sequence> <xs:element name="JNDIName" type="xs:string" /> <xs:element name="idmConfigFile" type="xs:string" /> - <xs:element name="hibernateDeployer" minOccurs="0" type="urn:hibernateDeployerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_alpha"/> - <xs:element name="initializers" minOccurs="0" type="urn:initializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_alpha"/> - <xs:element name="options" minOccurs="0" type="urn:optionsType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_alpha"/> + <xs:element name="hibernateDeployer" minOccurs="0" type="urn:hibernateDeployerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"/> + <xs:element name="initializers" minOccurs="0" type="urn:initializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"/> + <xs:element name="options" minOccurs="0" type="urn:optionsType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta"/> <xs:element name="depends" type="xs:string" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> @@ -21,8 +21,8 @@ <xs:sequence> <xs:element name="datasource" type="xs:string" /> <xs:choice> - <xs:element name="sqlInitializer" type="urn:sqlInitializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_alpha" /> - <xs:element name="hibernateInitializer" type="urn:hibernateInitializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_alpha" /> + <xs:element name="sqlInitializer" type="urn:sqlInitializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta" /> + <xs:element name="hibernateInitializer" type="urn:hibernateInitializerType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta" /> </xs:choice> </xs:sequence> </xs:complexType> @@ -43,7 +43,7 @@ <xs:complexType name="optionsType"> <xs:sequence> - <xs:element name="option" type="urn:optionType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_alpha" maxOccurs="unbounded" /> + <xs:element name="option" type="urn:optionType" xmlns:urn="urn:jboss:identity:idm:deployer:v1_0_beta" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> Modified: idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml =================================================================== --- idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://JBossIdentity</id> Modified: idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml =================================================================== --- idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-jboss-idm.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_alpha" +<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_alpha identity-deployer.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd"> <JNDIName>java:/jbpmIdentitySessionFactory</JNDIName> <idmConfigFile>jbpm.idm.cfg.xml</idmConfigFile> </jboss-idm-deployer> Modified: idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml =================================================================== --- idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml 2009-06-23 06:48:49 UTC (rev 623) +++ idm/trunk/integration/deployer/src/test/resources/jbpm.identity/jbpm.idm.cfg.xml 2009-06-23 09:33:03 UTC (rev 624) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" +<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_beta identity-config.xsd"> <realms> <realm> <id>realm://jbpmIdentity</id>