June 2009 - jboss-identity-commits

JBoss Identity SVN: r601 - in idm/trunk: idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers and 2 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-06-10 05:08:26 -0400 (Wed, 10 Jun 2009) New Revision: 601 Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml Log: a DisassociateGroups(User user) API in the relationshipManager Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-06-10 08:13:17 UTC (rev 600) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-06-10 09:08:26 UTC (rev 601) @@ -162,6 +162,23 @@ throws IdentityException; /** + * Disassociate all groups from a given user + * + * @param user + * @throws IdentityException + */ + void disassociateGroups(User user) throws IdentityException; + + /** + * Disassociate all groups from a given user + * + * @param userId + * @throws IdentityException + */ + void disassociateGroups(String userId) throws IdentityException; + + + /** * Disassociate groups * @param parents * @param members Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java 2009-06-10 08:13:17 UTC (rev 600) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java 2009-06-10 09:08:26 UTC (rev 601) @@ -284,6 +284,25 @@ } + public void disassociateGroups(User user) throws IdentityException + { + checkNotNullArgument(user, "User"); + + Collection<Group> groups = findAssociatedGroups(user, (String)null); + Set<User> users = new HashSet<User>(); + users.add(user); + + disassociateUsers(groups, users); + + } + + public void disassociateGroups(String userId) throws IdentityException + { + checkNotNullArgument(userId, "User Id"); + + disassociateGroups(createUserFromId(userId)); + } + public void disassociateGroups(Collection<Group> parents, Collection<Group> members) throws IdentityException { checkNotNullArgument(parents, "parents"); Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java 2009-06-10 08:13:17 UTC (rev 600) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java 2009-06-10 09:08:26 UTC (rev 601) @@ -212,7 +212,24 @@ session.getRelationshipManager().disassociateUsers(Arrays.asList(group1), Arrays.asList(user1, user2)); + // reassociate #4 + session.getRelationshipManager().associateUserByIds(group1.getId(), user1.getId()); + session.getRelationshipManager().associateUserByIds(group2.getId(), user1.getId()); + session.getRelationshipManager().associateUserByIds(group3.getId(), user1.getId()); + assertTrue(session.getRelationshipManager().isAssociated(Arrays.asList(group1, group2, group3), Arrays.asList(user1))); + + session.getRelationshipManager().disassociateGroups(user1); + + assertFalse(session.getRelationshipManager().isAssociated(group1, user1)); + assertFalse(session.getRelationshipManager().isAssociated(group2, user1)); + assertFalse(session.getRelationshipManager().isAssociated(group3, user1)); + assertFalse(session.getRelationshipManager().isAssociated(Arrays.asList(group1, group2, group3), Arrays.asList(user1))); + + assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user1).size()); + + + ctx.commit(); ctx.begin(); Modified: idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml 2009-06-10 08:13:17 UTC (rev 600) +++ idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml 2009-06-10 09:08:26 UTC (rev 601) @@ -86,7 +86,7 @@ <options> <option> <name>cache</name> - <value>true</value> + <value>false</value> </option> <option> <name>cache.provider.class</name> @@ -137,7 +137,7 @@ <options> <option> <name>cache</name> - <value>true</value> + <value>false</value> </option> <option> <name>cache.provider.class</name>

14 years, 11 months

1
0
0 / 0

JBoss Identity SVN: r600 - in idm/trunk: idm-core/src/main/java/org/jboss/identity/idm/impl/api/attribute and 12 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-06-10 04:13:17 -0400 (Wed, 10 Jun 2009) New Revision: 600 Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributeDescription.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributesManager.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/attribute/IdentityObjectAttributeMetaDataImpl.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AttributesManagerImpl.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAttributeStoreWrapper.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/AttributeType.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/repository/WrapperIdentityStoreRepository.java idm/trunk/idm-core/src/test/resources/identity-config.xsd idm/trunk/idm-core/src/test/resources/organization-test-config.xml idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/configuration/metadata/IdentityObjectAttributeMetaData.java idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/AttributeStore.java idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java idm/trunk/idm-testsuite/src/test/resources/identity-config.xsd idm/trunk/idm-testsuite/src/test/resources/organization-test-config.xml idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml Log: unique attributes Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributeDescription.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributeDescription.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributeDescription.java 2009-06-10 08:13:17 UTC (rev 600) @@ -55,4 +55,9 @@ */ boolean isRequired(); + /** + * @return if attribute is required + */ + boolean isUnique(); + } Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributesManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributesManager.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributesManager.java 2009-06-10 08:13:17 UTC (rev 600) @@ -290,4 +290,24 @@ */ void updateCredential(User user, Credential credential) throws IdentityException; + /** + * Obtains user by its unique attribute value + * + * @param attributeName + * @param value + * @return + * @throws IdentityException + */ + User findUserByUniqueAttribute(String attributeName, Object value) throws IdentityException; + + /** + * Obtains group by its unique attribute value + * @param groupType + * @param attributeName + * @param value + * @return + * @throws IdentityException + */ + Group findGroupByUniqueAttribute(String groupType, String attributeName, Object value) throws IdentityException; + } Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/attribute/IdentityObjectAttributeMetaDataImpl.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/attribute/IdentityObjectAttributeMetaDataImpl.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/attribute/IdentityObjectAttributeMetaDataImpl.java 2009-06-10 08:13:17 UTC (rev 600) @@ -44,7 +44,15 @@ private final boolean required; - public IdentityObjectAttributeMetaDataImpl(String name, String storeMapping, String type, boolean readonly, boolean multivalued, boolean required) + private final boolean unique; + + public IdentityObjectAttributeMetaDataImpl(String name, + String storeMapping, + String type, + boolean readonly, + boolean multivalued, + boolean required, + boolean unique) { this.name = name; this.storeMapping = storeMapping; @@ -52,6 +60,7 @@ this.readonly = readonly; this.multivalued = multivalued; this.required = required; + this.unique = unique; } public IdentityObjectAttributeMetaDataImpl(IdentityObjectAttributeMetaData attributeMD) @@ -62,6 +71,7 @@ this.multivalued = attributeMD.isMultivalued(); this.required = attributeMD.isRequired(); this.storeMapping = attributeMD.getStoreMapping(); + this.unique = attributeMD.isUnique(); } public String getName() @@ -93,4 +103,9 @@ { return required; } + + public boolean isUnique() + { + return unique; + } } Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AttributesManagerImpl.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AttributesManagerImpl.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AttributesManagerImpl.java 2009-06-10 08:13:17 UTC (rev 600) @@ -30,9 +30,11 @@ import org.jboss.identity.idm.api.CredentialType; import org.jboss.identity.idm.api.Credential; import org.jboss.identity.idm.api.Attribute; +import org.jboss.identity.idm.api.Group; import org.jboss.identity.idm.common.exception.IdentityException; import org.jboss.identity.idm.spi.model.IdentityObjectCredential; import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; +import org.jboss.identity.idm.spi.model.IdentityObject; import org.jboss.identity.idm.spi.configuration.metadata.IdentityObjectAttributeMetaData; import org.jboss.identity.idm.impl.api.attribute.IdentityObjectAttributeMetaDataImpl; import org.jboss.identity.idm.impl.api.SimpleAttribute; @@ -367,4 +369,37 @@ throw new IdentityException("Unsupported Credential implementation: " + credential.getClass()); } } + + public User findUserByUniqueAttribute(String attributeName, Object value) throws IdentityException + { + checkNotNullArgument(attributeName, "Attribute name"); + checkNotNullArgument(value, "Attribute value"); + + IdentityObject io = getRepository().findIdentityObjectByUniqueAttribute(getInvocationContext(), getUserObjectType(), new SimpleAttribute(attributeName, value)); + + if (io == null) + { + return null; + } + + return createUser(io); + } + + public Group findGroupByUniqueAttribute(String groupType, String attributeName, Object value) throws IdentityException + { + checkNotNullArgument(groupType, "GroupType"); + checkNotNullArgument(attributeName, "Attribute name"); + checkNotNullArgument(value, "Attribute value"); + + IdentityObject io = getRepository().findIdentityObjectByUniqueAttribute(getInvocationContext(), + getIdentityObjectType(groupType), + new SimpleAttribute(attributeName, value)); + + if (io == null) + { + return null; + } + + return createGroup(io); + } } Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAttributeStoreWrapper.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAttributeStoreWrapper.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAttributeStoreWrapper.java 2009-06-10 08:13:17 UTC (rev 600) @@ -96,7 +96,8 @@ if (results != null && results.size() > 0) { - cacheSupport.putIntoCache(identity, results); + //TODO:FIXME +// cacheSupport.putIntoCache(identity, results); } } @@ -136,7 +137,8 @@ if (results != null && results.size() > 0) { - cacheSupport.putIntoCache(identity, results); + //TODO:FIXME +// cacheSupport.putIntoCache(identity, results); } } else @@ -160,7 +162,8 @@ if (results != null && results.size() > 0) { - cacheSupport.putIntoCache(identity, results); + //TODO:FIXME +// cacheSupport.putIntoCache(identity, results); } } else @@ -192,6 +195,13 @@ } } + //TODO: + public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityObjectType, IdentityObjectAttribute attribute) throws IdentityException + { + return attributeStore.findIdentityObjectByUniqueAttribute(invocationCtx, identityObjectType, attribute); + } + + protected Logger getLog() { return log; Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java 2009-06-10 08:13:17 UTC (rev 600) @@ -286,6 +286,7 @@ String readOnly = attributeType.getIsReadOnly(); String multivalued = attributeType.getIsMultivalued(); String required = attributeType.getIsRequired(); + String unique = attributeType.getIsUnique(); IdentityObjectAttributeMetaDataImpl attributeMD = new IdentityObjectAttributeMetaDataImpl( attributeType.getName(), @@ -293,7 +294,8 @@ attributeType.getType(), (readOnly != null && readOnly.equalsIgnoreCase("true")), (multivalued != null && multivalued.equalsIgnoreCase("true")), - (required != null && required.equalsIgnoreCase("true")) + (required != null && required.equalsIgnoreCase("true")), + (unique != null && unique.equalsIgnoreCase("true")) ); attributes.add(attributeMD); Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/AttributeType.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/AttributeType.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/configuration/jaxb2/generated/AttributeType.java 2009-06-10 08:13:17 UTC (rev 600) @@ -61,7 +61,8 @@ "type", "isRequired", "isMultivalued", - "isReadOnly" + "isReadOnly", + "isUnique" }) public class AttributeType { @@ -71,11 +72,10 @@ protected String mapping; @XmlElement(required = true) protected String type; - @XmlElement(required = true) protected String isRequired; - @XmlElement(required = true) protected String isMultivalued; protected String isReadOnly; + protected String isUnique; /** * Gets the value of the name property. @@ -221,4 +221,13 @@ this.isReadOnly = value; } + public String getIsUnique() + { + return isUnique; + } + + public void setIsUnique(String unique) + { + this.isUnique = unique; + } } Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java 2009-06-10 08:13:17 UTC (rev 600) @@ -1089,6 +1089,43 @@ } } + public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityObjectType, IdentityObjectAttribute attribute) throws IdentityException + { + List<String> filteredAttrs = new LinkedList<String>(); + List<String> leftAttrs = new LinkedList<String>(); + + IdentityStore toStore = resolveIdentityStore(identityObjectType); + IdentityStoreInvocationContext targetCtx = resolveInvocationContext(toStore, invocationCtx); + + // Put supported attrs to the main store + if (toStore != defaultAttributeStore) + { + Set<String> supportedAttrs = toStore.getSupportedAttributeNames(targetCtx, identityObjectType); + + if (supportedAttrs.contains(attribute.getName())) + { + return toStore.findIdentityObjectByUniqueAttribute(targetCtx, identityObjectType, attribute); + } + } + + IdentityStoreInvocationContext defaultCtx = resolveInvocationContext(defaultAttributeStore, invocationCtx); + + if (isAllowNotDefinedAttributes()) + { + defaultAttributeStore.findIdentityObjectByUniqueAttribute(defaultCtx, identityObjectType, attribute); + } + else + { + Set<String> supportedAttrs = defaultAttributeStore.getSupportedAttributeNames(defaultCtx, identityObjectType); + if (supportedAttrs.contains(attribute.getName())) + { + return toStore.findIdentityObjectByUniqueAttribute(defaultCtx, identityObjectType, attribute); + } + } + + return null; + } + private void sortByName(List<IdentityObject> objects, final boolean ascending) { Collections.sort(objects, new Comparator<IdentityObject>(){ Modified: idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/repository/WrapperIdentityStoreRepository.java =================================================================== --- idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/repository/WrapperIdentityStoreRepository.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/repository/WrapperIdentityStoreRepository.java 2009-06-10 08:13:17 UTC (rev 600) @@ -339,4 +339,11 @@ { defaultAttributeStore.removeAttributes(resolveAttributeStoreInvocationContext(invocationCtx), identity, attributeNames); } + + public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityObjectType, IdentityObjectAttribute attribute) throws IdentityException + { + return defaultAttributeStore.findIdentityObjectByUniqueAttribute(resolveAttributeStoreInvocationContext(invocationCtx), identityObjectType, attribute); + } + + } Modified: idm/trunk/idm-core/src/test/resources/identity-config.xsd =================================================================== --- idm/trunk/idm-core/src/test/resources/identity-config.xsd 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-core/src/test/resources/identity-config.xsd 2009-06-10 08:13:17 UTC (rev 600) @@ -1,208 +1,245 @@ <?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><xs:schemaattributeFormDefault="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"></xs:documentation> - </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 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><xs:schemaattributeFormDefault="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"></xs:documentation> + </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" minOccurs="0" maxOccurs="1"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="isMultivalued" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element type="xs:string" name="isReadOnly" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element type="xs:string" name="isUnique" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + </xs:sequence> + </xs:complexType> </xs:schema> \ No newline at end of file Modified: idm/trunk/idm-core/src/test/resources/organization-test-config.xml =================================================================== --- idm/trunk/idm-core/src/test/resources/organization-test-config.xml 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-core/src/test/resources/organization-test-config.xml 2009-06-10 08:13:17 UTC (rev 600) @@ -2,799 +2,817 @@ <jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> - <realms> - <realm> - <id>realm://RedHat/DB</id> - <repository-id-ref>RedHat Repository DB</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - <realm> - <id>realm://portal/SamplePortal/DB</id> - <repository-id-ref>Sample Portal Repository DB</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - <realm> - <id>realm://RedHat/DB_LDAP</id> - <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - <realm> - <id>realm://portal/SamplePortal/DB_LDAP</id> - <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - </realms> - <repositories> - <repository> - <id>RedHat Repository DB</id> - <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <realms> + <realm> + <id>realm://RedHat/DB</id> + <repository-id-ref>RedHat Repository DB</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://portal/SamplePortal/DB</id> + <repository-id-ref>Sample Portal Repository DB</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://RedHat/DB_LDAP</id> + <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://portal/SamplePortal/DB_LDAP</id> + <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>RedHat Repository DB</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>Sample Portal Repository DB</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>RedHat Repository DB+LDAP</id> + <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>Hibernate Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>DIVISION</identity-object-type> + <identity-object-type>PROJECT</identity-object-type> + <identity-object-type>PEOPLE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + <identity-store-mapping> + <identity-store-id>LDAP Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>ORGANIZATION</identity-object-type> + <identity-object-type>ORGANIZATION_UNIT</identity-object-type> + <identity-object-type>DEPARTMENT</identity-object-type> + </identity-object-types> + <options> + <option> + <name>cache</name> + <value>true</value> + </option> + <option> + <name>cache.provider.class</name> + <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheSupportImpl</value> + </option> + <option> + <name>cache.config-file</name> + <value>src/test/resources/jboss-cache-config.xml</value> + </option> + </options> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>Sample Portal Repository DB+LDAP</id> + <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>Hibernate Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>SYSTEM</identity-object-type> + <identity-object-type>ADMINISTRATION</identity-object-type> + <identity-object-type>COMMUNITY</identity-object-type> + <identity-object-type>DIVISION</identity-object-type> + <identity-object-type>SECURITY</identity-object-type> + <identity-object-type>PEOPLE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + <identity-store-mapping> + <identity-store-id>LDAP Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>DEPARTMENT</identity-object-type> + <identity-object-type>ORGANIZATION</identity-object-type> + <identity-object-type>ORGANIZATION_UNIT</identity-object-type> + <identity-object-type>OFFICE</identity-object-type> + </identity-object-types> + <options> + <option> + <name>cache</name> + <value>true</value> + </option> + <option> + <name>cache.provider.class</name> + <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheSupportImpl</value> + </option> + <option> + <name>cache.config-file</name> + <value>src/test/resources/jboss-cache-config.xml</value> + </option> + </options> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>Hibernate Identity Store</id> + <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <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> + </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>allowNotDefinedAttributes</name> - <value>true</value> - </option> + <option> + <name>hibernateConfiguration</name> + <value>hibernate-jboss-identity.cfg.xml</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> - </repository> - <repository> - <id>Sample Portal Repository DB</id> - <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + </identity-store> + <identity-store> + <id>LDAP Identity Store</id> + <class>org.jboss.identity.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - <repository> - <id>RedHat Repository DB+LDAP</id> - <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <identity-store-mappings> - <identity-store-mapping> - <identity-store-id>Hibernate Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>DIVISION</identity-object-type> - <identity-object-type>PROJECT</identity-object-type> - <identity-object-type>PEOPLE</identity-object-type> - </identity-object-types> - <options/> - </identity-store-mapping> - <identity-store-mapping> - <identity-store-id>LDAP Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>USER</identity-object-type> - <identity-object-type>ORGANIZATION</identity-object-type> - <identity-object-type>ORGANIZATION_UNIT</identity-object-type> - <identity-object-type>DEPARTMENT</identity-object-type> - </identity-object-types> - <options> - <option> - <name>cache</name> - <value>true</value> - </option> - <option> - <name>cache.provider.class</name> - <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheSupportImpl</value> - </option> - <option> - <name>cache.config-file</name> - <value>src/test/resources/jboss-cache-config.xml</value> - </option> - </options> - </identity-store-mapping> - </identity-store-mappings> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - <repository> - <id>Sample Portal Repository DB+LDAP</id> - <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <identity-store-mappings> - <identity-store-mapping> - <identity-store-id>Hibernate Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>SYSTEM</identity-object-type> - <identity-object-type>ADMINISTRATION</identity-object-type> - <identity-object-type>COMMUNITY</identity-object-type> - <identity-object-type>DIVISION</identity-object-type> - <identity-object-type>SECURITY</identity-object-type> - <identity-object-type>PEOPLE</identity-object-type> - </identity-object-types> - <options/> - </identity-store-mapping> - <identity-store-mapping> - <identity-store-id>LDAP Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>USER</identity-object-type> - <identity-object-type>DEPARTMENT</identity-object-type> - <identity-object-type>ORGANIZATION</identity-object-type> - <identity-object-type>ORGANIZATION_UNIT</identity-object-type> - <identity-object-type>OFFICE</identity-object-type> - </identity-object-types> - <options> - <option> - <name>cache</name> - <value>true</value> - </option> - <option> - <name>cache.provider.class</name> - <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheSupportImpl</value> - </option> - <option> - <name>cache.config-file</name> - <value>src/test/resources/jboss-cache-config.xml</value> - </option> - </options> - </identity-store-mapping> - </identity-store-mappings> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - </repositories> - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>Hibernate Identity Store</id> - <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - </relationships> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes> - <attribute> - <name>picture</name> - <mapping>user.picture</mapping> - <type>binary</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - </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>populateRelationshipTypes</name> + <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>email</name> + <mapping>mail</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + <isUnique>true</isUnique> + </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> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>uid</value> + </option> + <option> + <name>passwordAttributeName</name> + <value>userPassword</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=People,o=test,dc=portal,dc=example,dc=com</value> + </option> + <option> + <name>allowCreateEntry</name> <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=inetOrgPerson</value> + <value>sn= </value> + <value>cn= </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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> <value>true</value> - </option> - <option> - <name>isRealmAware</name> + </option> + <option> + <name>allowEmptyMemberships</name> <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> <value>true</value> - </option> - </options> - </identity-store> - <identity-store> - <id>LDAP Identity Store</id> - <class>org.jboss.identity.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships/> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes> - <attribute> - <name>phone</name> - <mapping>telephoneNumber</mapping> - <type>text</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - <attribute> - <name>description</name> - <mapping>description</mapping> - <type>text</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - <attribute> - <name>carLicense</name> - <mapping>carLicense</mapping> - <type>text</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - </attributes> - <options> - <option> - <name>idAttributeName</name> - <value>uid</value> - </option> - <option> - <name>passwordAttributeName</name> - <value>userPassword</value> - </option> - <option> - <name>ctxDNs</name> - <value>ou=People,o=test,dc=portal,dc=example,dc=com</value> - </option> - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=inetOrgPerson</value> - <value>sn= </value> - <value>cn= </value> - </option> - </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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</value> - </option> - </options> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>providerURL</name> - <value>ldap://localhost:10389</value> - </option> - <option> - <name>adminDN</name> - <value>cn=Directory Manager</value> - </option> - <option> - <name>adminPassword</name> - <value>password</value> - </option> - <option> - <name>searchTimeLimit</name> - <value>10000</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldap://localhost:10389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>password</value> + </option> + <option> + <name>searchTimeLimit</name> + <value>10000</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> </jboss-identity> \ No newline at end of file Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-06-10 08:13:17 UTC (rev 600) @@ -41,6 +41,7 @@ import org.hibernate.SessionFactory; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.criterion.Restrictions; +import org.hibernate.criterion.MatchMode; import org.jboss.identity.idm.common.exception.IdentityException; import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute; @@ -1558,6 +1559,7 @@ mappedAttributes.put(name, attribute); + if (mdMap == null || !mdMap.containsKey(attribute.getName())) { if (!isAllowNotDefinedAttributes) @@ -1572,6 +1574,8 @@ if (amd != null) { + + if (!amd.isMultivalued() && attribute.getSize() > 1) { throw new IdentityException("Cannot assigned multiply values to single valued attribute: " + attribute.getName()); @@ -1581,6 +1585,19 @@ throw new IdentityException("Cannot update readonly attribute: " + attribute.getName()); } + if (amd.isUnique()) + { + IdentityObject checkIdentity = findIdentityObjectByUniqueAttribute(ctx, + identity.getIdentityType(), + attribute); + + if (checkIdentity != null && !checkIdentity.getName().equals(identity.getName())) + { + throw new IdentityException("Unique attribute '" + attribute.getName() + " value already set for identityObject: " + + checkIdentity); + } + } + String type = amd.getType(); // check if all values have proper type @@ -1704,6 +1721,19 @@ throw new IdentityException("Cannot add readonly attribute: " + attribute.getName()); } + if (amd.isUnique()) + { + IdentityObject checkIdentity = findIdentityObjectByUniqueAttribute(ctx, + identity.getIdentityType(), + attribute); + + if (checkIdentity != null && !checkIdentity.getName().equals(identity.getName())) + { + throw new IdentityException("Unique attribute '" + attribute.getName() + " value already set for identityObject: " + + checkIdentity); + } + } + String type = amd.getType(); // check if all values have proper type @@ -1863,8 +1893,57 @@ } } - public boolean validateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, IdentityObjectCredential credential) throws IdentityException + public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityObjectType, IdentityObjectAttribute attribute) throws IdentityException { + if (attribute == null) + { + throw new IllegalArgumentException("attribute is null"); + } + + checkIOType(identityObjectType); + + + + String attrMappedName = resolveAttributeStoreMapping(identityObjectType, attribute.getName()); + + HibernateIdentityObjectType hiot = getHibernateIdentityObjectType(invocationCtx, identityObjectType); + + Session session = getHibernateSession(invocationCtx); + + Query q = session.createQuery("select a from HibernateIdentityObjectTextAttribute a where a.identityObject.identityType = :identityType " + + "and a.name like :attributeName and :value = any elements(a.values)"); + + Set attrValues = new HashSet(); + attrValues.addAll(attribute.getValues()); + + List<HibernateIdentityObjectAttribute> attrs = (List<HibernateIdentityObjectAttribute>) + q.setParameter("identityType", hiot) + .setParameter("attributeName", attrMappedName) + .setParameter("value", attribute.getValue()).list(); +// +// List<HibernateIdentityObjectAttribute> attrs = (List<HibernateIdentityObjectAttribute>) +// session.createCriteria(HibernateIdentityObjectAttribute.class) +// .createAlias("identityObject", "io") +// .createAlias("values", "v") +// .add(Restrictions.eq("io.identityType", hiot)) +// .add(Restrictions.eq("name", attrMappedName)) +// .add(Restrictions.like("v[0]", attribute.getValue())).list(); + + if (attrs.size() == 0) + { + return null; + } + if (attrs.size() > 1) + { + throw new IdentityException("Illegal state - more than one IdentityObject with the same unique attribute value: " + attribute); + } + + return attrs.get(0).getIdentityObject(); + + } + + public boolean validateCredential(IdentityStoreInvocationContext ctx, IdentityObject identityObject, IdentityObjectCredential credential) throws IdentityException + { if (credential == null) { throw new IllegalArgumentException(); Modified: idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java =================================================================== --- idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-ldap/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-06-10 08:13:17 UTC (rev 600) @@ -1684,8 +1684,21 @@ { throw new IdentityException("Cannot update readonly attribute: " + attributeName); } - } + if (amd != null && amd.isUnique()) + { + IdentityObject checkIdentity = findIdentityObjectByUniqueAttribute(ctx, + identity.getIdentityType(), + attribute); + + if (checkIdentity != null && !checkIdentity.getName().equals(identity.getName())) + { + throw new IdentityException("Unique attribute '" + attribute.getName() + " value already set for identityObject: " + + checkIdentity); + } + } + } + if (values != null) { for (Object value : values) @@ -1771,7 +1784,7 @@ if (mdMap != null) { - IdentityObjectAttributeMetaData amd = mdMap.get(attributeName); + IdentityObjectAttributeMetaData amd = mdMap.get(attribute.getName()); if (amd != null && !amd.isMultivalued() && values.size() > 1) { throw new IdentityException("Cannot assigned multiply values to single valued attribute: " + attributeName); @@ -1780,6 +1793,20 @@ { throw new IdentityException("Cannot update readonly attribute: " + attributeName); } + + if (amd != null && amd.isUnique()) + { + IdentityObject checkIdentity = findIdentityObjectByUniqueAttribute(ctx, + identity.getIdentityType(), + attribute); + + if (checkIdentity != null && !checkIdentity.getName().equals(identity.getName())) + { + throw new IdentityException("Unique attribute '" + attribute.getName() + " value already set for identityObject: " + + checkIdentity); + } + } + } @@ -1895,6 +1922,111 @@ } } + public IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, IdentityObjectType type, IdentityObjectAttribute attribute) throws IdentityException + { + String nameFilter = "*"; + + + LdapContext ctx = getLDAPContext(invocationCtx); + + + checkIOType(type); + + LinkedList<IdentityObject> objects = new LinkedList<IdentityObject>(); + + LDAPIdentityObjectTypeConfiguration typeConfiguration = getTypeConfiguration(invocationCtx, type); + + String attributeName = getTypeConfiguration(invocationCtx, type).getAttributeMapping(attribute.getName()); + + + try + { + Control[] requestControls = null; + + StringBuilder af = new StringBuilder(); + + // Filter by attribute values + af.append("(") + .append(attributeName) + .append("=") + .append(attribute.getValue()) + .append(")"); + + String filter = getTypeConfiguration(invocationCtx, type).getEntrySearchFilter(); + List<SearchResult> sr = null; + + String[] entryCtxs = getTypeConfiguration(invocationCtx, type).getCtxDNs(); + + if (filter != null && filter.length() > 0) + { + + Object[] filterArgs = {nameFilter}; + sr = searchIdentityObjects(invocationCtx, + entryCtxs, + "(&(" + filter + ")" + af.toString() + ")", + filterArgs, + new String[]{typeConfiguration.getIdAttributeName()}, + requestControls); + } + else + { + filter = "(".concat(typeConfiguration.getIdAttributeName()).concat("=").concat(nameFilter).concat(")"); + sr = searchIdentityObjects(invocationCtx, + entryCtxs, + "(&(" + filter + ")" + af.toString() + ")", + null, + new String[]{typeConfiguration.getIdAttributeName()}, + requestControls); + } + + + for (SearchResult res : sr) + { + ctx = (LdapContext)res.getObject(); + String dn = ctx.getNameInNamespace(); + objects.add(createIdentityObjectInstance(invocationCtx, type, res.getAttributes(), dn)); + } + + ctx.close(); + + + } + catch (NoSuchElementException e) + { + //log.debug("No identity object found with name: " + name, e); + } + catch (Exception e) + { + throw new IdentityException("IdentityObject search failed.", e); + } + finally + { + try + { + if (ctx != null) + { + ctx.close(); + } + } + catch (NamingException e) + { + throw new IdentityException("Failed to close LDAP connection", e); + } + } + + if (objects.size() == 0) + { + return null; + } + if (objects.size() > 1) + { + throw new IdentityException("Illegal state - more than one IdentityObject of same type share same unique attribute value"); + } + + + return objects.get(0); + } + //Internal public LDAPIdentityObjectImpl createIdentityObjectInstance(IdentityStoreInvocationContext ctx, IdentityObjectType type, Attributes attrs, String dn) throws IdentityException Modified: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/configuration/metadata/IdentityObjectAttributeMetaData.java =================================================================== --- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/configuration/metadata/IdentityObjectAttributeMetaData.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/configuration/metadata/IdentityObjectAttributeMetaData.java 2009-06-10 08:13:17 UTC (rev 600) @@ -61,4 +61,9 @@ * @return */ boolean isRequired(); + + /** + * @return + */ + boolean isUnique(); } Modified: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/AttributeStore.java =================================================================== --- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/AttributeStore.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/AttributeStore.java 2009-06-10 08:13:17 UTC (rev 600) @@ -107,4 +107,17 @@ void removeAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, String[] attributeNames) throws IdentityException; + /** + * Finds IdentityObject by its unique attribute value + * + * @param invocationCtx + * @param identityObjectType + * @param attribute + * @return + * @throws IdentityException + */ + IdentityObject findIdentityObjectByUniqueAttribute(IdentityStoreInvocationContext invocationCtx, + IdentityObjectType identityObjectType, + IdentityObjectAttribute attribute) throws IdentityException; + } Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java 2009-06-10 08:13:17 UTC (rev 600) @@ -31,6 +31,7 @@ import org.jboss.identity.idm.api.AttributeDescription; import org.jboss.identity.idm.api.Credential; import org.jboss.identity.idm.common.p3p.P3PConstants; +import org.jboss.identity.idm.common.exception.IdentityException; import java.util.Collection; import java.util.Map; @@ -290,17 +291,37 @@ { new SimpleAttribute(P3PConstants.INFO_USER_NAME_GIVEN, new String[]{"Boleslaw"}), new SimpleAttribute(P3PConstants.INFO_USER_NAME_FAMILY, new String[]{"Dawidowicz"}), - new SimpleAttribute("picture", new byte[][]{picture}) + new SimpleAttribute("picture", new byte[][]{picture}), + new SimpleAttribute("email", new String[]{"bd(a)example.com"}) }; session.getAttributesManager().addAttributes(bdawidowUser, userInfo); Map<String, Attribute> attributes = session.getAttributesManager().getAttributes(bdawidowUser); - assertEquals(3, attributes.keySet().size()); + assertEquals(4, attributes.keySet().size()); assertEquals("Dawidowicz", (attributes.get(P3PConstants.INFO_USER_NAME_FAMILY)).getValue()); assertTrue(Arrays.equals((byte[])attributes.get("picture").getValue(), picture)); + // Find user by email + assertNull(session.getAttributesManager().findUserByUniqueAttribute("email", "toto")); + User user = session.getAttributesManager().findUserByUniqueAttribute("email", "bd(a)example.com"); + assertEquals(bdawidowUser, user); + + // check if same unique email can be used for other user + try + { + session.getAttributesManager().addAttributes(theuteUser, userInfo); + fail(); + } + catch (IdentityException e) + { + // expected + } + + + + // Credential User anotherOne = bdawidowUser; //session.getPersistenceManager().createUser("blah1"); Modified: idm/trunk/idm-testsuite/src/test/resources/identity-config.xsd =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/identity-config.xsd 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-testsuite/src/test/resources/identity-config.xsd 2009-06-10 08:13:17 UTC (rev 600) @@ -1,208 +1,245 @@ <?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><xs:schemaattributeFormDefault="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"></xs:documentation> - </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 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><xs:schemaattributeFormDefault="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"></xs:documentation> + </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" minOccurs="0" maxOccurs="1"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="isMultivalued" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element type="xs:string" name="isReadOnly" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element type="xs:string" name="isUnique" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + </xs:sequence> + </xs:complexType> </xs:schema> \ No newline at end of file Modified: idm/trunk/idm-testsuite/src/test/resources/organization-test-config.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/organization-test-config.xml 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-testsuite/src/test/resources/organization-test-config.xml 2009-06-10 08:13:17 UTC (rev 600) @@ -2,799 +2,817 @@ <jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> - <realms> - <realm> - <id>realm://RedHat/DB</id> - <repository-id-ref>RedHat Repository DB</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - <realm> - <id>realm://portal/SamplePortal/DB</id> - <repository-id-ref>Sample Portal Repository DB</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - <realm> - <id>realm://RedHat/DB_LDAP</id> - <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - <realm> - <id>realm://portal/SamplePortal/DB_LDAP</id> - <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - </realms> - <repositories> - <repository> - <id>RedHat Repository DB</id> - <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <realms> + <realm> + <id>realm://RedHat/DB</id> + <repository-id-ref>RedHat Repository DB</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://portal/SamplePortal/DB</id> + <repository-id-ref>Sample Portal Repository DB</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://RedHat/DB_LDAP</id> + <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://portal/SamplePortal/DB_LDAP</id> + <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>RedHat Repository DB</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>Sample Portal Repository DB</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>RedHat Repository DB+LDAP</id> + <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>Hibernate Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>DIVISION</identity-object-type> + <identity-object-type>PROJECT</identity-object-type> + <identity-object-type>PEOPLE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + <identity-store-mapping> + <identity-store-id>LDAP Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>ORGANIZATION</identity-object-type> + <identity-object-type>ORGANIZATION_UNIT</identity-object-type> + <identity-object-type>DEPARTMENT</identity-object-type> + </identity-object-types> + <options> + <option> + <name>cache</name> + <value>true</value> + </option> + <option> + <name>cache.provider.class</name> + <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheSupportImpl</value> + </option> + <option> + <name>cache.config-file</name> + <value>src/test/resources/jboss-cache-config.xml</value> + </option> + </options> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>Sample Portal Repository DB+LDAP</id> + <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>Hibernate Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>SYSTEM</identity-object-type> + <identity-object-type>ADMINISTRATION</identity-object-type> + <identity-object-type>COMMUNITY</identity-object-type> + <identity-object-type>DIVISION</identity-object-type> + <identity-object-type>SECURITY</identity-object-type> + <identity-object-type>PEOPLE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + <identity-store-mapping> + <identity-store-id>LDAP Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>DEPARTMENT</identity-object-type> + <identity-object-type>ORGANIZATION</identity-object-type> + <identity-object-type>ORGANIZATION_UNIT</identity-object-type> + <identity-object-type>OFFICE</identity-object-type> + </identity-object-types> + <options> + <option> + <name>cache</name> + <value>true</value> + </option> + <option> + <name>cache.provider.class</name> + <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheSupportImpl</value> + </option> + <option> + <name>cache.config-file</name> + <value>src/test/resources/jboss-cache-config.xml</value> + </option> + </options> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>Hibernate Identity Store</id> + <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <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> + </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>allowNotDefinedAttributes</name> - <value>true</value> - </option> + <option> + <name>hibernateConfiguration</name> + <value>hibernate-jboss-identity.cfg.xml</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> - </repository> - <repository> - <id>Sample Portal Repository DB</id> - <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + </identity-store> + <identity-store> + <id>LDAP Identity Store</id> + <class>org.jboss.identity.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - <repository> - <id>RedHat Repository DB+LDAP</id> - <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <identity-store-mappings> - <identity-store-mapping> - <identity-store-id>Hibernate Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>DIVISION</identity-object-type> - <identity-object-type>PROJECT</identity-object-type> - <identity-object-type>PEOPLE</identity-object-type> - </identity-object-types> - <options/> - </identity-store-mapping> - <identity-store-mapping> - <identity-store-id>LDAP Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>USER</identity-object-type> - <identity-object-type>ORGANIZATION</identity-object-type> - <identity-object-type>ORGANIZATION_UNIT</identity-object-type> - <identity-object-type>DEPARTMENT</identity-object-type> - </identity-object-types> - <options> - <option> - <name>cache</name> - <value>true</value> - </option> - <option> - <name>cache.provider.class</name> - <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheProviderImpl</value> - </option> - <option> - <name>cache.config-file</name> - <value>src/test/resources/jboss-cache-config.xml</value> - </option> - </options> - </identity-store-mapping> - </identity-store-mappings> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - <repository> - <id>Sample Portal Repository DB+LDAP</id> - <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <identity-store-mappings> - <identity-store-mapping> - <identity-store-id>Hibernate Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>SYSTEM</identity-object-type> - <identity-object-type>ADMINISTRATION</identity-object-type> - <identity-object-type>COMMUNITY</identity-object-type> - <identity-object-type>DIVISION</identity-object-type> - <identity-object-type>SECURITY</identity-object-type> - <identity-object-type>PEOPLE</identity-object-type> - </identity-object-types> - <options/> - </identity-store-mapping> - <identity-store-mapping> - <identity-store-id>LDAP Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>USER</identity-object-type> - <identity-object-type>DEPARTMENT</identity-object-type> - <identity-object-type>ORGANIZATION</identity-object-type> - <identity-object-type>ORGANIZATION_UNIT</identity-object-type> - <identity-object-type>OFFICE</identity-object-type> - </identity-object-types> - <options> - <option> - <name>cache</name> - <value>true</value> - </option> - <option> - <name>cache.provider.class</name> - <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheProviderImpl</value> - </option> - <option> - <name>cache.config-file</name> - <value>src/test/resources/jboss-cache-config.xml</value> - </option> - </options> - </identity-store-mapping> - </identity-store-mappings> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - </repositories> - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>Hibernate Identity Store</id> - <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - </relationships> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes> - <attribute> - <name>picture</name> - <mapping>user.picture</mapping> - <type>binary</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - </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>populateRelationshipTypes</name> + <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>email</name> + <mapping>mail</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + <isUnique>true</isUnique> + </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> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>uid</value> + </option> + <option> + <name>passwordAttributeName</name> + <value>userPassword</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=People,o=test,dc=portal,dc=example,dc=com</value> + </option> + <option> + <name>allowCreateEntry</name> <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=inetOrgPerson</value> + <value>sn= </value> + <value>cn= </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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> <value>true</value> - </option> - <option> - <name>isRealmAware</name> + </option> + <option> + <name>allowEmptyMemberships</name> <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> <value>true</value> - </option> - </options> - </identity-store> - <identity-store> - <id>LDAP Identity Store</id> - <class>org.jboss.identity.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships/> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes> - <attribute> - <name>phone</name> - <mapping>telephoneNumber</mapping> - <type>text</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - <attribute> - <name>description</name> - <mapping>description</mapping> - <type>text</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - <attribute> - <name>carLicense</name> - <mapping>carLicense</mapping> - <type>text</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - </attributes> - <options> - <option> - <name>idAttributeName</name> - <value>uid</value> - </option> - <option> - <name>passwordAttributeName</name> - <value>userPassword</value> - </option> - <option> - <name>ctxDNs</name> - <value>ou=People,o=test,dc=portal,dc=example,dc=com</value> - </option> - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=inetOrgPerson</value> - <value>sn= </value> - <value>cn= </value> - </option> - </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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</value> - </option> - </options> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>providerURL</name> - <value>ldap://localhost:10389</value> - </option> - <option> - <name>adminDN</name> - <value>cn=Directory Manager</value> - </option> - <option> - <name>adminPassword</name> - <value>password</value> - </option> - <option> - <name>searchTimeLimit</name> - <value>10000</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldap://localhost:10389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>password</value> + </option> + <option> + <name>searchTimeLimit</name> + <value>10000</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> </jboss-identity> \ No newline at end of file Modified: idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml 2009-06-10 05:17:06 UTC (rev 599) +++ idm/trunk/idm-testsuite/src/test/resources/organization-test-jboss-unit-config.xml 2009-06-10 08:13:17 UTC (rev 600) @@ -2,799 +2,817 @@ <jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> - <realms> - <realm> - <id>realm://RedHat/DB</id> - <repository-id-ref>RedHat Repository DB</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - <realm> - <id>realm://portal/SamplePortal/DB</id> - <repository-id-ref>Sample Portal Repository DB</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - <realm> - <id>realm://RedHat/DB_LDAP</id> - <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - <realm> - <id>realm://portal/SamplePortal/DB_LDAP</id> - <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - </realms> - <repositories> - <repository> - <id>RedHat Repository DB</id> - <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <realms> + <realm> + <id>realm://RedHat/DB</id> + <repository-id-ref>RedHat Repository DB</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://portal/SamplePortal/DB</id> + <repository-id-ref>Sample Portal Repository DB</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://RedHat/DB_LDAP</id> + <repository-id-ref>RedHat Repository DB+LDAP</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm://portal/SamplePortal/DB_LDAP</id> + <repository-id-ref>Sample Portal Repository DB+LDAP</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>RedHat Repository DB</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>Sample Portal Repository DB</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>RedHat Repository DB+LDAP</id> + <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>Hibernate Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>DIVISION</identity-object-type> + <identity-object-type>PROJECT</identity-object-type> + <identity-object-type>PEOPLE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + <identity-store-mapping> + <identity-store-id>LDAP Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>ORGANIZATION</identity-object-type> + <identity-object-type>ORGANIZATION_UNIT</identity-object-type> + <identity-object-type>DEPARTMENT</identity-object-type> + </identity-object-types> + <options> + <option> + <name>cache</name> + <value>true</value> + </option> + <option> + <name>cache.provider.class</name> + <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheProviderImpl</value> + </option> + <option> + <name>cache.config-file</name> + <value>jboss-cache-config.xml</value> + </option> + </options> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>Sample Portal Repository DB+LDAP</id> + <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>Hibernate Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>SYSTEM</identity-object-type> + <identity-object-type>ADMINISTRATION</identity-object-type> + <identity-object-type>COMMUNITY</identity-object-type> + <identity-object-type>DIVISION</identity-object-type> + <identity-object-type>SECURITY</identity-object-type> + <identity-object-type>PEOPLE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + <identity-store-mapping> + <identity-store-id>LDAP Identity Store</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>DEPARTMENT</identity-object-type> + <identity-object-type>ORGANIZATION</identity-object-type> + <identity-object-type>ORGANIZATION_UNIT</identity-object-type> + <identity-object-type>OFFICE</identity-object-type> + </identity-object-types> + <options> + <option> + <name>cache</name> + <value>true</value> + </option> + <option> + <name>cache.provider.class</name> + <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheProviderImpl</value> + </option> + <option> + <name>cache.config-file</name> + <value>jboss-cache-config.xml</value> + </option> + </options> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>Hibernate Identity Store</id> + <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <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> + </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>allowNotDefinedAttributes</name> - <value>true</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> - </repository> - <repository> - <id>Sample Portal Repository DB</id> - <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + </identity-store> + <identity-store> + <id>LDAP Identity Store</id> + <class>org.jboss.identity.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - <repository> - <id>RedHat Repository DB+LDAP</id> - <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <identity-store-mappings> - <identity-store-mapping> - <identity-store-id>Hibernate Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>DIVISION</identity-object-type> - <identity-object-type>PROJECT</identity-object-type> - <identity-object-type>PEOPLE</identity-object-type> - </identity-object-types> - <options/> - </identity-store-mapping> - <identity-store-mapping> - <identity-store-id>LDAP Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>USER</identity-object-type> - <identity-object-type>ORGANIZATION</identity-object-type> - <identity-object-type>ORGANIZATION_UNIT</identity-object-type> - <identity-object-type>DEPARTMENT</identity-object-type> - </identity-object-types> - <options> - <option> - <name>cache</name> - <value>true</value> - </option> - <option> - <name>cache.provider.class</name> - <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheProviderImpl</value> - </option> - <option> - <name>cache.config-file</name> - <value>jboss-cache-config.xml</value> - </option> - </options> - </identity-store-mapping> - </identity-store-mappings> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - <repository> - <id>Sample Portal Repository DB+LDAP</id> - <class>org.jboss.identity.idm.impl.repository.FallbackIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <identity-store-mappings> - <identity-store-mapping> - <identity-store-id>Hibernate Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>SYSTEM</identity-object-type> - <identity-object-type>ADMINISTRATION</identity-object-type> - <identity-object-type>COMMUNITY</identity-object-type> - <identity-object-type>DIVISION</identity-object-type> - <identity-object-type>SECURITY</identity-object-type> - <identity-object-type>PEOPLE</identity-object-type> - </identity-object-types> - <options/> - </identity-store-mapping> - <identity-store-mapping> - <identity-store-id>LDAP Identity Store</identity-store-id> - <identity-object-types> - <identity-object-type>USER</identity-object-type> - <identity-object-type>DEPARTMENT</identity-object-type> - <identity-object-type>ORGANIZATION</identity-object-type> - <identity-object-type>ORGANIZATION_UNIT</identity-object-type> - <identity-object-type>OFFICE</identity-object-type> - </identity-object-types> - <options> - <option> - <name>cache</name> - <value>true</value> - </option> - <option> - <name>cache.provider.class</name> - <value>org.jboss.identity.idm.impl.cache.IdentityStoreCacheProviderImpl</value> - </option> - <option> - <name>cache.config-file</name> - <value>jboss-cache-config.xml</value> - </option> - </options> - </identity-store-mapping> - </identity-store-mappings> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - </repositories> - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>Hibernate Identity Store</id> - <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - </relationships> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes> - <attribute> - <name>picture</name> - <mapping>user.picture</mapping> - <type>binary</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - </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>hibernateSessionFactoryJNDIName</name> - <value>java:/jbossidentity/HibernateStoreSessionFactory</value> - </option> - <option> - <name>populateRelationshipTypes</name> + <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>uid</value> + </option> + <option> + <name>passwordAttributeName</name> + <value>userPassword</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=People,o=test,dc=portal,dc=example,dc=com</value> + </option> + <option> + <name>allowCreateEntry</name> <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=inetOrgPerson</value> + <value>sn= </value> + <value>cn= </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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> <value>true</value> - </option> - <option> - <name>isRealmAware</name> + </option> + <option> + <name>allowEmptyMemberships</name> <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> <value>true</value> - </option> - </options> - </identity-store> - <identity-store> - <id>LDAP Identity Store</id> - <class>org.jboss.identity.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships/> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes> - <attribute> - <name>phone</name> - <mapping>telephoneNumber</mapping> - <type>text</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - <attribute> - <name>description</name> - <mapping>description</mapping> - <type>text</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - <attribute> - <name>carLicense</name> - <mapping>carLicense</mapping> - <type>text</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - </attributes> - <options> - <option> - <name>idAttributeName</name> - <value>uid</value> - </option> - <option> - <name>passwordAttributeName</name> - <value>userPassword</value> - </option> - <option> - <name>ctxDNs</name> - <value>ou=People,o=test,dc=portal,dc=example,dc=com</value> - </option> - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=inetOrgPerson</value> - <value>sn= </value> - <value>cn= </value> - </option> - </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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> - </option> -  -  -  -  - <option> - <name>allowCreateEntry</name> - <value>true</value> - </option> - <option> - <name>membershipAttributeName</name> - <value>member</value> - </option> - <option> - <name>isMembershipAttributeDN</name> - <value>true</value> - </option> - <option> - <name>allowEmptyMemberships</name> - <value>true</value> - </option> - <option> - <name>createEntryAttributeValues</name> - <value>objectClass=top</value> - <value>objectClass=groupOfNames</value> - </option> - </options> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>providerURL</name> - <value>ldap://localhost:10389</value> - </option> - <option> - <name>adminDN</name> - <value>cn=Directory Manager</value> - </option> - <option> - <name>adminPassword</name> - <value>password</value> - </option> - <option> - <name>searchTimeLimit</name> - <value>10000</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</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,o=test,dc=portal,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>membershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldap://localhost:10389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>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

14 years, 11 months

1
0
0 / 0

JBoss Identity SVN: r599 - in identity-federation/trunk: jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util and 3 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-06-10 01:17:06 -0400 (Wed, 10 Jun 2009) New Revision: 599 Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/IDFedLSInputResolver.java identity-federation/trunk/jboss-identity-xmlsec-model/src/main/resources/schema/w3c/xmlschema/ identity-federation/trunk/jboss-identity-xmlsec-model/src/main/resources/schema/w3c/xmlschema/XMLSchema.dtd identity-federation/trunk/jboss-identity-xmlsec-model/src/main/resources/schema/w3c/xmlschema/datatypes.dtd Removed: identity-federation/trunk/jboss-identity-fed-model/src/main/resources/schema/saml/v2/xmldsig-core-schema.xsd Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/SecurityActions.java Log: schemas, jaxb, entity resolution Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-06-09 23:21:28 UTC (rev 598) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-06-10 05:17:06 UTC (rev 599) @@ -266,7 +266,7 @@ */ public void marshall(ResponseType responseType, OutputStream os) throws JAXBException, SAXException { - Marshaller marshaller = JBossSAMLAuthnResponseFactory.getMarshaller(); + Marshaller marshaller = JBossSAMLAuthnResponseFactory.getValidatingMarshaller(); JAXBElement<ResponseType> jaxb = SAMLProtocolFactory.getObjectFactory().createResponse(responseType); marshaller.marshal(jaxb, os); } Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/IDFedLSInputResolver.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/IDFedLSInputResolver.java (rev 0) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/IDFedLSInputResolver.java 2009-06-10 05:17:06 UTC (rev 599) @@ -0,0 +1,155 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.identity.federation.core.util; + +import java.io.InputStream; +import java.io.Reader; +import java.util.HashMap; +import java.util.Map; + +import org.w3c.dom.ls.LSInput; +import org.w3c.dom.ls.LSResourceResolver; + +/** + * An LSResource Resolver for schema validation + * @author Anil.Saldhana(a)redhat.com + * @since Jun 9, 2009 + */ +public class IDFedLSInputResolver implements LSResourceResolver +{ + private static Map<String, LSInput> lsmap = new HashMap<String,LSInput>(); + + private static Map<String, String> schemaLocationMap = new HashMap<String,String>(); + + static + { + schemaLocationMap.put("saml-schema-assertion-2.0.xsd", "schema/saml/v2/saml-schema-assertion-2.0.xsd"); + schemaLocationMap.put("http://www.w3.org/2000/09/xmldsig#", + "schema/w3c/xmldsig/xmldsig-core-schema.xsd"); + schemaLocationMap.put("http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd", + "schema/w3c/xmldsig/xmldsig-core-schema.xsd"); + schemaLocationMap.put("http://www.w3.org/2001/04/xmlenc#", + "schema/w3c/xmlenc/xenc-schema.xsd"); + schemaLocationMap.put("http://www.w3.org/TR/2002/REC-xmlenc-core-20021210/xenc-schema.xsd", + "schema/w3c/xmlenc/xenc-schema.xsd"); + schemaLocationMap.put("datatypes.dtd", + "schema/w3c/xmlschema/datatypes.dtd"); + schemaLocationMap.put("http://www.w3.org/2001/XMLSchema.dtd", + "schema/w3c/xmlschema/XMLSchema.dtd"); + } + + public LSInput resolveResource(String type, + String namespaceURI, final String publicId, + final String systemId, final String baseURI) + { + LSInput lsi = lsmap.get(systemId); + if(lsi == null) + { + ClassLoader tcl = SecurityActions.getContextClassLoader(); + String loc = schemaLocationMap.get(systemId); + if(loc == null) + return null; + + final InputStream is = tcl.getResourceAsStream(loc); + if(is == null) + System.out.println("inputstream is null for "+ loc); + lsi = new LSInput() + { + public String getBaseURI() + { + return baseURI; + } + + public InputStream getByteStream() + { + return is; + } + + public boolean getCertifiedText() + { + return false; + } + + public Reader getCharacterStream() + { + return null; + } + + public String getEncoding() + { + return null; + } + + public String getPublicId() + { + return publicId; + } + + public String getStringData() + { + return null; + } + + public String getSystemId() + { + return systemId; + } + + public void setBaseURI(String baseURI) + { + } + + public void setByteStream(InputStream byteStream) + { + } + + public void setCertifiedText(boolean certifiedText) + { + } + + public void setCharacterStream(Reader characterStream) + { + } + + public void setEncoding(String encoding) + { + } + + public void setPublicId(String publicId) + { + } + + public void setStringData(String stringData) + { + } + + public void setSystemId(String systemId) + { + } + }; + + lsmap.put(systemId, lsi); + } + return lsi; + } + +} \ No newline at end of file Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java 2009-06-09 23:21:28 UTC (rev 598) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java 2009-06-10 05:17:06 UTC (rev 599) @@ -30,7 +30,10 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; +import org.apache.log4j.Logger; +import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; /** * Utility to obtain JAXB2 marshaller/unmarshaller etc @@ -39,6 +42,8 @@ */ public class JAXBUtil { + private static Logger log = Logger.getLogger(JAXBUtil.class); + public static final String W3C_XML_SCHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema"; @@ -56,12 +61,7 @@ Marshaller marshaller = JAXBUtil.getMarshaller(pkgName); marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); //Validate against schema - ClassLoader tcl = SecurityActions.getContextClassLoader(); - URL schemaURL = tcl.getResource(schemaLocation); - if(schemaURL == null) - throw new IllegalStateException("Schema URL is null:" + schemaLocation); - SchemaFactory scFact = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); - Schema schema = scFact.newSchema(schemaURL); + Schema schema = getJAXPSchemaInstance(schemaLocation); marshaller.setSchema(schema); return marshaller; @@ -110,15 +110,61 @@ throws JAXBException, SAXException { Unmarshaller unmarshaller = getUnmarshaller(pkgName); - //Validate against schema + Schema schema = getJAXPSchemaInstance(schemaLocation); + unmarshaller.setSchema(schema); + + return unmarshaller; + } + + private static Schema getJAXPSchemaInstance(String schemaLocation) throws SAXException + { ClassLoader tcl = SecurityActions.getContextClassLoader(); URL schemaURL = tcl.getResource(schemaLocation); if(schemaURL == null) throw new IllegalStateException("Schema URL is null:" + schemaLocation); SchemaFactory scFact = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); + if(SecurityActions.getSystemProperty("org.jboss.identity.federation.jaxb.ls", null) != null) + scFact.setResourceResolver( new IDFedLSInputResolver()); + + scFact.setErrorHandler(new ErrorHandler() + { + public void error(SAXParseException exception) throws SAXException + { + StringBuilder builder = new StringBuilder(); + builder.append("Line Number=").append(exception.getLineNumber()); + builder.append(" Col Number=").append(exception.getColumnNumber()); + builder.append(" Public ID=").append(exception.getPublicId()); + builder.append(" System ID=").append(exception.getSystemId()); + builder.append(" exc=").append(exception.getLocalizedMessage()); + + log.trace("SAX Error:" + builder.toString()); + } + + public void fatalError(SAXParseException exception) throws SAXException + { + StringBuilder builder = new StringBuilder(); + builder.append("Line Number=").append(exception.getLineNumber()); + builder.append(" Col Number=").append(exception.getColumnNumber()); + builder.append(" Public ID=").append(exception.getPublicId()); + builder.append(" System ID=").append(exception.getSystemId()); + builder.append(" exc=").append(exception.getLocalizedMessage()); + + log.error("SAX Fatal Error:" + builder.toString()); + } + + public void warning(SAXParseException exception) throws SAXException + { + StringBuilder builder = new StringBuilder(); + builder.append("Line Number=").append(exception.getLineNumber()); + builder.append(" Col Number=").append(exception.getColumnNumber()); + builder.append(" Public ID=").append(exception.getPublicId()); + builder.append(" System ID=").append(exception.getSystemId()); + builder.append(" exc=").append(exception.getLocalizedMessage()); + + log.trace("SAX Warn:" + builder.toString()); + } + }); Schema schema = scFact.newSchema(schemaURL); - unmarshaller.setSchema(schema); - - return unmarshaller; - } + return schema; + } } \ No newline at end of file Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/SecurityActions.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/SecurityActions.java 2009-06-09 23:21:28 UTC (rev 598) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/SecurityActions.java 2009-06-10 05:17:06 UTC (rev 599) @@ -47,6 +47,24 @@ } /** + * Set the system property + * @param key + * @param defaultValue + * @return + */ + static void setSystemProperty(final String key, final String value) + { + AccessController.doPrivileged(new PrivilegedAction<Object>() + { + public Object run() + { + System.setProperty(key, value); + return null; + } + }); + } + + /** * Get the system property * @param key * @param defaultValue Deleted: identity-federation/trunk/jboss-identity-fed-model/src/main/resources/schema/saml/v2/xmldsig-core-schema.xsd =================================================================== --- identity-federation/trunk/jboss-identity-fed-model/src/main/resources/schema/saml/v2/xmldsig-core-schema.xsd 2009-06-09 23:21:28 UTC (rev 598) +++ identity-federation/trunk/jboss-identity-fed-model/src/main/resources/schema/saml/v2/xmldsig-core-schema.xsd 2009-06-10 05:17:06 UTC (rev 599) @@ -1,318 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE schema - PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd" - [ - <!ATTLIST schema - xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#"> - <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'> - <!ENTITY % p ''> - <!ENTITY % s ''> - ]> - - - - -<schema xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ds="http://www.w3.org/2000/09/xmldsig#" - targetNamespace="http://www.w3.org/2000/09/xmldsig#" - version="0.1" elementFormDefault="qualified"> - - - -<simpleType name="CryptoBinary"> - <restriction base="base64Binary"> - </restriction> -</simpleType> - - - -<element name="Signature" type="ds:SignatureType"/> -<complexType name="SignatureType"> - <sequence> - <element ref="ds:SignedInfo"/> - <element ref="ds:SignatureValue"/> - <element ref="ds:KeyInfo" minOccurs="0"/> - <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="SignatureValue" type="ds:SignatureValueType"/> - <complexType name="SignatureValueType"> - <simpleContent> - <extension base="base64Binary"> - <attribute name="Id" type="ID" use="optional"/> - </extension> - </simpleContent> - </complexType> - - - -<element name="SignedInfo" type="ds:SignedInfoType"/> -<complexType name="SignedInfoType"> - <sequence> - <element ref="ds:CanonicalizationMethod"/> - <element ref="ds:SignatureMethod"/> - <element ref="ds:Reference" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> - <complexType name="CanonicalizationMethodType" mixed="true"> - <sequence> - <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/> -  - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - - <element name="SignatureMethod" type="ds:SignatureMethodType"/> - <complexType name="SignatureMethodType" mixed="true"> - <sequence> - <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/> - <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/> -  - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - - - -<element name="Reference" type="ds:ReferenceType"/> -<complexType name="ReferenceType"> - <sequence> - <element ref="ds:Transforms" minOccurs="0"/> - <element ref="ds:DigestMethod"/> - <element ref="ds:DigestValue"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> - <attribute name="URI" type="anyURI" use="optional"/> - <attribute name="Type" type="anyURI" use="optional"/> -</complexType> - - <element name="Transforms" type="ds:TransformsType"/> - <complexType name="TransformsType"> - <sequence> - <element ref="ds:Transform" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <element name="Transform" type="ds:TransformType"/> - <complexType name="TransformType" mixed="true"> - <choice minOccurs="0" maxOccurs="unbounded"> - <any namespace="##other" processContents="lax"/> -  - <element name="XPath" type="string"/> - </choice> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - - - -<element name="DigestMethod" type="ds:DigestMethodType"/> -<complexType name="DigestMethodType" mixed="true"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> -</complexType> - -<element name="DigestValue" type="ds:DigestValueType"/> -<simpleType name="DigestValueType"> - <restriction base="base64Binary"/> -</simpleType> - - - - - -<element name="KeyInfo" type="ds:KeyInfoType"/> -<complexType name="KeyInfoType" mixed="true"> - <choice maxOccurs="unbounded"> - <element ref="ds:KeyName"/> - <element ref="ds:KeyValue"/> - <element ref="ds:RetrievalMethod"/> - <element ref="ds:X509Data"/> - <element ref="ds:PGPData"/> - <element ref="ds:SPKIData"/> - <element ref="ds:MgmtData"/> - <any processContents="lax" namespace="##other"/> -  - </choice> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="KeyName" type="string"/> - <element name="MgmtData" type="string"/> - - <element name="KeyValue" type="ds:KeyValueType"/> - <complexType name="KeyValueType" mixed="true"> - <choice> - <element ref="ds:DSAKeyValue"/> - <element ref="ds:RSAKeyValue"/> - <any namespace="##other" processContents="lax"/> - </choice> - </complexType> - - <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> - <complexType name="RetrievalMethodType"> - <sequence> - <element ref="ds:Transforms" minOccurs="0"/> - </sequence> - <attribute name="URI" type="anyURI"/> - <attribute name="Type" type="anyURI" use="optional"/> - </complexType> - - - -<element name="X509Data" type="ds:X509DataType"/> -<complexType name="X509DataType"> - <sequence maxOccurs="unbounded"> - <choice> - <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/> - <element name="X509SKI" type="base64Binary"/> - <element name="X509SubjectName" type="string"/> - <element name="X509Certificate" type="base64Binary"/> - <element name="X509CRL" type="base64Binary"/> - <any namespace="##other" processContents="lax"/> - </choice> - </sequence> -</complexType> - -<complexType name="X509IssuerSerialType"> - <sequence> - <element name="X509IssuerName" type="string"/> - <element name="X509SerialNumber" type="integer"/> - </sequence> -</complexType> - - - - - -<element name="PGPData" type="ds:PGPDataType"/> -<complexType name="PGPDataType"> - <choice> - <sequence> - <element name="PGPKeyID" type="base64Binary"/> - <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - <sequence> - <element name="PGPKeyPacket" type="base64Binary"/> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - </choice> -</complexType> - - - - - -<element name="SPKIData" type="ds:SPKIDataType"/> -<complexType name="SPKIDataType"> - <sequence maxOccurs="unbounded"> - <element name="SPKISexp" type="base64Binary"/> - <any namespace="##other" processContents="lax" minOccurs="0"/> - </sequence> -</complexType> - - - - - - - -<element name="Object" type="ds:ObjectType"/> -<complexType name="ObjectType" mixed="true"> - <sequence minOccurs="0" maxOccurs="unbounded"> - <any namespace="##any" processContents="lax"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> - <attribute name="MimeType" type="string" use="optional"/>  - <attribute name="Encoding" type="anyURI" use="optional"/> -</complexType> - -<element name="Manifest" type="ds:ManifestType"/> -<complexType name="ManifestType"> - <sequence> - <element ref="ds:Reference" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - -<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> -<complexType name="SignaturePropertiesType"> - <sequence> - <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="SignatureProperty" type="ds:SignaturePropertyType"/> - <complexType name="SignaturePropertyType" mixed="true"> - <choice maxOccurs="unbounded"> - <any namespace="##other" processContents="lax"/> -  - </choice> - <attribute name="Target" type="anyURI" use="required"/> - <attribute name="Id" type="ID" use="optional"/> - </complexType> - - - - - -<simpleType name="HMACOutputLengthType"> - <restriction base="integer"/> -</simpleType> - - - -<element name="DSAKeyValue" type="ds:DSAKeyValueType"/> -<complexType name="DSAKeyValueType"> - <sequence> - <sequence minOccurs="0"> - <element name="P" type="ds:CryptoBinary"/> - <element name="Q" type="ds:CryptoBinary"/> - </sequence> - <element name="G" type="ds:CryptoBinary" minOccurs="0"/> - <element name="Y" type="ds:CryptoBinary"/> - <element name="J" type="ds:CryptoBinary" minOccurs="0"/> - <sequence minOccurs="0"> - <element name="Seed" type="ds:CryptoBinary"/> - <element name="PgenCounter" type="ds:CryptoBinary"/> - </sequence> - </sequence> -</complexType> - -<element name="RSAKeyValue" type="ds:RSAKeyValueType"/> -<complexType name="RSAKeyValueType"> - <sequence> - <element name="Modulus" type="ds:CryptoBinary"/> - <element name="Exponent" type="ds:CryptoBinary"/> - </sequence> -</complexType> - - - - - -</schema> Added: identity-federation/trunk/jboss-identity-xmlsec-model/src/main/resources/schema/w3c/xmlschema/XMLSchema.dtd =================================================================== --- identity-federation/trunk/jboss-identity-xmlsec-model/src/main/resources/schema/w3c/xmlschema/XMLSchema.dtd (rev 0) +++ identity-federation/trunk/jboss-identity-xmlsec-model/src/main/resources/schema/w3c/xmlschema/XMLSchema.dtd 2009-06-10 05:17:06 UTC (rev 599) @@ -0,0 +1,402 @@ + + +  +  +  +  + + + +<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' > + +<!ENTITY % p 'xs:'>  +<!ENTITY % s ':xs'>  +<!ENTITY % nds 'xmlns%s;'> + + +<!ENTITY % schema "%p;schema"> +<!ENTITY % complexType "%p;complexType"> +<!ENTITY % complexContent "%p;complexContent"> +<!ENTITY % simpleContent "%p;simpleContent"> +<!ENTITY % extension "%p;extension"> +<!ENTITY % element "%p;element"> +<!ENTITY % unique "%p;unique"> +<!ENTITY % key "%p;key"> +<!ENTITY % keyref "%p;keyref"> +<!ENTITY % selector "%p;selector"> +<!ENTITY % field "%p;field"> +<!ENTITY % group "%p;group"> +<!ENTITY % all "%p;all"> +<!ENTITY % choice "%p;choice"> +<!ENTITY % sequence "%p;sequence"> +<!ENTITY % any "%p;any"> +<!ENTITY % anyAttribute "%p;anyAttribute"> +<!ENTITY % attribute "%p;attribute"> +<!ENTITY % attributeGroup "%p;attributeGroup"> +<!ENTITY % include "%p;include"> +<!ENTITY % import "%p;import"> +<!ENTITY % redefine "%p;redefine"> +<!ENTITY % notation "%p;notation"> + + +<!ENTITY % annotation "%p;annotation"> +<!ENTITY % appinfo "%p;appinfo"> +<!ENTITY % documentation "%p;documentation"> + + + +<!ENTITY % schemaAttrs ''> +<!ENTITY % complexTypeAttrs ''> +<!ENTITY % complexContentAttrs ''> +<!ENTITY % simpleContentAttrs ''> +<!ENTITY % extensionAttrs ''> +<!ENTITY % elementAttrs ''> +<!ENTITY % groupAttrs ''> +<!ENTITY % allAttrs ''> +<!ENTITY % choiceAttrs ''> +<!ENTITY % sequenceAttrs ''> +<!ENTITY % anyAttrs ''> +<!ENTITY % anyAttributeAttrs ''> +<!ENTITY % attributeAttrs ''> +<!ENTITY % attributeGroupAttrs ''> +<!ENTITY % uniqueAttrs ''> +<!ENTITY % keyAttrs ''> +<!ENTITY % keyrefAttrs ''> +<!ENTITY % selectorAttrs ''> +<!ENTITY % fieldAttrs ''> +<!ENTITY % includeAttrs ''> +<!ENTITY % importAttrs ''> +<!ENTITY % redefineAttrs ''> +<!ENTITY % notationAttrs ''> +<!ENTITY % annotationAttrs ''> +<!ENTITY % appinfoAttrs ''> +<!ENTITY % documentationAttrs ''> + +<!ENTITY % complexDerivationSet "CDATA"> +  +<!ENTITY % blockSet "CDATA"> +  + +<!ENTITY % mgs '%all; | %choice; | %sequence;'> +<!ENTITY % cs '%choice; | %sequence;'> +<!ENTITY % formValues '(qualified|unqualified)'> + + +<!ENTITY % attrDecls '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'> + +<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'> + + +<!ENTITY % restriction1 '((%mgs; | %group;)?)'> + +%xs-datatypes; + + +<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*, + ((%simpleType; | %complexType; + | %element; | %attribute; + | %attributeGroup; | %group; + | %notation; ), + (%annotation;)*)* )> +<!ATTLIST %schema; + targetNamespace %URIref; #IMPLIED + version CDATA #IMPLIED + %nds; %URIref; #FIXED 'http://www.w3.org/2001/XMLSchema' + xmlns CDATA #IMPLIED + finalDefault %complexDerivationSet; '' + blockDefault %blockSet; '' + id ID #IMPLIED + elementFormDefault %formValues; 'unqualified' + attributeFormDefault %formValues; 'unqualified' + xml:lang CDATA #IMPLIED + %schemaAttrs;> + + + + + + + + +<!ELEMENT %complexType; ((%annotation;)?, + (%simpleContent;|%complexContent;| + %particleAndAttrs;))> + +<!ATTLIST %complexType; + name %NCName; #IMPLIED + id ID #IMPLIED + abstract %boolean; #IMPLIED + final %complexDerivationSet; #IMPLIED + block %complexDerivationSet; #IMPLIED + mixed (true|false) 'false' + %complexTypeAttrs;> + + + + + + +<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))> +<!ATTLIST %complexContent; + mixed (true|false) #IMPLIED + id ID #IMPLIED + %complexContentAttrs;> + + + +<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))> +<!ATTLIST %simpleContent; + id ID #IMPLIED + %simpleContentAttrs;> + + + +<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))> +<!ATTLIST %extension; + base %QName; #REQUIRED + id ID #IMPLIED + %extensionAttrs;> + + + +<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?, + (%unique; | %key; | %keyref;)*)> + + +<!ATTLIST %element; + name %NCName; #IMPLIED + id ID #IMPLIED + ref %QName; #IMPLIED + type %QName; #IMPLIED + minOccurs %nonNegativeInteger; #IMPLIED + maxOccurs CDATA #IMPLIED + nillable %boolean; #IMPLIED + substitutionGroup %QName; #IMPLIED + abstract %boolean; #IMPLIED + final %complexDerivationSet; #IMPLIED + block %blockSet; #IMPLIED + default CDATA #IMPLIED + fixed CDATA #IMPLIED + form %formValues; #IMPLIED + %elementAttrs;> + + + + +<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)> +<!ATTLIST %group; + name %NCName; #IMPLIED + ref %QName; #IMPLIED + minOccurs %nonNegativeInteger; #IMPLIED + maxOccurs CDATA #IMPLIED + id ID #IMPLIED + %groupAttrs;> + +<!ELEMENT %all; ((%annotation;)?, (%element;)*)> +<!ATTLIST %all; + minOccurs (1) #IMPLIED + maxOccurs (1) #IMPLIED + id ID #IMPLIED + %allAttrs;> + +<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)> +<!ATTLIST %choice; + minOccurs %nonNegativeInteger; #IMPLIED + maxOccurs CDATA #IMPLIED + id ID #IMPLIED + %choiceAttrs;> + +<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)> +<!ATTLIST %sequence; + minOccurs %nonNegativeInteger; #IMPLIED + maxOccurs CDATA #IMPLIED + id ID #IMPLIED + %sequenceAttrs;> + + + + + + + +<!ELEMENT %any; (%annotation;)?> +<!ATTLIST %any; + namespace CDATA '##any' + processContents (skip|lax|strict) 'strict' + minOccurs %nonNegativeInteger; '1' + maxOccurs CDATA '1' + id ID #IMPLIED + %anyAttrs;> + + + +<!ELEMENT %anyAttribute; (%annotation;)?> +<!ATTLIST %anyAttribute; + namespace CDATA '##any' + processContents (skip|lax|strict) 'strict' + id ID #IMPLIED + %anyAttributeAttrs;> + + + + +<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)> +<!ATTLIST %attribute; + name %NCName; #IMPLIED + id ID #IMPLIED + ref %QName; #IMPLIED + type %QName; #IMPLIED + use (prohibited|optional|required) #IMPLIED + default CDATA #IMPLIED + fixed CDATA #IMPLIED + form %formValues; #IMPLIED + %attributeAttrs;> + + + + + + +<!ELEMENT %attributeGroup; ((%annotation;)?, + (%attribute; | %attributeGroup;)*, + (%anyAttribute;)?) > +<!ATTLIST %attributeGroup; + name %NCName; #IMPLIED + id ID #IMPLIED + ref %QName; #IMPLIED + %attributeGroupAttrs;> + + + + +<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)> +<!ATTLIST %unique; + name %NCName; #REQUIRED + id ID #IMPLIED + %uniqueAttrs;> + +<!ELEMENT %key; ((%annotation;)?, %selector;, (%field;)+)> +<!ATTLIST %key; + name %NCName; #REQUIRED + id ID #IMPLIED + %keyAttrs;> + +<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)> +<!ATTLIST %keyref; + name %NCName; #REQUIRED + refer %QName; #REQUIRED + id ID #IMPLIED + %keyrefAttrs;> + +<!ELEMENT %selector; ((%annotation;)?)> +<!ATTLIST %selector; + xpath %XPathExpr; #REQUIRED + id ID #IMPLIED + %selectorAttrs;> +<!ELEMENT %field; ((%annotation;)?)> +<!ATTLIST %field; + xpath %XPathExpr; #REQUIRED + id ID #IMPLIED + %fieldAttrs;> + + +<!ELEMENT %include; (%annotation;)?> +<!ATTLIST %include; + schemaLocation %URIref; #REQUIRED + id ID #IMPLIED + %includeAttrs;> + +<!ELEMENT %import; (%annotation;)?> +<!ATTLIST %import; + namespace %URIref; #IMPLIED + schemaLocation %URIref; #IMPLIED + id ID #IMPLIED + %importAttrs;> + +<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; | + %attributeGroup; | %group;)*> +<!ATTLIST %redefine; + schemaLocation %URIref; #REQUIRED + id ID #IMPLIED + %redefineAttrs;> + +<!ELEMENT %notation; (%annotation;)?> +<!ATTLIST %notation; + name %NCName; #REQUIRED + id ID #IMPLIED + public CDATA #REQUIRED + system %URIref; #IMPLIED + %notationAttrs;> + + + + +<!ELEMENT %annotation; (%appinfo; | %documentation;)*> +<!ATTLIST %annotation; %annotationAttrs;> + + +<!ELEMENT %appinfo; ANY>  +<!ATTLIST %appinfo; + source %URIref; #IMPLIED + id ID #IMPLIED + %appinfoAttrs;> +<!ELEMENT %documentation; ANY>  +<!ATTLIST %documentation; + source %URIref; #IMPLIED + id ID #IMPLIED + xml:lang CDATA #IMPLIED + %documentationAttrs;> + +<!NOTATION XMLSchemaStructures PUBLIC + 'structures' 'http://www.w3.org/2001/XMLSchema.xsd' > +<!NOTATION XML PUBLIC + 'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' > Added: identity-federation/trunk/jboss-identity-xmlsec-model/src/main/resources/schema/w3c/xmlschema/datatypes.dtd =================================================================== --- identity-federation/trunk/jboss-identity-xmlsec-model/src/main/resources/schema/w3c/xmlschema/datatypes.dtd (rev 0) +++ identity-federation/trunk/jboss-identity-xmlsec-model/src/main/resources/schema/w3c/xmlschema/datatypes.dtd 2009-06-10 05:17:06 UTC (rev 599) @@ -0,0 +1,203 @@ + + + + + +<!ENTITY % simpleType "%p;simpleType"> +<!ENTITY % restriction "%p;restriction"> +<!ENTITY % list "%p;list"> +<!ENTITY % union "%p;union"> +<!ENTITY % maxExclusive "%p;maxExclusive"> +<!ENTITY % minExclusive "%p;minExclusive"> +<!ENTITY % maxInclusive "%p;maxInclusive"> +<!ENTITY % minInclusive "%p;minInclusive"> +<!ENTITY % totalDigits "%p;totalDigits"> +<!ENTITY % fractionDigits "%p;fractionDigits"> +<!ENTITY % length "%p;length"> +<!ENTITY % minLength "%p;minLength"> +<!ENTITY % maxLength "%p;maxLength"> +<!ENTITY % enumeration "%p;enumeration"> +<!ENTITY % whiteSpace "%p;whiteSpace"> +<!ENTITY % pattern "%p;pattern"> + + + +<!ENTITY % simpleTypeAttrs ""> +<!ENTITY % restrictionAttrs ""> +<!ENTITY % listAttrs ""> +<!ENTITY % unionAttrs ""> +<!ENTITY % maxExclusiveAttrs ""> +<!ENTITY % minExclusiveAttrs ""> +<!ENTITY % maxInclusiveAttrs ""> +<!ENTITY % minInclusiveAttrs ""> +<!ENTITY % totalDigitsAttrs ""> +<!ENTITY % fractionDigitsAttrs ""> +<!ENTITY % lengthAttrs ""> +<!ENTITY % minLengthAttrs ""> +<!ENTITY % maxLengthAttrs ""> +<!ENTITY % enumerationAttrs ""> +<!ENTITY % whiteSpaceAttrs ""> +<!ENTITY % patternAttrs ""> + + +<!ENTITY % URIref "CDATA"> +<!ENTITY % XPathExpr "CDATA"> +<!ENTITY % QName "NMTOKEN"> +<!ENTITY % QNames "NMTOKENS"> +<!ENTITY % NCName "NMTOKEN"> +<!ENTITY % nonNegativeInteger "NMTOKEN"> +<!ENTITY % boolean "(true|false)"> +<!ENTITY % simpleDerivationSet "CDATA"> + + + +<!ENTITY % minBound "(%minInclusive; | %minExclusive;)"> +<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)"> +<!ENTITY % bounds "%minBound; | %maxBound;"> +<!ENTITY % numeric "%totalDigits; | %fractionDigits;"> +<!ENTITY % ordered "%bounds; | %numeric;"> +<!ENTITY % unordered + "%pattern; | %enumeration; | %whiteSpace; | %length; | + %maxLength; | %minLength;"> +<!ENTITY % facet "%ordered; | %unordered;"> +<!ENTITY % facetAttr + "value CDATA #REQUIRED + id ID #IMPLIED"> +<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED"> +<!ENTITY % facetModel "(%annotation;)?"> +<!ELEMENT %simpleType; + ((%annotation;)?, (%restriction; | %list; | %union;))> +<!ATTLIST %simpleType; + name %NCName; #IMPLIED + final %simpleDerivationSet; #IMPLIED + id ID #IMPLIED + %simpleTypeAttrs;> + +<!ELEMENT %restriction; ((%annotation;)?, + (%restriction1; | + ((%simpleType;)?,(%facet;)*)), + (%attrDecls;))> +<!ATTLIST %restriction; + base %QName; #IMPLIED + id ID #IMPLIED + %restrictionAttrs;> + +<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)> +<!ATTLIST %list; + itemType %QName; #IMPLIED + id ID #IMPLIED + %listAttrs;> + +<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)> +<!ATTLIST %union; + id ID #IMPLIED + memberTypes %QNames; #IMPLIED + %unionAttrs;> + + +<!ELEMENT %maxExclusive; %facetModel;> +<!ATTLIST %maxExclusive; + %facetAttr; + %fixedAttr; + %maxExclusiveAttrs;> +<!ELEMENT %minExclusive; %facetModel;> +<!ATTLIST %minExclusive; + %facetAttr; + %fixedAttr; + %minExclusiveAttrs;> + +<!ELEMENT %maxInclusive; %facetModel;> +<!ATTLIST %maxInclusive; + %facetAttr; + %fixedAttr; + %maxInclusiveAttrs;> +<!ELEMENT %minInclusive; %facetModel;> +<!ATTLIST %minInclusive; + %facetAttr; + %fixedAttr; + %minInclusiveAttrs;> + +<!ELEMENT %totalDigits; %facetModel;> +<!ATTLIST %totalDigits; + %facetAttr; + %fixedAttr; + %totalDigitsAttrs;> +<!ELEMENT %fractionDigits; %facetModel;> +<!ATTLIST %fractionDigits; + %facetAttr; + %fixedAttr; + %fractionDigitsAttrs;> + +<!ELEMENT %length; %facetModel;> +<!ATTLIST %length; + %facetAttr; + %fixedAttr; + %lengthAttrs;> +<!ELEMENT %minLength; %facetModel;> +<!ATTLIST %minLength; + %facetAttr; + %fixedAttr; + %minLengthAttrs;> +<!ELEMENT %maxLength; %facetModel;> +<!ATTLIST %maxLength; + %facetAttr; + %fixedAttr; + %maxLengthAttrs;> + + +<!ELEMENT %enumeration; %facetModel;> +<!ATTLIST %enumeration; + %facetAttr; + %enumerationAttrs;> + +<!ELEMENT %whiteSpace; %facetModel;> +<!ATTLIST %whiteSpace; + %facetAttr; + %fixedAttr; + %whiteSpaceAttrs;> + + +<!ELEMENT %pattern; %facetModel;> +<!ATTLIST %pattern; + %facetAttr; + %patternAttrs;>

14 years, 11 months

1
0
0 / 0

JBoss Identity SVN: r598 - in identity-federation/trunk: jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets and 7 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-06-09 19:21:28 -0400 (Tue, 09 Jun 2009) New Revision: 598 Added: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAMLUtil.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/SOAPSAMLXACMLUtil.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/xmlenc/factories/XMLEncryptionFactory.java Log: refactor Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java 2009-06-09 23:21:28 UTC (rev 598) @@ -25,7 +25,6 @@ import java.net.URL; import javax.annotation.Resource; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.transform.Source; import javax.xml.ws.Service; @@ -41,6 +40,7 @@ import org.jboss.identity.federation.api.wstrust.WSTrustJAXBFactory; import org.jboss.identity.federation.api.wstrust.WSTrustRequestHandler; import org.jboss.identity.federation.bindings.config.STSType; +import org.jboss.identity.federation.core.util.JAXBUtil; import org.jboss.identity.federation.core.wstrust.BaseRequestSecurityToken; import org.jboss.identity.federation.core.wstrust.RequestSecurityToken; import org.jboss.identity.federation.core.wstrust.RequestSecurityTokenCollection; @@ -162,10 +162,10 @@ try { + String pkgName = "org.jboss.identity.federation.bindings.config"; InputStream stream = configurationFile.openStream(); - JAXBContext context = JAXBContext.newInstance("org.jboss.identity.federation.bindings.config"); - JAXBElement element = (JAXBElement) context.createUnmarshaller().unmarshal(stream); - STSType stsConfig = (STSType) element.getValue(); + JAXBElement<STSType> element = (JAXBElement<STSType>) JAXBUtil.getUnmarshaller(pkgName).unmarshal(stream); + STSType stsConfig = element.getValue(); return new JBossSTSConfiguration(stsConfig); } catch (Exception e) Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-06-09 23:21:28 UTC (rev 598) @@ -47,6 +47,7 @@ import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil; import org.jboss.identity.federation.core.saml.v2.util.JAXBElementMappingUtil; import org.jboss.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil; +import org.jboss.identity.federation.core.util.JAXBUtil; import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Body; import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Envelope; import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Fault; @@ -135,7 +136,7 @@ if(debug) log.trace("Received SOAP:"+DocumentUtil.getDocumentAsString(inputDoc)); - Unmarshaller un = SOAPSAMLXACMLUtil.getUnmarshaller(); + Unmarshaller un = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage()); if(debug) un.setEventHandler(new DefaultValidationEventHandler()); @@ -228,7 +229,7 @@ if(envelope == null) throw new IllegalStateException("SOAPEnvelope is null"); JAXBElement<?> jaxbEnvelope = JAXBElementMappingUtil.get(envelope); - Marshaller marshaller = SOAPSAMLXACMLUtil.getMarshaller(); + Marshaller marshaller = JAXBUtil.getMarshaller(SOAPSAMLXACMLUtil.getPackage()); marshaller.marshal(jaxbEnvelope, os); } catch (JAXBException e) Added: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java (rev 0) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-06-09 23:21:28 UTC (rev 598) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.identity.federation.bindings.tomcat.sp; + +import java.io.InputStream; + +import org.apache.catalina.LifecycleException; +import org.apache.catalina.authenticator.FormAuthenticator; +import org.apache.log4j.Logger; +import org.jboss.identity.federation.bindings.config.SPType; +import org.jboss.identity.federation.bindings.util.ValveUtil; + +/** + * Base Class for Form Authenticators + * @author Anil.Saldhana(a)redhat.com + * @since Jun 9, 2009 + */ +public class BaseFormAuthenticator extends FormAuthenticator +{ + private static Logger log = Logger.getLogger(BaseFormAuthenticator.class); + + protected SPType spConfiguration = null; + + protected String serviceURL = null; + protected String identityURL = null; + + protected String configFile = "/WEB-INF/jboss-idfed.xml"; + + public BaseFormAuthenticator() + { + super(); + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + + @Override + public void start() throws LifecycleException + { + super.start(); + + InputStream is = context.getServletContext().getResourceAsStream(configFile); + if(is == null) + throw new RuntimeException(configFile + " missing"); + try + { + spConfiguration = ValveUtil.getSPConfiguration(is); + this.identityURL = spConfiguration.getIdentityURL(); + this.serviceURL = spConfiguration.getServiceURL(); + log.trace("Identity Provider URL=" + this.identityURL); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } +} \ No newline at end of file Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-06-09 23:21:28 UTC (rev 598) @@ -31,12 +31,9 @@ import javax.servlet.ServletException; import javax.xml.bind.JAXBException; -import javax.xml.datatype.DatatypeConfigurationException; -import org.apache.catalina.LifecycleException; import org.apache.catalina.Session; import org.apache.catalina.authenticator.Constants; -import org.apache.catalina.authenticator.FormAuthenticator; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.LoginConfig; @@ -44,7 +41,6 @@ import org.apache.log4j.Logger; import org.jboss.identity.federation.api.saml.v2.request.SAML2Request; import org.jboss.identity.federation.api.saml.v2.response.SAML2Response; -import org.jboss.identity.federation.bindings.config.SPType; import org.jboss.identity.federation.bindings.config.TrustType; import org.jboss.identity.federation.bindings.tomcat.sp.holder.ServiceProviderSAMLContext; import org.jboss.identity.federation.bindings.util.PostBindingUtil; @@ -65,41 +61,14 @@ * @author Anil.Saldhana(a)redhat.com * @since Dec 12, 2008 */ -public class SPPostFormAuthenticator extends FormAuthenticator -{ +public class SPPostFormAuthenticator extends BaseFormAuthenticator +{ private static Logger log = Logger.getLogger(SPPostFormAuthenticator.class); - protected SPType spConfiguration = null; - - private String serviceURL = null; - private String identityURL = null; - public SPPostFormAuthenticator() { super(); } - - @Override - public void start() throws LifecycleException - { - String configFile = "/WEB-INF/jboss-idfed.xml"; - super.start(); - - InputStream is = context.getServletContext().getResourceAsStream(configFile); - if(is == null) - throw new RuntimeException(configFile + " missing"); - try - { - spConfiguration = ValveUtil.getSPConfiguration(is); - this.identityURL = spConfiguration.getIdentityURL(); - this.serviceURL = spConfiguration.getServiceURL(); - log.trace("Identity Provider URL=" + this.identityURL); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } @Override public boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException @@ -239,7 +208,7 @@ private Principal process(Request request, Response response) throws JAXBException, SAXException, IssuerNotTrustedException, - AssertionExpiredException, DatatypeConfigurationException, ConfigurationException + AssertionExpiredException, ConfigurationException { Principal userPrincipal = null; Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-06-09 23:21:28 UTC (rev 598) @@ -32,12 +32,9 @@ import javax.servlet.ServletException; import javax.xml.bind.JAXBException; -import javax.xml.datatype.DatatypeConfigurationException; -import org.apache.catalina.LifecycleException; import org.apache.catalina.Session; import org.apache.catalina.authenticator.Constants; -import org.apache.catalina.authenticator.FormAuthenticator; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.LoginConfig; @@ -47,7 +44,6 @@ import org.jboss.identity.federation.api.saml.v2.response.SAML2Response; import org.jboss.identity.federation.api.util.Base64; import org.jboss.identity.federation.api.util.DeflateUtil; -import org.jboss.identity.federation.bindings.config.SPType; import org.jboss.identity.federation.bindings.config.TrustType; import org.jboss.identity.federation.bindings.tomcat.sp.holder.ServiceProviderSAMLContext; import org.jboss.identity.federation.bindings.util.HTTPRedirectUtil; @@ -70,41 +66,14 @@ * @author Anil.Saldhana(a)redhat.com * @since Dec 12, 2008 */ -public class SPRedirectFormAuthenticator extends FormAuthenticator +public class SPRedirectFormAuthenticator extends BaseFormAuthenticator { private static Logger log = Logger.getLogger(SPRedirectFormAuthenticator.class); - protected SPType spConfiguration = null; - - private String serviceURL = null; - private String identityURL = null; - public SPRedirectFormAuthenticator() { super(); } - - @Override - public void start() throws LifecycleException - { - String configFile = "/WEB-INF/jboss-idfed.xml"; - super.start(); - - InputStream is = context.getServletContext().getResourceAsStream(configFile); - if(is == null) - throw new RuntimeException(configFile + " missing"); - try - { - spConfiguration = ValveUtil.getSPConfiguration(is); - this.identityURL = spConfiguration.getIdentityURL(); - this.serviceURL = spConfiguration.getServiceURL(); - log.trace("Identity Provider URL=" + this.identityURL); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } @Override public boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException @@ -258,8 +227,7 @@ private Principal process(Request request, Response response) throws IOException, GeneralSecurityException, - JAXBException, SAXException, ConfigurationException, - ParsingException, DatatypeConfigurationException + ConfigurationException, ParsingException { Principal userPrincipal = null; @@ -274,7 +242,19 @@ SAML2Response saml2Response = new SAML2Response(); - ResponseType responseType = saml2Response.getResponseType(is); + ResponseType responseType; + try + { + responseType = saml2Response.getResponseType(is); + } + catch (JAXBException e) + { + throw new ParsingException(e); + } + catch (SAXException e) + { + throw new ParsingException(e); + } this.isTrusted(responseType.getIssuer().getValue()); Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java 2009-06-09 23:21:28 UTC (rev 598) @@ -22,7 +22,6 @@ package org.jboss.test.identity.federation.bindings.servlets; import java.io.InputStream; -import java.net.URI; import java.net.URL; import java.net.URLConnection; @@ -33,6 +32,7 @@ import junit.framework.TestCase; import org.jboss.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil; +import org.jboss.identity.federation.core.util.JAXBUtil; import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Envelope; import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Fault; import org.jboss.identity.federation.saml.v2.assertion.AssertionType; @@ -82,7 +82,7 @@ { JAXBElement<?> jb = getResponse("xacml/requests/himss-soap-request.xml"); Envelope env = (Envelope) jb.getValue(); - Marshaller marshaller = SOAPSAMLXACMLUtil.getMarshaller(); + Marshaller marshaller = JAXBUtil.getMarshaller(SOAPSAMLXACMLUtil.getPackage()); marshaller.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE ); marshaller.marshal(jb, System.out); @@ -96,7 +96,7 @@ ClassLoader tcl = Thread.currentThread().getContextClassLoader(); InputStream is = tcl.getResourceAsStream("xacml/requests/samlxacml.xml"); - Unmarshaller um = SOAPSAMLXACMLUtil.getUnmarshaller(); + Unmarshaller um = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage()); um.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler()); JAXBElement<?> obj = (JAXBElement<?>) um.unmarshal(is); @@ -134,10 +134,10 @@ ClassLoader tcl = Thread.currentThread().getContextClassLoader(); InputStream is = tcl.getResourceAsStream(fileName); - Unmarshaller um = SOAPSAMLXACMLUtil.getUnmarshaller(); + Unmarshaller um = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage()); Object soapRequest = um.unmarshal(is); - Marshaller m = SOAPSAMLXACMLUtil.getMarshaller(); + Marshaller m = JAXBUtil.getMarshaller(SOAPSAMLXACMLUtil.getPackage()); URL url = new URL(endpoint); URLConnection conn = url.openConnection(); Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java 2009-06-09 23:21:28 UTC (rev 598) @@ -36,6 +36,7 @@ import org.jboss.identity.federation.bindings.servlets.SOAPSAMLXACMLServlet; import org.jboss.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil; +import org.jboss.identity.federation.core.util.JAXBUtil; import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Envelope; import org.jboss.identity.federation.org.xmlsoap.schemas.soap.envelope.Fault; import org.jboss.identity.federation.saml.v2.assertion.AssertionType; @@ -80,7 +81,7 @@ sresp.flushBuffer(); //Flush the servlet response ServletOutputStream to our baos bis = new ByteArrayInputStream(baos.toByteArray()); - Unmarshaller un = SOAPSAMLXACMLUtil.getUnmarshaller(); + Unmarshaller un = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage()); JAXBElement<Envelope> jax = (JAXBElement<Envelope>) un.unmarshal(bis); Envelope envelope = jax.getValue(); assertNotNull("Envelope is not null", envelope); @@ -110,7 +111,7 @@ sresp.flushBuffer(); //Flush the servlet response ServletOutputStream to our baos ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray()); - Unmarshaller un = SOAPSAMLXACMLUtil.getUnmarshaller(); + Unmarshaller un = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage()); JAXBElement<Envelope> jax = (JAXBElement<Envelope>) un.unmarshal(bis); Envelope envelope = jax.getValue(); assertNotNull("Envelope is not null", envelope); Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-06-09 23:21:28 UTC (rev 598) @@ -177,7 +177,7 @@ if(is == null) throw new IllegalArgumentException("inputstream is null"); - Unmarshaller un = JBossSAMLAuthnResponseFactory.getValidatingUnmarshaller(); + Unmarshaller un = JBossSAMLAuthnResponseFactory.getUnmarshaller(); JAXBElement<EncryptedElementType> jaxb = (JAXBElement<EncryptedElementType>) un.unmarshal(is); return jaxb.getValue(); } @@ -195,7 +195,7 @@ if(is == null) throw new IllegalArgumentException("inputstream is null"); - Unmarshaller un = JBossSAMLAuthnResponseFactory.getValidatingUnmarshaller(); + Unmarshaller un = JBossSAMLAuthnResponseFactory.getUnmarshaller(); JAXBElement<AssertionType> jaxb = (JAXBElement<AssertionType>) un.unmarshal(is); return jaxb.getValue(); } @@ -208,12 +208,12 @@ * @throws JAXBException */ @SuppressWarnings("unchecked") - public ResponseType getResponseType(InputStream is) throws JAXBException, SAXException + public ResponseType getResponseType(InputStream is) throws JAXBException, SAXException { if(is == null) throw new IllegalArgumentException("inputstream is null"); - Unmarshaller un = JBossSAMLAuthnResponseFactory.getValidatingUnmarshaller(); + Unmarshaller un = JBossSAMLAuthnResponseFactory.getUnmarshaller(); JAXBElement<ResponseType> jaxbAuthnRequestType = (JAXBElement<ResponseType>) un.unmarshal(is); return jaxbAuthnRequestType.getValue(); } @@ -266,7 +266,7 @@ */ public void marshall(ResponseType responseType, OutputStream os) throws JAXBException, SAXException { - Marshaller marshaller = JBossSAMLAuthnResponseFactory.getValidatingMarshaller(); + Marshaller marshaller = JBossSAMLAuthnResponseFactory.getMarshaller(); JAXBElement<ResponseType> jaxb = SAMLProtocolFactory.getObjectFactory().createResponse(responseType); marshaller.marshal(jaxb, os); } @@ -280,7 +280,7 @@ */ public void marshall(ResponseType responseType, Writer writer) throws JAXBException, SAXException { - Marshaller marshaller = JBossSAMLAuthnResponseFactory.getValidatingMarshaller(); + Marshaller marshaller = JBossSAMLAuthnResponseFactory.getMarshaller(); JAXBElement<ResponseType> jaxb = SAMLProtocolFactory.getObjectFactory().createResponse(responseType); marshaller.marshal(jaxb, writer); } Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAMLUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAMLUtil.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAMLUtil.java 2009-06-09 23:21:28 UTC (rev 598) @@ -21,7 +21,6 @@ */ package org.jboss.identity.federation.api.wstrust.plugins.saml; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; @@ -30,6 +29,7 @@ import javax.xml.transform.dom.DOMResult; import org.jboss.identity.federation.api.wstrust.WSTrustConstants; +import org.jboss.identity.federation.core.util.JAXBUtil; import org.jboss.identity.federation.saml.v2.assertion.AssertionType; import org.jboss.identity.federation.saml.v2.assertion.ObjectFactory; import org.w3c.dom.Document; @@ -66,8 +66,7 @@ Document document = null; document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); DOMResult result = new DOMResult(document); - JAXBContext jaxbContext = JAXBContext.newInstance("org.jboss.identity.federation.saml.v2.assertion"); - Marshaller marshaller = jaxbContext.createMarshaller(); + Marshaller marshaller = JAXBUtil.getMarshaller("org.jboss.identity.federation.saml.v2.assertion"); marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new DefaultPrefixMapper()); marshaller.marshal(new ObjectFactory().createAssertion(assertion), result); @@ -84,9 +83,8 @@ * @throws JAXBException if an error occurs while unmarshaling the document. */ public static AssertionType fromDocument(Document document) throws JAXBException - { - JAXBContext jaxbContext = JAXBContext.newInstance("org.jboss.identity.federation.saml.v2.assertion"); - Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + { + Unmarshaller unmarshaller = JAXBUtil.getUnmarshaller("org.jboss.identity.federation.saml.v2.assertion"); Object object = unmarshaller.unmarshal(document); if (object instanceof AssertionType) return (AssertionType) object; Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java 2009-06-09 23:21:28 UTC (rev 598) @@ -180,6 +180,28 @@ * @throws JAXBException * @throws SAXException */ + public static Marshaller getMarshaller() throws SAXException, JAXBException + { + return JAXBUtil.getMarshaller(pkgName); + } + + /** + * Get the JAXB2 Unmarshaller + * @return + * @throws SAXException + * @throws JAXBException + */ + public static Unmarshaller getUnmarshaller() throws JAXBException, SAXException + { + return JAXBUtil.getUnmarshaller(pkgName); + } + + /** + * Get the JAXB2 marshaller + * @return + * @throws JAXBException + * @throws SAXException + */ public static Marshaller getValidatingMarshaller() throws SAXException, JAXBException { return JAXBUtil.getValidatingMarshaller(pkgName, schemaLocation); Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/SOAPSAMLXACMLUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/SOAPSAMLXACMLUtil.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/SOAPSAMLXACMLUtil.java 2009-06-09 23:21:28 UTC (rev 598) @@ -23,14 +23,13 @@ import java.io.StringReader; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactoryConfigurationError; +import org.jboss.identity.federation.core.util.JAXBUtil; import org.jboss.identity.federation.saml.v2.profiles.xacml.assertion.ObjectFactory; import org.jboss.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType; import org.jboss.identity.federation.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType; @@ -54,18 +53,6 @@ private static String collectivePackage = getPackage(); - public static Marshaller getMarshaller() throws JAXBException - { - JAXBContext jaxb = JAXBContext.newInstance(collectivePackage); - return jaxb.createMarshaller(); - } - public static Unmarshaller getUnmarshaller() throws JAXBException - { - JAXBContext jaxb = JAXBContext.newInstance(collectivePackage); - Unmarshaller un = jaxb.createUnmarshaller(); - return un; - } - /** * Parse the XACML Authorization Decision Query from the Dom Element * @param samlRequest @@ -79,7 +66,7 @@ { //We reparse it because the document may have issues with namespaces String elementString = DocumentUtil.getDOMElementAsString(samlRequest); - Unmarshaller um = SOAPSAMLXACMLUtil.getUnmarshaller(); + Unmarshaller um = JAXBUtil.getUnmarshaller(collectivePackage); um.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler()); JAXBElement<?> obj = (JAXBElement<?>) um.unmarshal(new StringReader(elementString)); @@ -95,7 +82,7 @@ return of.createXACMLAuthzDecisionStatementType(); } - private static String getPackage() + public static String getPackage() { StringBuffer buf = new StringBuffer(); buf.append(SOAP_PKG).append(COLON).append(SAML_PROTO_PKG).append(COLON); Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/xmlenc/factories/XMLEncryptionFactory.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/xmlenc/factories/XMLEncryptionFactory.java 2009-06-09 15:15:52 UTC (rev 597) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/xmlenc/factories/XMLEncryptionFactory.java 2009-06-09 23:21:28 UTC (rev 598) @@ -21,10 +21,6 @@ */ package org.jboss.identity.federation.core.xmlenc.factories; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; - import org.jboss.identity.xmlsec.w3.xmlenc.ObjectFactory; @@ -41,12 +37,4 @@ { return factory; } - - public static Marshaller getMarshaller() throws JAXBException - { - JAXBContext jc = JAXBContext.newInstance("org.jboss.identity.xmlsec.w3.xmlenc"); - Marshaller marshaller = jc.createMarshaller(); - marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); - return marshaller; - } } \ No newline at end of file

14 years, 11 months

1
0
0 / 0

JBoss Identity SVN: r597 - in idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api: cfg and 1 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-06-09 11:15:52 -0400 (Tue, 09 Jun 2009) New Revision: 597 Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributeDescription.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Group.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteria.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySession.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySessionFactory.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentityType.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManager.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RealmManager.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Role.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/cfg/IdentityConfiguration.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/cfg/IdentityConfigurationRegistry.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQuery.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQueryBuilder.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/Query.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/QueryBuilder.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/QuerySortOrder.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/RoleQuery.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/RoleQueryBuilder.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQuery.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQueryBuilder.java Log: some of javadoc updates Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributeDescription.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributeDescription.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/AttributeDescription.java 2009-06-09 15:15:52 UTC (rev 597) @@ -24,33 +24,34 @@ /** * Information about attribute + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ public interface AttributeDescription { /** - * @return + * @return attribute name */ String getName(); /** - * @return + * @return attribute type. */ String getType(); /** - * @return + * @return if attribute is readonly */ boolean isReadonly(); /** - * @return + * @return if attribute can have many values */ boolean isMultivalued(); /** - * @return + * @return if attribute is required */ boolean isRequired(); Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Group.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Group.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Group.java 2009-06-09 15:15:52 UTC (rev 597) @@ -27,7 +27,7 @@ /** * Represents a Group. Group has a name that is unique in scope of a given group type. This means that groupType/name pairs * uniquely identifies group. Group Id contains encoded group type and name imformation. In default implementation - * it can look as follows: "group:/GROUP_TYPE/GROUP_NAME". Still prefix and format of Id can change in the future so + * it can look as follows: "jbpid_group_id_._._GROUP_TYPE_._._GROUP_NAME". Still prefix and format of Id can change in the future so * PersistenceManager.createGroupId(String groupName, String groupType) method should be used to create it. * * @author Anil.Saldhana(a)redhat.com Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteria.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteria.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteria.java 2009-06-09 15:15:52 UTC (rev 597) @@ -24,20 +24,58 @@ /** + * Criteria applied to identity objects searches + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ public interface IdentitySearchCriteria { + /** + * Sort results + * @param order + * @return + * @throws UnsupportedCriterium + */ IdentitySearchCriteria sort(SortOrder order) throws UnsupportedCriterium; + /** + * Sort results by attribute name + * + * @param name + * @return + * @throws UnsupportedCriterium + */ IdentitySearchCriteria sortAttributeName(String name) throws UnsupportedCriterium; + /** + * Return only specified page from results + * + * @param firstResult + * @param maxResults + * @return + * @throws UnsupportedCriterium + */ IdentitySearchCriteria page(int firstResult, int maxResults) throws UnsupportedCriterium; + /** + * Filter results by attribute values. All values must be present + * + * @param attributeName + * @param attributeValue + * @return + * @throws UnsupportedCriterium + */ IdentitySearchCriteria attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedCriterium; + /** + * Filter results by id. Wildcard '*' can be used + * + * @param filter + * @return + * @throws UnsupportedCriterium + */ IdentitySearchCriteria idFilter(String filter) throws UnsupportedCriterium; } Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySession.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySession.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySession.java 2009-06-09 15:15:52 UTC (rev 597) @@ -115,24 +115,28 @@ RoleManager getRoleManager() throws FeatureNotSupportedException ; /** - * + * Create UserQueryBuilder object + * * @return */ UserQueryBuilder createUserQueryBuilder(); /** + * Create GroupQueryBuilder object * * @return */ GroupQueryBuilder createGroupQueryBuilder(); /** + * Create RoleQueryBuilder object * * @return */ RoleQueryBuilder createRoleQueryBuilder() throws FeatureNotSupportedException; /** + * Execute UserQuery * * @param userQuery * @return @@ -141,6 +145,7 @@ Collection<User> execute(UserQuery userQuery) throws QueryException; /** + * Execute UserQuery and get unique result * * @param userQuery * @return @@ -149,6 +154,7 @@ User uniqueResult(UserQuery userQuery) throws QueryException; /** + * Execute UserQuery and get results as List * * @param userQuery * @return @@ -157,6 +163,7 @@ List<User> list(UserQuery userQuery) throws QueryException; /** + * Execute GroupQuery * * @param groupQuery * @return @@ -165,6 +172,7 @@ Collection<Group> execute(GroupQuery groupQuery) throws QueryException; /** + * Execute GroupQuery and get unique result * * @param groupQuery * @return @@ -173,6 +181,7 @@ Group uniqueResult(GroupQuery groupQuery) throws QueryException; /** + * Execute GroupQuery and get results as List * * @param groupQuery * @return @@ -181,6 +190,7 @@ List<Group> list(GroupQuery groupQuery) throws QueryException; /** + * Execute RoleQuery * * @param roleQuery * @return @@ -189,6 +199,7 @@ Collection<Role> execute(RoleQuery roleQuery) throws QueryException; /** + * Execute RoleQuery and get unique result * * @param roleQuery * @return @@ -197,6 +208,7 @@ Role uniqueResult(RoleQuery roleQuery) throws QueryException; /** + * Execute RoleQuery and get results as List * * @param roleQuery * @return Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySessionFactory.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySessionFactory.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySessionFactory.java 2009-06-09 15:15:52 UTC (rev 597) @@ -33,12 +33,12 @@ public interface IdentitySessionFactory { /** - * + * Close IdentitySessionFactory */ void close(); /** - * @return + * @return if closed */ boolean isClosed(); Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentityType.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentityType.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentityType.java 2009-06-09 15:15:52 UTC (rev 597) @@ -24,8 +24,7 @@ /** - * Interface representing - * an object of the Identity Model + * Parent interface for User and Group. Represents identity object * * @author Anil.Saldhana(a)redhat.com * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManager.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManager.java 2009-06-09 15:15:52 UTC (rev 597) @@ -46,6 +46,10 @@ */ PersistenceManagerFeaturesDescription getFeaturesDescription(); + /** + * Create IdentitySearchCriteria + * @return + */ IdentitySearchCriteria createIdentitySearchCriteria(); @@ -71,7 +75,7 @@ /** * Create a group Id. Result string can be used in other methods. Group Id contains encoded group type and * name imformation. - * In default implementation it can look as follows: "group:/GROUP_TYPE/GROUP_NAME". + * In default implementation it can look as follows: "jbpid_group_id_._._GROUP_TYPE_._._GROUP_NAME". * Still prefix and format of Id can change in the future so this method should be used to create it. * @param groupName * @param groupType @@ -82,7 +86,7 @@ // Remove /** - * Remove given identity + * Remove given user * * @param user * @param force - if true all present relationships will be removed, if false any present relationship will cause @@ -92,7 +96,7 @@ void removeUser(User user, boolean force) throws IdentityException; /** - * Remove given identity + * Remove given user * * @param id * @param force - if true all present relationships will be removed, if false any present relationship will cause @@ -124,7 +128,7 @@ // Search /** - * @return a number of stored identities + * @return a number of stored users * @throws org.jboss.identity.idm.common.exception.IdentityException */ int getUserCount() @@ -139,7 +143,7 @@ throws IdentityException; /** - * Find identity with a given name + * Find user with a given name * * @param name * @return @@ -148,6 +152,7 @@ User findUser(String name) throws IdentityException; /** + * Obtain users * * @param criteria * @return @@ -178,6 +183,7 @@ /** + * Find groups * * @param groupType * @param criteria @@ -187,6 +193,7 @@ Collection<Group> findGroup(String groupType, IdentitySearchCriteria criteria) throws IdentityException; /** + * Find groups * * @param groupType * @return Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java 2009-06-09 15:15:52 UTC (rev 597) @@ -32,7 +32,7 @@ { /** - * Check if Identity objects can be created and removed + * Check if User objects can be created and removed * @return */ boolean isUsersAddRemoveSupported(); @@ -46,7 +46,7 @@ boolean isGroupsAddRemoveSupported(String groupType); /** - * Check if control can be used in Identity search methods + * Check if criterium can be used in Identity search methods * * @param criteriumType * @return @@ -54,7 +54,7 @@ boolean isUsersSearchCriteriumTypeSupported(IdentitySearchCriteriumType criteriumType); /** - * Check if control can be used in Group search methods + * Check if criterium can be used in Group search methods * * @param groupType * @param criteriumType Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RealmManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RealmManager.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RealmManager.java 2009-06-09 15:15:52 UTC (rev 597) @@ -1,87 +1,89 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ +//TODO: Implement -package org.jboss.identity.idm.api; - -import org.jboss.identity.idm.common.exception.IdentityException; - -import java.io.InputStream; - -/** - * All operations connected with realms. - * Because operations on realms are not often there is no transaction or session support. - * - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public interface RealmManager -{ - - - /** - * Create a Realm or return an already - * created realm. Bootstrapping includes generating - * the models in the realm - * @param realmName - * @return - */ - Realm bootstrap(String realmName) throws IdentityException; - - /** - * Bootstrap a realm given a configuration - * @param realmName - * @param config - * @return - */ - Realm bootstrap(String realmName, InputStream config) throws IdentityException; - - /** - * Associate a relationship between two realms - * @param realmA - * @param realmB - */ - void associate(Realm realmA, Realm realmB) throws IdentityException; - - - /** - * Disassociate a relationship between two realms - * @param realmA - * @param realmB - */ - void disassociate(Realm realmA, Realm realmB) throws IdentityException; - - /** - * @param fromRealm - * @param toRealm - * @return returns a relationship type between this and given Realm. - */ - boolean isAssosiated(Realm fromRealm, Realm toRealm) throws IdentityException; - - /** - * Return a realm - * @param realmName - * @param shouldBootstrap Should we bootstrap if a realm does not exist? - * @return - */ - Realm getRealm(String realmName, boolean shouldBootstrap) throws IdentityException; - -} +///* +//* JBoss, a division of Red Hat +//* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +//* by the @authors tag. See the copyright.txt in the distribution for a +//* full listing of individual contributors. +//* +//* This is free software; you can redistribute it and/or modify it +//* under the terms of the GNU Lesser General Public License as +//* published by the Free Software Foundation; either version 2.1 of +//* the License, or (at your option) any later version. +//* +//* This software is distributed in the hope that it will be useful, +//* but WITHOUT ANY WARRANTY; without even the implied warranty of +//* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +//* Lesser General Public License for more details. +//* +//* You should have received a copy of the GNU Lesser General Public +//* License along with this software; if not, write to the Free +//* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +//* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +//*/ +// +//package org.jboss.identity.idm.api; +// +//import org.jboss.identity.idm.common.exception.IdentityException; +// +//import java.io.InputStream; +// +///** +// * All operations connected with realms. +// * Because operations on realms are not often there is no transaction or session support. +// * +// * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> +// * @version : 0.1 $ +// */ +//public interface RealmManager +//{ +// +// +// /** +// * Create a Realm or return an already +// * created realm. Bootstrapping includes generating +// * the models in the realm +// * @param realmName +// * @return +// */ +// Realm bootstrap(String realmName) throws IdentityException; +// +// /** +// * Bootstrap a realm given a configuration +// * @param realmName +// * @param config +// * @return +// */ +// Realm bootstrap(String realmName, InputStream config) throws IdentityException; +// +// /** +// * Associate a relationship between two realms +// * @param realmA +// * @param realmB +// */ +// void associate(Realm realmA, Realm realmB) throws IdentityException; +// +// +// /** +// * Disassociate a relationship between two realms +// * @param realmA +// * @param realmB +// */ +// void disassociate(Realm realmA, Realm realmB) throws IdentityException; +// +// /** +// * @param fromRealm +// * @param toRealm +// * @return returns a relationship type between this and given Realm. +// */ +// boolean isAssosiated(Realm fromRealm, Realm toRealm) throws IdentityException; +// +// /** +// * Return a realm +// * @param realmName +// * @param shouldBootstrap Should we bootstrap if a realm does not exist? +// * @return +// */ +// Realm getRealm(String realmName, boolean shouldBootstrap) throws IdentityException; +// +//} Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-06-09 15:15:52 UTC (rev 597) @@ -198,7 +198,7 @@ throws IdentityException; /** - * Disassociate identities from groups + * Disassociate users from groups * @param parents * @param members * @throws org.jboss.identity.idm.common.exception.IdentityException @@ -207,7 +207,7 @@ throws IdentityException; /** - * Disassociate identities from groups + * Disassociate users from group * @param parent * @param members * @throws org.jboss.identity.idm.common.exception.IdentityException @@ -216,7 +216,7 @@ throws IdentityException; /** - * Disassociate identities from groups + * Disassociate users from groups * @param parents * @param members * @throws org.jboss.identity.idm.common.exception.IdentityException @@ -225,7 +225,7 @@ throws IdentityException; /** - * Disassociate identities from groups + * Disassociate users from groups * @param parent * @param members * @throws org.jboss.identity.idm.common.exception.IdentityException @@ -335,7 +335,7 @@ IdentitySearchCriteria criteria) throws IdentityException; /** - * Find all groups that given identity is associated with. + * Find all groups that given users is associated with. * @param user child identity * @param groupType can be null * @return @@ -345,7 +345,7 @@ String groupType) throws IdentityException; /** - * Find all groups that given identity is associated with. + * Find all groups that given user is associated with. * * @param user child identity * @param groupType can be null @@ -357,7 +357,7 @@ IdentitySearchCriteria criteria) throws IdentityException; /** - * Find all groups that given identity is associated with. + * Find all groups that given user is associated with. * * @param userId - id of associated user * @param groupType can be null @@ -369,7 +369,7 @@ IdentitySearchCriteria criteria) throws IdentityException; /** - * Find all groups that given identity is associated with. + * Find all groups that given user is associated with. * * @param user child identity * @return @@ -379,7 +379,7 @@ IdentitySearchCriteria criteria) throws IdentityException; /** - * Find all groups that given identity is associated with. + * Find all groups that given user is associated with. * * @param userId * @return @@ -389,7 +389,7 @@ IdentitySearchCriteria criteria) throws IdentityException; /** - * Find all groups that given identity is associated with. + * Find all groups that given user is associated with. * * @param user child identity * @return @@ -398,7 +398,7 @@ Collection<Group> findAssociatedGroups(User user) throws IdentityException; /** - * Find identities that have relationship with given parent group. + * Find users that have relationship with given parent group. * * @param group parent group * @param cascade if true also identities from subgroubs will be retrieved. Default is false @@ -409,7 +409,7 @@ boolean cascade) throws IdentityException; /** - * Find identities that have relationship with given parent group. + * Find users that have relationship with given parent group. * * @param group parent group * @param cascade if true also identities from subgroubs will be retrieved. Default is false @@ -421,7 +421,7 @@ IdentitySearchCriteria criteria) throws IdentityException; /** - * Find identities that have relationship with given parent group. + * Find users that have relationship with given parent group. * * @param groupId parent group id * @param cascade if true also identities from subgroubs will be retrieved. Default is false @@ -458,7 +458,7 @@ IdentitySearchCriteria criteria) throws IdentityException; /** - * Find identities that have relationship with given parent group. Will return users connected with a given group with a role + * Find users that have relationship with given parent group. Will return users connected with a given group with a role * * @param group parent group * @return @@ -467,7 +467,7 @@ Collection<User> findRelatedUsers(Group group, IdentitySearchCriteria criteria) throws IdentityException; /** - * Find identities that have relationship with given parent group. Will return users connected with a given group with a role + * Find users that have relationship with given parent group. Will return users connected with a given group with a role * * @param groupId parent group id * @return Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java 2009-06-09 15:15:52 UTC (rev 597) @@ -47,7 +47,7 @@ boolean isGroupAssociationSupported(String fromGroupType, String toGroupType); /** - * Check if control can be used in Identity search methods + * Check if control can be used in User search methods * * @param criteriumType * @return Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Role.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Role.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/Role.java 2009-06-09 15:15:52 UTC (rev 597) @@ -23,8 +23,8 @@ /** - * Marker Interface represents a role. Role is a direct one-to-one typed relationship between Identity and Group objects. - * Each Identity and Group object pair can have several Role objects associated with them with different RoleType specified. + * Marker Interface represents a role. Role is a direct one-to-one typed relationship between User and Group objects. + * Each User and Group object pair can have several Role objects associated with them with different RoleType specified. * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @since Jun 30, 2008 @@ -38,7 +38,7 @@ RoleType getRoleType(); /** - * @return identity participating in this role + * @return user participating in this role */ User getUser(); Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java 2009-06-09 15:15:52 UTC (rev 597) @@ -216,7 +216,7 @@ Collection<RoleType> findRoleTypes(User user, Group group) throws IdentityException; /** - * Find RoleType objects for roles associated with a given Identity + * Find RoleType objects for roles associated with a given User * @param user * @return * @throws IdentityException @@ -224,7 +224,7 @@ Collection<RoleType> findUserRoleTypes(User user) throws IdentityException; /** - * Find RoleType objects for roles associated with a given Identity + * Find RoleType objects for roles associated with a given User * @param user * @return * @throws IdentityException @@ -232,7 +232,7 @@ Collection<RoleType> findUserRoleTypes(User user, IdentitySearchCriteria criteria) throws IdentityException; /** - * Find RoleType objects for roles associated with a given Identity + * Find RoleType objects for roles associated with a given User * @param userId * @return * @throws IdentityException Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/cfg/IdentityConfiguration.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/cfg/IdentityConfiguration.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/cfg/IdentityConfiguration.java 2009-06-09 15:15:52 UTC (rev 597) @@ -28,18 +28,45 @@ import java.io.File; /** + * IdentityConfiguration can be populated from config file or resource. Enables to bootstrap IdentitySessionFactory + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ public interface IdentityConfiguration { + /** + * Populate IdentityConfiguration from config file + * + * @param configFile + * @return + * @throws IdentityConfigurationException + */ IdentityConfiguration configure(File configFile) throws IdentityConfigurationException; + /** + * Populate IdentityConfigration from config resource + * + * @param configResource + * @return + * @throws IdentityConfigurationException + */ IdentityConfiguration configure(String configResource) throws IdentityConfigurationException; + /** + * Bootstrap IdentitySessionFactory + * + * @return + * @throws IdentityConfigurationException + */ IdentitySessionFactory buildIdentitySessionFactory() throws IdentityConfigurationException; + /** + * Obtain IdentityConfigurationRegistry related to this IdentityConfiguration + * + * @return + */ IdentityConfigurationRegistry getIdentityConfigurationRegistry(); } Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/cfg/IdentityConfigurationRegistry.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/cfg/IdentityConfigurationRegistry.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/cfg/IdentityConfigurationRegistry.java 2009-06-09 15:15:52 UTC (rev 597) @@ -25,6 +25,8 @@ import org.jboss.identity.idm.common.exception.IdentityException; /** + * Simple registry enables to register object instance and then reference it from configuration file. + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQuery.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQuery.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQuery.java 2009-06-09 15:15:52 UTC (rev 597) @@ -30,6 +30,8 @@ import java.util.List; /** + * Query for Group objects + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQueryBuilder.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQueryBuilder.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQueryBuilder.java 2009-06-09 15:15:52 UTC (rev 597) @@ -29,57 +29,207 @@ import java.util.Collection; /** + * Expose operations to set conditions for Group search and create GroupQuery + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ public interface GroupQueryBuilder extends QueryBuilder { + /** + * Create GroupQuery based on conditions set using other GroupQueryBuilder methods. + * @return + */ GroupQuery createQuery(); + /** + * Reset all query conditions + * @return + */ GroupQueryBuilder reset(); + /** + * Search for a Group with a given ID + * + * @param id + * @return + */ GroupQueryBuilder setId(String id); + /** + * Search for groups with a given name and type + * @param name + * @param type + * @return + */ GroupQueryBuilder setNameAndType(String name, String type); + /** + * Search for groups with a given name + * + * @param name + * @return + */ GroupQueryBuilder setName(String name); + /** + * Search for groups with a given type + * @param type + * @return + */ GroupQueryBuilder setType(String type); + /** + * Search for groups that are associated with a given group + * + * @param group + * @param parent + * @return + */ GroupQueryBuilder addAssociatedGroup(Group group, boolean parent); + /** + * Search for groups that are associated with a given group + * + * @param id + * @param parent + * @return + */ GroupQueryBuilder addAssociatedGroup(String id, boolean parent); + /** + * Search for groups that are associated with a given groups + * @param groups + * @param parent + * @return + */ GroupQueryBuilder addAssociatedGroups(Collection<Group> groups, boolean parent); + /** + * Search for groups that are associated with a given groups + * + * @param ids + * @param parent + * @return + */ GroupQueryBuilder addAssociatedGroupsIds(Collection<String> ids, boolean parent); + /** + * Search for groups that are associated with a given user + * + * @param user + * @return + */ GroupQueryBuilder addAssociatedUser(User user); + /** + * Search for groups that are associated with a given user + * + * @param id + * @return + */ GroupQueryBuilder addAssociatedUser(String id); + /** + * Search for groups that are associated with a given users + * + * @param users + * @return + */ GroupQueryBuilder addAssociatedUsers(Collection<User> users); + /** + * Search for groups that are associated with a given users + * + * @param ids + * @return + */ GroupQueryBuilder addAssociatedUsersIds(Collection<String> ids); + /** + * Search for groups that are connected with a Role with a given user + * + * @param user + * @return + */ GroupQueryBuilder addUserConnectedByRole(User user); + /** + * Search for groups that are connected with a Role with a given user + * + * @param id + * @return + */ GroupQueryBuilder addUserConnectedByRole(String id); + /** + * Search for groups that are connected with a Role with a given users + * + * @param users + * @return + */ GroupQueryBuilder addUsersConnectedByRole(Collection<User> users); + /** + * Search for groups that are connected with a Role with a given users + * + * @param ids + * @return + */ GroupQueryBuilder addUsersIdsConnectedByRole(Collection<String> ids); + /** + * Search for groups that are associated or connected with a Role with a given user + * + * @param user + * @return + */ GroupQueryBuilder addRelatedUser(User user); + /** + * Search for groups that are associated or connected with a Role with a given user + * + * @param id + * @return + */ GroupQueryBuilder addRelatedUser(String id); + /** + * Sort results + * + * @param order + * @return + * @throws UnsupportedQueryCriterium + */ GroupQueryBuilder sort(SortOrder order) throws UnsupportedQueryCriterium; + /** + * Sort by attribute name + * + * @param name + * @return + * @throws UnsupportedQueryCriterium + */ GroupQueryBuilder sortAttributeName(String name) throws UnsupportedQueryCriterium; + /** + * Return specified page from results + * + * @param firstResult + * @param maxResults + * @return + * @throws UnsupportedQueryCriterium + */ GroupQueryBuilder page(int firstResult, int maxResults) throws UnsupportedQueryCriterium; + /** + * Filter resuts by a given attribute values. All values need to be present + * + * @param attributeName + * @param attributeValue + * @return + * @throws UnsupportedQueryCriterium + */ GroupQueryBuilder attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedQueryCriterium; } Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/Query.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/Query.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/Query.java 2009-06-09 15:15:52 UTC (rev 597) @@ -26,6 +26,8 @@ import java.util.List; /** + * Parent Query interface + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/QueryBuilder.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/QueryBuilder.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/QueryBuilder.java 2009-06-09 15:15:52 UTC (rev 597) @@ -23,6 +23,9 @@ package org.jboss.identity.idm.api.query; /** + * Parent interface for query builders. QueryBuilder exposes methods to set query conditions. If many conditions are set + * logical AND operation will be used to compute results. + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/QuerySortOrder.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/QuerySortOrder.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/QuerySortOrder.java 2009-06-09 15:15:52 UTC (rev 597) @@ -24,6 +24,8 @@ package org.jboss.identity.idm.api.query;/** /** + * Sort order + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/RoleQuery.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/RoleQuery.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/RoleQuery.java 2009-06-09 15:15:52 UTC (rev 597) @@ -32,6 +32,8 @@ import java.util.List; /** + * Query for Role objects + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/RoleQueryBuilder.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/RoleQueryBuilder.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/RoleQueryBuilder.java 2009-06-09 15:15:52 UTC (rev 597) @@ -28,29 +28,88 @@ import org.jboss.identity.idm.api.IdentityType; /** + * Expose operations to set conditions for Role search and create RoleQuery + * + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ public interface RoleQueryBuilder extends QueryBuilder { + /** + * Create RoleQuery based on specified conditions + * @return + */ RoleQuery createQuery(); + /** + * Reset query conditions + * @return + */ RoleQueryBuilder reset(); + /** + * Search for roles connected with a given user + * + * @param user + * @return + */ RoleQueryBuilder setUser(User user); + /** + * Search for roles connected with a given user + * + * @param id + * @return + */ RoleQueryBuilder setUser(String id); + /** + * Search for roles connected with a given group + * + * @param group + * @return + */ RoleQueryBuilder setGroup(Group group); + /** + * Search for roles connected with a given group + * + * @param id + * @return + */ RoleQueryBuilder setGroup(String id); + /** + * Search for roles with a given RoleType + * + * @param roleType + * @return + */ RoleQueryBuilder setRoleType(RoleType roleType); + /** + * Search for roles with a given RoleType name + * + * @param string + * @return + */ RoleQueryBuilder setRoleType(String string); + /** + * Search for roles connected with a given IdentityType object + * + * @param identityType + * @return + */ RoleQueryBuilder setIdentityType(IdentityType identityType); + /** + * Search for roles connected with a given IdentityType object + * + * @param id + * @return + */ RoleQueryBuilder setIdentityTypeId(String id); } Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQuery.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQuery.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQuery.java 2009-06-09 15:15:52 UTC (rev 597) @@ -30,6 +30,8 @@ import java.util.List; /** + * Query for User objects + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQueryBuilder.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQueryBuilder.java 2009-06-05 16:22:07 UTC (rev 596) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQueryBuilder.java 2009-06-09 15:15:52 UTC (rev 597) @@ -28,50 +28,174 @@ import java.util.Collection; /** + * Expose operations to set conditions for User search and create UserQuery + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ public interface UserQueryBuilder extends QueryBuilder { - + + /** + * Create UserQuery based on specified conditions + * @return + */ UserQuery createQuery(); + /** + * Reset all set conditions + * @return + */ UserQueryBuilder reset(); + /** + * Search for user with a given id + * @param id + * @return + */ UserQueryBuilder withUserId(String id); + /** + * Search for users associated with a given group + * + * @param group + * @return + */ UserQueryBuilder addAssociatedGroup(Group group); + /** + * Search for users associated with a given group + * + * @param id + * @return + */ UserQueryBuilder addAssociatedGroup(String id); + /** + * Search for users associated with a given groups + * + * @param groups + * @return + */ UserQueryBuilder addAssociatedGroups(Collection<Group> groups); + /** + * Search for users associated with a given groups + * + * @param groups + * @return + */ UserQueryBuilder addAssociatedGroupsIds(Collection<String> groups); + /** + * Search for users that are connected with role with a given group + * + * + * @param group + * @return + */ UserQueryBuilder addGroupConnectedWithRole(Group group); + /** + * Search for users that are connected with role with a given group + * + * @param id + * @return + */ UserQueryBuilder addGroupConnectedWithRole(String id); + /** + * Search for users that are connected with role with a given groups + * + * @param groups + * @return + */ UserQueryBuilder addGroupsConnectedWithRole(Collection<Group> groups); + /** + * Search for users that are connected with role with a given group + * + * @param groups + * @return + */ UserQueryBuilder addGroupsIdsConnectedWithRole(Collection<String> groups); + /** + * Search for users that are connected with role or associated with a given group + * + * @param group + * @return + */ UserQueryBuilder addRelatedGroup(Group group); + /** + * Search for users that are connected with role or associated with a given group + * + * @param id + * @return + */ UserQueryBuilder addRelatedGroup(String id); + /** + * Search for users that are connected with role or associated with a given group + * + * @param group + * @return + */ UserQueryBuilder addRelatedGroups(Collection<Group> group); + /** + * Search for users that are connected with role or associated with a given group + * + * @param ids + * @return + */ UserQueryBuilder addRelatedGroupsIds(Collection<String> ids); + /** + * Sort results + * + * @param order + * @return + * @throws UnsupportedQueryCriterium + */ UserQueryBuilder sort(SortOrder order) throws UnsupportedQueryCriterium; + /** + * Sort results using given attribute name + * @param name + * @return + * @throws UnsupportedQueryCriterium + */ UserQueryBuilder sortAttributeName(String name) throws UnsupportedQueryCriterium; + /** + * Return page from results + * + * @param firstResult + * @param maxResults + * @return + * @throws UnsupportedQueryCriterium + */ UserQueryBuilder page(int firstResult, int maxResults) throws UnsupportedQueryCriterium; + /** + * Filter results using attribute values. All specified values must be present + * + * @param attributeName + * @param attributeValue + * @return + * @throws UnsupportedQueryCriterium + */ UserQueryBuilder attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedQueryCriterium; + /** + * Filter results using id filter. Wildcard '*' can be used. + * + * @param idFilter + * @return + * @throws UnsupportedQueryCriterium + */ UserQueryBuilder idFilter(String idFilter) throws UnsupportedQueryCriterium; }

14 years, 11 months

1
0
0 / 0

JBoss Identity SVN: r596 - in consolidated-build/trunk: identity-build-jbas and 2 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-06-05 12:22:07 -0400 (Fri, 05 Jun 2009) New Revision: 596 Modified: consolidated-build/trunk/identity-build-jbas/pom.xml consolidated-build/trunk/identity-build-tomcat/pom.xml consolidated-build/trunk/parent/pom.xml consolidated-build/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: consolidated-build/trunk/identity-build-jbas/pom.xml =================================================================== --- consolidated-build/trunk/identity-build-jbas/pom.xml 2009-06-05 16:22:02 UTC (rev 595) +++ consolidated-build/trunk/identity-build-jbas/pom.xml 2009-06-05 16:22:07 UTC (rev 596) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-build-parent</artifactId> - <version>1.0.0.alpha3</version> + <version>1.0.0.alpha3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: consolidated-build/trunk/identity-build-tomcat/pom.xml =================================================================== --- consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-06-05 16:22:02 UTC (rev 595) +++ consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-06-05 16:22:07 UTC (rev 596) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-build-parent</artifactId> - <version>1.0.0.alpha3</version> + <version>1.0.0.alpha3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: consolidated-build/trunk/parent/pom.xml =================================================================== --- consolidated-build/trunk/parent/pom.xml 2009-06-05 16:22:02 UTC (rev 595) +++ consolidated-build/trunk/parent/pom.xml 2009-06-05 16:22:07 UTC (rev 596) @@ -8,7 +8,7 @@ <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-build-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0.alpha3</version> + <version>1.0.0.alpha3-SNAPSHOT</version> <name>JBoss Identity build- Parent</name> <url>http://labs.jboss.org/portal/jbossidentity/</url> <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description> @@ -23,8 +23,8 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection> </scm> <build> Modified: consolidated-build/trunk/pom.xml =================================================================== --- consolidated-build/trunk/pom.xml 2009-06-05 16:22:02 UTC (rev 595) +++ consolidated-build/trunk/pom.xml 2009-06-05 16:22:07 UTC (rev 596) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-build-parent</artifactId> - <version>1.0.0.alpha3</version> + <version>1.0.0.alpha3-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

14 years, 11 months

1
0
0 / 0

JBoss Identity SVN: r595 - in consolidated-build/tags: 1.0.0.alpha3 and 3 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-06-05 12:22:02 -0400 (Fri, 05 Jun 2009) New Revision: 595 Added: consolidated-build/tags/1.0.0.alpha3/ consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/bin.xml consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/pom.xml consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/bin.xml consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/pom.xml consolidated-build/tags/1.0.0.alpha3/parent/pom.xml consolidated-build/tags/1.0.0.alpha3/pom.xml Removed: consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/bin.xml consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/pom.xml consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/bin.xml consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/pom.xml consolidated-build/tags/1.0.0.alpha3/parent/pom.xml consolidated-build/tags/1.0.0.alpha3/pom.xml Log: [maven-release-plugin] copy for tag 1.0.0.alpha3 Copied: consolidated-build/tags/1.0.0.alpha3 (from rev 562, consolidated-build/trunk) Deleted: consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/bin.xml =================================================================== --- consolidated-build/trunk/identity-build-jbas/bin.xml 2009-06-02 21:24:03 UTC (rev 562) +++ consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/bin.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -1,17 +0,0 @@ -<assembly> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <includes> - <include>org.jboss.identity:idm</include> - <include>org.jboss.identity:jboss-identity-bindings</include> - <include>org.jboss.identity:jboss-identity-bindings-jboss</include> - <include>org.jboss.identity:jboss-identity-fed</include> - <include>org.jboss.security:jbossxacml</include> - </includes> - </dependencySet> - </dependencySets> -</assembly> Copied: consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/bin.xml (from rev 593, consolidated-build/trunk/identity-build-jbas/bin.xml) =================================================================== --- consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/bin.xml (rev 0) +++ consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/bin.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -0,0 +1,17 @@ +<assembly> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <includes> + <include>org.jboss.identity.idm:jbossidm</include> + <include>org.jboss.identity:jboss-identity-bindings</include> + <include>org.jboss.identity:jboss-identity-bindings-jboss</include> + <include>org.jboss.identity:jboss-identity-fed</include> + <include>org.jboss.security:jbossxacml</include> + </includes> + </dependencySet> + </dependencySets> +</assembly> Deleted: consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/pom.xml =================================================================== --- consolidated-build/trunk/identity-build-jbas/pom.xml 2009-06-02 21:24:03 UTC (rev 562) +++ consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/pom.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -1,82 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-platform-parent</artifactId> - <version>1.0.0.alpha2-SNAPSHOT</version> - <relativePath>../parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-identity-platform-jbas</artifactId> - <packaging>pom</packaging> - <name>JBoss Identity Platform to run on JBoss AS</name> - <url>http://labs.jboss.org/portal/jbossidentity/</url> - <description>JBoss Identity Platform provides a collection of individual projects as a unified solution.</description> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt</url> - </license> - </licenses> - <organization> - <name>JBoss Inc.</name> - <url>http://www.jboss.org</url> - </organization> - - - <dependencies> - <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>idm</artifactId> - <version>${idm}</version> - </dependency> - <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-bindings-jboss</artifactId> - <version>${idfed}</version> - </dependency> - <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-fed</artifactId> - <version>${idfed}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-3</version> - <executions> - <execution> - <id>bundle-project-sources</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <archive> - <manifestEntries> - <Specification-Title>JBoss Identity</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor> - <Implementation-Title>JBoss Identity</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-VendorId>org.jboss.security</Implementation-VendorId> - <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor> - <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL> - </manifestEntries> - </archive> - <descriptors> - <descriptor>bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <properties> - <idm>1.0.0.Alpha2</idm> - <idfed>1.0.0.alpha2</idfed> - <xacml>1.0.0.alpha2</xacml> - </properties> -</project> Copied: consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/pom.xml (from rev 594, consolidated-build/trunk/identity-build-jbas/pom.xml) =================================================================== --- consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/pom.xml (rev 0) +++ consolidated-build/tags/1.0.0.alpha3/identity-build-jbas/pom.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -0,0 +1,81 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-build-parent</artifactId> + <version>1.0.0.alpha3</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-identity-build-jbas</artifactId> + <packaging>pom</packaging> + <name>JBoss Identity build to run on JBoss AS</name> + <url>http://labs.jboss.org/portal/jbossidentity/</url> + <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + + + <dependencies> + <dependency> + <groupId>org.jboss.identity.idm</groupId> + <artifactId>jbossidm</artifactId> + <version>${idm}</version> + </dependency> + <dependency> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-bindings-jboss</artifactId> + <version>${idfed}</version> + </dependency> + <dependency> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-fed</artifactId> + <version>${idfed}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-3</version> + <executions> + <execution> + <id>bundle-project-sources</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <archive> + <manifestEntries> + <Specification-Title>JBoss Identity</Specification-Title> + <Specification-Version>${project.version}</Specification-Version> + <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor> + <Implementation-Title>JBoss Identity</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-VendorId>org.jboss.security</Implementation-VendorId> + <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor> + <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL> + </manifestEntries> + </archive> + <descriptors> + <descriptor>bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> + <idm>1.0.0.Alpha8</idm> + <idfed>1.0.0.alpha3</idfed> + </properties> +</project> Deleted: consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/bin.xml =================================================================== --- consolidated-build/trunk/identity-build-tomcat/bin.xml 2009-06-02 21:24:03 UTC (rev 562) +++ consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/bin.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -1,16 +0,0 @@ -<assembly> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <includes> - <include>org.jboss.identity:idm</include> - <include>org.jboss.identity:jboss-identity-bindings</include> - <include>org.jboss.identity:jboss-identity-fed</include> - <include>org.jboss.security:jbossxacml</include> - </includes> - </dependencySet> - </dependencySets> -</assembly> Copied: consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/bin.xml (from rev 593, consolidated-build/trunk/identity-build-tomcat/bin.xml) =================================================================== --- consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/bin.xml (rev 0) +++ consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/bin.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -0,0 +1,16 @@ +<assembly> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <includes> + <include>org.jboss.identity.idm:jbossidm</include> + <include>org.jboss.identity:jboss-identity-bindings</include> + <include>org.jboss.identity:jboss-identity-fed</include> + <include>org.jboss.security:jbossxacml</include> + </includes> + </dependencySet> + </dependencySets> +</assembly> Deleted: consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/pom.xml =================================================================== --- consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-06-02 21:24:03 UTC (rev 562) +++ consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/pom.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -1,82 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-platform-parent</artifactId> - <version>1.0.0.alpha2-SNAPSHOT</version> - <relativePath>../parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-identity-platform-tomcat</artifactId> - <packaging>pom</packaging> - <name>JBoss Identity Platform to run on Tomcat</name> - <url>http://labs.jboss.org/portal/jbossidentity/</url> - <description>JBoss Identity Platform provides a collection of individual projects as a unified solution.</description> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt</url> - </license> - </licenses> - <organization> - <name>JBoss Inc.</name> - <url>http://www.jboss.org</url> - </organization> - - - <dependencies> - <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>idm</artifactId> - <version>${idm}</version> - </dependency> - <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-bindings</artifactId> - <version>${idfed}</version> - </dependency> - <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-fed</artifactId> - <version>${idfed}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-3</version> - <executions> - <execution> - <id>bundle-project-sources</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <archive> - <manifestEntries> - <Specification-Title>JBoss Identity</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor> - <Implementation-Title>JBoss Identity</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-VendorId>org.jboss.security</Implementation-VendorId> - <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor> - <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL> - </manifestEntries> - </archive> - <descriptors> - <descriptor>bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <properties> - <idm>1.0.0.Alpha2</idm> - <idfed>1.0.0.alpha2</idfed> - <xacml>1.0.0.alpha2</xacml> - </properties> -</project> Copied: consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/pom.xml (from rev 594, consolidated-build/trunk/identity-build-tomcat/pom.xml) =================================================================== --- consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/pom.xml (rev 0) +++ consolidated-build/tags/1.0.0.alpha3/identity-build-tomcat/pom.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -0,0 +1,81 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-build-parent</artifactId> + <version>1.0.0.alpha3</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-identity-build-tomcat</artifactId> + <packaging>pom</packaging> + <name>JBoss Identity build to run on Tomcat</name> + <url>http://labs.jboss.org/portal/jbossidentity/</url> + <description>JBoss Identity build provides a collection of individual projects as a unified solution.</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + + + <dependencies> + <dependency> + <groupId>org.jboss.identity.idm</groupId> + <artifactId>jbossidm</artifactId> + <version>${idm}</version> + </dependency> + <dependency> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-bindings</artifactId> + <version>${idfed}</version> + </dependency> + <dependency> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-fed</artifactId> + <version>${idfed}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-3</version> + <executions> + <execution> + <id>bundle-project-sources</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <archive> + <manifestEntries> + <Specification-Title>JBoss Identity</Specification-Title> + <Specification-Version>${project.version}</Specification-Version> + <Specification-Vendor>Red Hat Middleware LLC</Specification-Vendor> + <Implementation-Title>JBoss Identity</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-VendorId>org.jboss.security</Implementation-VendorId> + <Implementation-Vendor>Red Hat Middleware LLC</Implementation-Vendor> + <Implementation-URL>http://labs.jboss.org/portal/jbosssecurity/</Implementation-URL> + </manifestEntries> + </archive> + <descriptors> + <descriptor>bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> + <idm>1.0.0.Alpha8</idm> + <idfed>1.0.0.alpha3</idfed> + </properties> +</project> Deleted: consolidated-build/tags/1.0.0.alpha3/parent/pom.xml =================================================================== --- consolidated-build/trunk/parent/pom.xml 2009-06-02 21:24:03 UTC (rev 562) +++ consolidated-build/tags/1.0.0.alpha3/parent/pom.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -1,111 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss</groupId> - <artifactId>jboss-parent</artifactId> - <version>4</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-platform-parent</artifactId> - <packaging>pom</packaging> - <version>1.0.0.alpha2-SNAPSHOT</version> - <name>JBoss Identity platform- Parent</name> - <url>http://labs.jboss.org/portal/jbossidentity/</url> - <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description> - <licenses> - <license> - <name>lgpl</name> - <url>http://repository.jboss.com/licenses/lgpl.txt</url> - </license> - </licenses> - <organization> - <name>JBoss Inc.</name> - <url>http://www.jboss.org</url> - </organization> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/platform-build/tags/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/platform-build/tags/1.0...</developerConnection> - </scm> - - <build> - <plugins> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/jbossidentity/platform-build/tags</tagBase> - </configuration> - </plugin> - </plugins> - </build> - - <repositories> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Repository</name> - <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - - <repository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshots Repository</name> - <layout>default</layout> - <url>http://snapshots.jboss.org/maven2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> - <groupId>org.apache</groupId> - <artifactId>xmlsec</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>apache-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1.9</version> - </dependency> - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1.9</version> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jbossxacml</artifactId> - <version>2.0.3.CR1</version> - </dependency> - </dependencies> - </dependencyManagement> -</project> Copied: consolidated-build/tags/1.0.0.alpha3/parent/pom.xml (from rev 594, consolidated-build/trunk/parent/pom.xml) =================================================================== --- consolidated-build/tags/1.0.0.alpha3/parent/pom.xml (rev 0) +++ consolidated-build/tags/1.0.0.alpha3/parent/pom.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -0,0 +1,111 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-build-parent</artifactId> + <packaging>pom</packaging> + <version>1.0.0.alpha3</version> + <name>JBoss Identity build- Parent</name> + <url>http://labs.jboss.org/portal/jbossidentity/</url> + <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection> + </scm> + + <build> + <plugins> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags</tagBase> + </configuration> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <layout>default</layout> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <dependency> + <groupId>org.apache</groupId> + <artifactId>xmlsec</artifactId> + <version>1.4.1</version> + </dependency> + <dependency> + <groupId>apache-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.1.9</version> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.1.9</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbossxacml</artifactId> + <version>2.0.3</version> + </dependency> + </dependencies> + </dependencyManagement> +</project> Deleted: consolidated-build/tags/1.0.0.alpha3/pom.xml =================================================================== --- consolidated-build/trunk/pom.xml 2009-06-02 21:24:03 UTC (rev 562) +++ consolidated-build/tags/1.0.0.alpha3/pom.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -1,21 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-platform-parent</artifactId> - <version>1.0.0.alpha2-SNAPSHOT</version> - <relativePath>parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-platform-pom</artifactId> - <packaging>pom</packaging> - <name>JBoss Identity Platform- Aggregator</name> - <url>http://labs.jboss.org/portal/jbossidentity/</url> - <description>JBoss Identity Platform is the identity project for JEMS projects</description> - - <modules> - <module>parent</module> - <module>identity-platform-tomcat</module> - <module>identity-platform-jbas</module> - </modules> -</project> Copied: consolidated-build/tags/1.0.0.alpha3/pom.xml (from rev 594, consolidated-build/trunk/pom.xml) =================================================================== --- consolidated-build/tags/1.0.0.alpha3/pom.xml (rev 0) +++ consolidated-build/tags/1.0.0.alpha3/pom.xml 2009-06-05 16:22:02 UTC (rev 595) @@ -0,0 +1,21 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-build-parent</artifactId> + <version>1.0.0.alpha3</version> + <relativePath>parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.identity</groupId> + <artifactId>jboss-identity-consolidated-pom</artifactId> + <packaging>pom</packaging> + <name>JBoss Identity consolidated- Aggregator</name> + <url>http://labs.jboss.org/portal/jbossidentity/</url> + <description>JBoss Identity Platform is the identity project for JEMS projects</description> + + <modules> + <module>parent</module> + <module>identity-build-tomcat</module> + <module>identity-build-jbas</module> + </modules> +</project>

14 years, 11 months

1
0
0 / 0

JBoss Identity SVN: r594 - in consolidated-build/trunk: identity-build-jbas and 2 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-06-05 12:21:55 -0400 (Fri, 05 Jun 2009) New Revision: 594 Modified: consolidated-build/trunk/identity-build-jbas/pom.xml consolidated-build/trunk/identity-build-tomcat/pom.xml consolidated-build/trunk/parent/pom.xml consolidated-build/trunk/pom.xml Log: [maven-release-plugin] prepare release 1.0.0.alpha3 Modified: consolidated-build/trunk/identity-build-jbas/pom.xml =================================================================== --- consolidated-build/trunk/identity-build-jbas/pom.xml 2009-06-05 16:21:02 UTC (rev 593) +++ consolidated-build/trunk/identity-build-jbas/pom.xml 2009-06-05 16:21:55 UTC (rev 594) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-build-parent</artifactId> - <version>1.0.0.alpha2-SNAPSHOT</version> + <version>1.0.0.alpha3</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: consolidated-build/trunk/identity-build-tomcat/pom.xml =================================================================== --- consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-06-05 16:21:02 UTC (rev 593) +++ consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-06-05 16:21:55 UTC (rev 594) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-build-parent</artifactId> - <version>1.0.0.alpha2-SNAPSHOT</version> + <version>1.0.0.alpha3</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: consolidated-build/trunk/parent/pom.xml =================================================================== --- consolidated-build/trunk/parent/pom.xml 2009-06-05 16:21:02 UTC (rev 593) +++ consolidated-build/trunk/parent/pom.xml 2009-06-05 16:21:55 UTC (rev 594) @@ -8,7 +8,7 @@ <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-build-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0.alpha2-SNAPSHOT</version> + <version>1.0.0.alpha3</version> <name>JBoss Identity build- Parent</name> <url>http://labs.jboss.org/portal/jbossidentity/</url> <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description> @@ -23,8 +23,8 @@ <url>http://www.jboss.org</url> </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossidentity/consolidated-build/t...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossidentity/consolidated-build/tags...</developerConnection> </scm> <build> Modified: consolidated-build/trunk/pom.xml =================================================================== --- consolidated-build/trunk/pom.xml 2009-06-05 16:21:02 UTC (rev 593) +++ consolidated-build/trunk/pom.xml 2009-06-05 16:21:55 UTC (rev 594) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-build-parent</artifactId> - <version>1.0.0.alpha2-SNAPSHOT</version> + <version>1.0.0.alpha3</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

14 years, 11 months

1
0
0 / 0

JBoss Identity SVN: r593 - in consolidated-build/trunk: identity-build-tomcat and 1 other directory.

by jboss-identity-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2009-06-05 12:21:02 -0400 (Fri, 05 Jun 2009) New Revision: 593 Modified: consolidated-build/trunk/identity-build-jbas/bin.xml consolidated-build/trunk/identity-build-jbas/pom.xml consolidated-build/trunk/identity-build-tomcat/bin.xml consolidated-build/trunk/identity-build-tomcat/pom.xml Log: update poms with deps Modified: consolidated-build/trunk/identity-build-jbas/bin.xml =================================================================== --- consolidated-build/trunk/identity-build-jbas/bin.xml 2009-06-05 05:12:33 UTC (rev 592) +++ consolidated-build/trunk/identity-build-jbas/bin.xml 2009-06-05 16:21:02 UTC (rev 593) @@ -6,7 +6,7 @@ <dependencySets> <dependencySet> <includes> - <include>org.jboss.identity:idm</include> + <include>org.jboss.identity.idm:jbossidm</include> <include>org.jboss.identity:jboss-identity-bindings</include> <include>org.jboss.identity:jboss-identity-bindings-jboss</include> <include>org.jboss.identity:jboss-identity-fed</include> Modified: consolidated-build/trunk/identity-build-jbas/pom.xml =================================================================== --- consolidated-build/trunk/identity-build-jbas/pom.xml 2009-06-05 05:12:33 UTC (rev 592) +++ consolidated-build/trunk/identity-build-jbas/pom.xml 2009-06-05 16:21:02 UTC (rev 593) @@ -25,8 +25,8 @@ <dependencies> <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>idm</artifactId> + <groupId>org.jboss.identity.idm</groupId> + <artifactId>jbossidm</artifactId> <version>${idm}</version> </dependency> <dependency> @@ -75,8 +75,7 @@ </plugins> </build> <properties> - <idm>1.0.0.Alpha6</idm> - <idfed>1.0.0.alpha2</idfed> - <xacml>1.0.0.alpha2</xacml> + <idm>1.0.0.Alpha8</idm> + <idfed>1.0.0.alpha3</idfed> </properties> </project> Modified: consolidated-build/trunk/identity-build-tomcat/bin.xml =================================================================== --- consolidated-build/trunk/identity-build-tomcat/bin.xml 2009-06-05 05:12:33 UTC (rev 592) +++ consolidated-build/trunk/identity-build-tomcat/bin.xml 2009-06-05 16:21:02 UTC (rev 593) @@ -6,7 +6,7 @@ <dependencySets> <dependencySet> <includes> - <include>org.jboss.identity:idm</include> + <include>org.jboss.identity.idm:jbossidm</include> <include>org.jboss.identity:jboss-identity-bindings</include> <include>org.jboss.identity:jboss-identity-fed</include> <include>org.jboss.security:jbossxacml</include> Modified: consolidated-build/trunk/identity-build-tomcat/pom.xml =================================================================== --- consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-06-05 05:12:33 UTC (rev 592) +++ consolidated-build/trunk/identity-build-tomcat/pom.xml 2009-06-05 16:21:02 UTC (rev 593) @@ -25,8 +25,8 @@ <dependencies> <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>idm</artifactId> + <groupId>org.jboss.identity.idm</groupId> + <artifactId>jbossidm</artifactId> <version>${idm}</version> </dependency> <dependency> @@ -75,8 +75,7 @@ </plugins> </build> <properties> - <idm>1.0.0.Alpha6</idm> - <idfed>1.0.0.alpha2</idfed> - <xacml>1.0.0.alpha2</xacml> + <idm>1.0.0.Alpha8</idm> + <idfed>1.0.0.alpha3</idfed> </properties> </project>

14 years, 11 months

1
0
0 / 0

JBoss Identity SVN: r592 - in idm/tags/1.0.0.Alpha8: assembly and 16 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-06-05 01:12:33 -0400 (Fri, 05 Jun 2009) New Revision: 592 Modified: idm/tags/1.0.0.Alpha8/assembly/pom.xml idm/tags/1.0.0.Alpha8/distro/pom.xml idm/tags/1.0.0.Alpha8/example/auth/pom.xml idm/tags/1.0.0.Alpha8/example/simple/pom.xml idm/tags/1.0.0.Alpha8/idm-api/pom.xml idm/tags/1.0.0.Alpha8/idm-auth/pom.xml idm/tags/1.0.0.Alpha8/idm-cache/pom.xml idm/tags/1.0.0.Alpha8/idm-common/pom.xml idm/tags/1.0.0.Alpha8/idm-core/pom.xml idm/tags/1.0.0.Alpha8/idm-hibernate/pom.xml idm/tags/1.0.0.Alpha8/idm-ldap/pom.xml idm/tags/1.0.0.Alpha8/idm-spi/pom.xml idm/tags/1.0.0.Alpha8/idm-testsuite/pom.xml idm/tags/1.0.0.Alpha8/integration/deployer/pom.xml idm/tags/1.0.0.Alpha8/integration/jboss5/pom.xml idm/tags/1.0.0.Alpha8/integration/pom.xml idm/tags/1.0.0.Alpha8/parent/pom.xml idm/tags/1.0.0.Alpha8/pom.xml Log: * Update the Alpha8 version. Modified: idm/tags/1.0.0.Alpha8/assembly/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/assembly/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/assembly/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -4,14 +4,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.identity.idm</groupId> <artifactId>jbossidm</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <packaging>pom</packaging> <name>JBoss Identity IDM Assembly </name> <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> Modified: idm/tags/1.0.0.Alpha8/distro/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/distro/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/distro/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>idm-distro</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <packaging>jar</packaging> <name>JBoss Identity IDM Distro </name> <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> Modified: idm/tags/1.0.0.Alpha8/example/auth/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/example/auth/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/example/auth/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.identity.idm.example</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <artifactId>example-auth</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication</name> Modified: idm/tags/1.0.0.Alpha8/example/simple/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/example/simple/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/example/simple/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.identity.idm.example</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <artifactId>example-simple</artifactId> <packaging>jar</packaging> <name>Example - Simple JBoss Identity IDM Maven2 project</name> Modified: idm/tags/1.0.0.Alpha8/idm-api/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/idm-api/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/idm-api/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/tags/1.0.0.Alpha8/idm-auth/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/idm-auth/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/idm-auth/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/tags/1.0.0.Alpha8/idm-cache/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/idm-cache/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/idm-cache/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/tags/1.0.0.Alpha8/idm-common/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/idm-common/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/idm-common/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/tags/1.0.0.Alpha8/idm-core/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/idm-core/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/idm-core/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/tags/1.0.0.Alpha8/idm-hibernate/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/idm-hibernate/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/idm-hibernate/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/tags/1.0.0.Alpha8/idm-ldap/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/idm-ldap/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/idm-ldap/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/tags/1.0.0.Alpha8/idm-spi/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/idm-spi/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/idm-spi/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/tags/1.0.0.Alpha8/idm-testsuite/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/idm-testsuite/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/idm-testsuite/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/tags/1.0.0.Alpha8/integration/deployer/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/integration/deployer/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/integration/deployer/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -8,12 +8,12 @@ <groupId>org.jboss.identity.idm.integration</groupId> <artifactId>idm-jboss5-deployer</artifactId> <packaging>jar</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-integration</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> </parent> <properties> Modified: idm/tags/1.0.0.Alpha8/integration/jboss5/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/integration/jboss5/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/integration/jboss5/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -8,12 +8,12 @@ <groupId>org.jboss.identity.idm.integration</groupId> <artifactId>idm-jboss5</artifactId> <packaging>jar</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-integration</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> </parent> <properties> Modified: idm/tags/1.0.0.Alpha8/integration/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/integration/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/integration/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -13,7 +13,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: idm/tags/1.0.0.Alpha8/parent/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/parent/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/parent/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -8,7 +8,7 @@ <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <name>JBoss Identity IDM- Parent</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description> Modified: idm/tags/1.0.0.Alpha8/pom.xml =================================================================== --- idm/tags/1.0.0.Alpha8/pom.xml 2009-06-05 04:35:05 UTC (rev 591) +++ idm/tags/1.0.0.Alpha8/pom.xml 2009-06-05 05:12:33 UTC (rev 592) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Alpha8</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

14 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-identity-commits June 2009