[jboss-identity-commits] JBoss Identity SVN: r62 - in trunk: identity-api/src/main/java/org/jboss/identity/api/session and 8 other directories.

Author: bdaw Date: 2008-09-05 04:31:44 -0400 (Fri, 05 Sep 2008) New Revision: 62 Added: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObjectType.java Removed: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/managers/PersistenceManager.java trunk/identity-api/src/main/java/org/jboss/identity/api/session/Session.java trunk/identity-api/src/main/java/org/jboss/identity/api/store/FeaturesDescription.java trunk/identity-api/src/main/java/org/jboss/identity/api/store/IdentityStore.java trunk/identity-api/src/main/java/org/jboss/identity/api/store/IdentityStoreRepository.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FileBasedIdentityStore.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObject.java trunk/identity-model/src/main/java/org/jboss/identity/model/attribute/PasswordAttribute.java trunk/identity-model/src/main/java/org/jboss/identity/model/groups/GroupType.java trunk/identity-model/src/main/java/org/jboss/identity/model/groups/SimpleGroupType.java trunk/identity-model/src/main/java/org/jboss/identity/model/policy/PasswordExpirationPolicy.java trunk/identity-model/src/main/java/org/jboss/identity/model/policy/RelationshipPolicy.java trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java Log: - Rename IdentityType to IdentityObjectType and make it abstract interface Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/managers/PersistenceManager.java =================================================================== --- trunk/identity-api/src/main/java/org/jboss/identity/api/managers/PersistenceManager.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-api/src/main/java/org/jboss/identity/api/managers/PersistenceManager.java 2008-09-05 08:31:44 UTC (rev 62) @@ -23,7 +23,7 @@ import org.jboss.identity.api.store.IdentityStore; import org.jboss.identity.api.store.IdentityStoreRepository; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; import org.jboss.identity.model.domain.Realm; /** @@ -47,9 +47,9 @@ * at the realm level </p> * <p>May retrun null if given identity type is not mapped in this realm</p> * @param realm - * @param identityType + * @param identityObjectType * @return */ - IdentityStore getIdentityStore(Realm realm, IdentityType identityType); + IdentityStore getIdentityStore(Realm realm, IdentityObjectType identityObjectType); } \ No newline at end of file Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/session/Session.java =================================================================== --- trunk/identity-api/src/main/java/org/jboss/identity/api/session/Session.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-api/src/main/java/org/jboss/identity/api/session/Session.java 2008-09-05 08:31:44 UTC (rev 62) @@ -26,13 +26,12 @@ import org.jboss.identity.api.Transaction; import org.jboss.identity.model.Identity; import org.jboss.identity.model.IdentityObject; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; import org.jboss.identity.model.relation.RelationshipType; import org.jboss.identity.model.roles.Role; import org.jboss.identity.model.roles.RoleType; import org.jboss.identity.model.groups.Group; import org.jboss.identity.model.groups.GroupType; -import org.jboss.identity.model.domain.Realm; import java.util.List; import java.util.Set; @@ -314,18 +313,18 @@ * @return a number of stored identities with a given type * @throws IdentityException */ - <T extends IdentityType> int getIdentityTypeCount(T identityType) + <T extends IdentityObjectType> int getIdentityTypeCount(T identityType) throws IdentityException; /** * Find identity with a given name * * @param name - * @param identityType + * @param identityObjectType * @return * @throws IdentityException */ - IdentityObject findIdentityObject(String name, IdentityType identityType) throws IdentityException; + IdentityObject findIdentityObject(String name, IdentityObjectType identityObjectType) throws IdentityException; /** * Find identity with a given id @@ -350,7 +349,7 @@ * @return * @throws IdentityException */ - <T extends IdentityType> Collection<IdentityObject> findIdentityObject(T identityType, + <T extends IdentityObjectType> Collection<IdentityObject> findIdentityObject(T identityType, int offset, int limit, String orderedByAttributeName, boolean ascending) throws IdentityException; @@ -369,7 +368,7 @@ * @return * @throws IdentityException */ - <T extends IdentityType> Collection<IdentityObject> findIdentityObject(T identityType, + <T extends IdentityObjectType> Collection<IdentityObject> findIdentityObject(T identityType, Map<String, String[]> attributes, int offset, int limit, String orderedByAttributeName, boolean ascending) throws IdentityException; @@ -405,7 +404,7 @@ * @return names of supported attributes * @throws IdentityException */ - <T extends IdentityType> Set<String> getSupportedAttributeNames(T identityType) + <T extends IdentityObjectType> Set<String> getSupportedAttributeNames(T identityType) throws IdentityException; /** Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/store/FeaturesDescription.java =================================================================== --- trunk/identity-api/src/main/java/org/jboss/identity/api/store/FeaturesDescription.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-api/src/main/java/org/jboss/identity/api/store/FeaturesDescription.java 2008-09-05 08:31:44 UTC (rev 62) @@ -26,7 +26,7 @@ import org.jboss.identity.api.exception.IdentityException; import org.jboss.identity.api.exception.IdentityTypeNotSupportedException; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; import org.jboss.identity.model.relation.RelationshipType; /** @@ -39,21 +39,21 @@ { /** * Get the supported operations - * @param identityType a type representing identity, role, group + * @param identityObjectType a type representing identity, role, group * @return supported operations for given identity type * @throws IdentityTypeNotSupportedException */ - public Set<OperationType> getSupportedOperations(IdentityType identityType) + public Set<OperationType> getSupportedOperations(IdentityObjectType identityObjectType) throws IdentityTypeNotSupportedException; /** * @param operationType - * @param identityType + * @param identityObjectType * @return if given operation on given identity type is supported * @throws IdentityTypeNotSupportedException */ boolean isOperationSupported(OperationType operationType, - IdentityType identityType) throws IdentityTypeNotSupportedException; + IdentityObjectType identityObjectType) throws IdentityTypeNotSupportedException; /** @@ -61,18 +61,18 @@ * @return set of identity types that can be processed with a given operation * @throws org.jboss.identity.api.exception.IdentityException */ - public Set<IdentityType> getSupportedIdentities(OperationType operationType); + public Set<IdentityObjectType> getSupportedIdentities(OperationType operationType); /** * @return set of identity types that can be persisted */ - Set<IdentityType> getSupportedIdentities(); + Set<IdentityObjectType> getSupportedIdentities(); /** - * @param identityType + * @param identityObjectType * @return boolean describing if given identity type can be persisted or retrieved using this identity store */ - boolean isIdentitySupported(IdentityType identityType); + boolean isIdentitySupported(IdentityObjectType identityObjectType); /** * @param fromType @@ -81,7 +81,7 @@ * @return true is given relationship can be persisted or retrieved * @throws IdentityException */ - boolean isRelationshipSupported(IdentityType fromType, IdentityType toType, + boolean isRelationshipSupported(IdentityObjectType fromType, IdentityObjectType toType, RelationshipType relationshipType) throws IdentityException; @@ -93,6 +93,6 @@ /** * @return A mapping of RelationshipType and IdentityType objects that can have such relationship in this store */ - Map<RelationshipType, Map<IdentityType, IdentityType>> getSupportedRelationshipTypeMappings(); + Map<RelationshipType, Map<IdentityObjectType, IdentityObjectType>> getSupportedRelationshipTypeMappings(); } \ No newline at end of file Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/store/IdentityStore.java =================================================================== --- trunk/identity-api/src/main/java/org/jboss/identity/api/store/IdentityStore.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-api/src/main/java/org/jboss/identity/api/store/IdentityStore.java 2008-09-05 08:31:44 UTC (rev 62) @@ -28,8 +28,7 @@ import org.jboss.identity.api.exception.IdentityException; import org.jboss.identity.model.IdentityObject; -import org.jboss.identity.model.IdentityType; -import org.jboss.identity.model.groups.Group; +import org.jboss.identity.model.IdentityObjectType; import org.jboss.identity.model.relation.RelationshipType; /** @@ -64,11 +63,11 @@ * Create new identity with a given name * * @param name - * @param identityType + * @param identityObjectType * @return * @throws IdentityException */ - IdentityObject createIdentity(String name, IdentityType identityType) throws IdentityException; + IdentityObject createIdentity(String name, IdentityObjectType identityObjectType) throws IdentityException; /** * Remove given identity @@ -83,18 +82,18 @@ * @return a number of stored identities with a given type * @throws IdentityException */ - <T extends IdentityType> int getIdentitiesCount(T identityType) + <T extends IdentityObjectType> int getIdentitiesCount(T identityType) throws IdentityException; /** * Find identity with a given name * * @param name - * @param identityType + * @param identityObjectType * @return * @throws IdentityException */ - IdentityObject findIdentity(String name, IdentityType identityType) throws IdentityException; + IdentityObject findIdentity(String name, IdentityObjectType identityObjectType) throws IdentityException; /** * Find identity with a given id @@ -119,7 +118,7 @@ * @return * @throws IdentityException */ - <T extends IdentityType> Collection<IdentityObject> findIdentities(T identityType, + <T extends IdentityObjectType> Collection<IdentityObject> findIdentities(T identityType, int offset, int limit, String orderedByAttributeName, boolean ascending) throws IdentityException; @@ -138,7 +137,7 @@ * @return * @throws IdentityException */ - <T extends IdentityType> Collection<IdentityObject> findIdentities(T identityType, + <T extends IdentityObjectType> Collection<IdentityObject> findIdentities(T identityType, Map<String, String[]> attributes, int offset, int limit, String orderedByAttributeName, boolean ascending) throws IdentityException; @@ -172,7 +171,7 @@ * @return names of supported attributes * @throws IdentityException */ - <T extends IdentityType> Set<String> getSupportedAttributeNames(T identityType) + <T extends IdentityObjectType> Set<String> getSupportedAttributeNames(T identityType) throws IdentityException; /** Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/store/IdentityStoreRepository.java =================================================================== --- trunk/identity-api/src/main/java/org/jboss/identity/api/store/IdentityStoreRepository.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-api/src/main/java/org/jboss/identity/api/store/IdentityStoreRepository.java 2008-09-05 08:31:44 UTC (rev 62) @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; /** * IdentityStoreRepository exposes identity object management @@ -45,12 +45,12 @@ /** * @return mapping of IdentityType to the specific identity store */ - Map<IdentityType, IdentityStore> getIdentityStoreMappings(); + Map<IdentityObjectType, IdentityStore> getIdentityStoreMappings(); /** - * @param identityType + * @param identityObjectType * @return proper identity store to store given identity type */ - IdentityStore getIdentityStore(IdentityType identityType); + IdentityStore getIdentityStore(IdentityObjectType identityObjectType); } \ No newline at end of file Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FileBasedIdentityStore.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FileBasedIdentityStore.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FileBasedIdentityStore.java 2008-09-05 08:31:44 UTC (rev 62) @@ -32,7 +32,7 @@ import org.jboss.identity.api.store.FeaturesDescription; import org.jboss.identity.api.store.IdentityStore; import org.jboss.identity.impl.types.SimpleIdentity; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; import org.jboss.identity.model.IdentityObject; import org.jboss.identity.model.groups.Group; import org.jboss.identity.model.relation.RelationshipType; @@ -61,7 +61,7 @@ - public IdentityObject createIdentity(String name, IdentityType type) throws IdentityException + public IdentityObject createIdentity(String name, IdentityObjectType type) throws IdentityException { //Is there one already available? IdentityObject identity = this.findIdentity(name); @@ -80,7 +80,7 @@ { } - public <T extends IdentityType> Collection<IdentityObject> findIdentities(T identityType, + public <T extends IdentityObjectType> Collection<IdentityObject> findIdentities(T identityType, int offset, int limit, String orderedByAttributeName, boolean ascending) throws IdentityException @@ -88,7 +88,7 @@ return null; } - public <T extends IdentityType> Collection<IdentityObject> findIdentities(T identityType, + public <T extends IdentityObjectType> Collection<IdentityObject> findIdentities(T identityType, Map<String, String[]> attributes, int offset, int limit, String orderedByAttributeName, boolean ascending) throws IdentityException @@ -96,12 +96,12 @@ return null; } - public <T extends IdentityType> Set<String> getSupportedAttributeNames(T identityType) throws IdentityException + public <T extends IdentityObjectType> Set<String> getSupportedAttributeNames(T identityType) throws IdentityException { return null; } - public IdentityObject findIdentity(String name, IdentityType identityType) throws IdentityException + public IdentityObject findIdentity(String name, IdentityObjectType identityObjectType) throws IdentityException { return null; } @@ -123,7 +123,7 @@ } - public <T extends IdentityType> int getIdentitiesCount(T identityType) throws IdentityException + public <T extends IdentityObjectType> int getIdentitiesCount(T identityType) throws IdentityException { return 0; } Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java 2008-09-05 08:31:44 UTC (rev 62) @@ -21,16 +21,13 @@ */ package org.jboss.identity.impl.types; -import java.util.Collection; import java.util.List; import org.jboss.identity.model.IdentityAttribute; -import org.jboss.identity.model.roles.Role; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; import org.jboss.identity.model.groups.Group; import org.jboss.identity.model.groups.GroupType; import org.jboss.identity.model.policy.PolicyValidationException; -import org.jboss.identity.model.policy.RelationshipPolicy; /** * A simple implementation of group @@ -56,7 +53,7 @@ return null; } - public IdentityType getIdentityType() + public IdentityObjectType getIdentityType() { return null; } Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java 2008-09-05 08:31:44 UTC (rev 62) @@ -27,7 +27,7 @@ import org.jboss.identity.model.Identity; import org.jboss.identity.model.IdentityAttribute; import org.jboss.identity.model.roles.Role; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; import org.jboss.identity.model.groups.Group; import org.jboss.identity.model.policy.PolicyValidationException; @@ -41,7 +41,7 @@ public class SimpleIdentity implements Identity { - public IdentityType getIdentityType() + public IdentityObjectType getIdentityType() { return null; } Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObject.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObject.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObject.java 2008-09-05 08:31:44 UTC (rev 62) @@ -56,7 +56,7 @@ * <p>Return type of this identity object</p> * @return */ - IdentityType getIdentityType(); + IdentityObjectType getIdentityType(); /** * <p>Return a list of attributes</p> Copied: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObjectType.java (from rev 61, trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java) =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObjectType.java (rev 0) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObjectType.java 2008-09-05 08:31:44 UTC (rev 62) @@ -0,0 +1,50 @@ +/* + * 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.model; + +import java.util.List; + +import org.jboss.identity.model.policy.RelationshipPolicy; + +/** + * Marker Interface representing + * an object of the Identity Model + * @author Anil.Saldhana(a)redhat.com + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @since Jul 10, 2008 + */ +public abstract interface IdentityObjectType +{ + /** + * <p>Return the name of the identity type</p> + * @return + */ + String getName(); + + + /** + * Return a list of relationship policies + * @return + */ + List<RelationshipPolicy<IdentityObjectType, IdentityObjectType>> getRelationshipPolicies(); + +} \ No newline at end of file Deleted: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java 2008-09-05 08:31:44 UTC (rev 62) @@ -1,51 +0,0 @@ -/* - * 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.model; - -import java.util.List; - -import org.jboss.identity.model.policy.PolicyValidationException; -import org.jboss.identity.model.policy.RelationshipPolicy; - -/** - * Marker Interface representing - * an object of the Identity Model - * @author Anil.Saldhana(a)redhat.com - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @since Jul 10, 2008 - */ -public interface IdentityType -{ - /** - * <p>Return the name of the identity type</p> - * @return - */ - String getName(); - - - /** - * Return a list of relationship policies - * @return - */ - List<RelationshipPolicy<IdentityType,IdentityType>> getRelationshipPolicies(); - -} \ No newline at end of file Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/attribute/PasswordAttribute.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/attribute/PasswordAttribute.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/attribute/PasswordAttribute.java 2008-09-05 08:31:44 UTC (rev 62) @@ -24,8 +24,7 @@ import java.util.Date; import org.jboss.identity.model.IdentityAttribute; -import org.jboss.identity.model.IdentityType; -import org.jboss.identity.model.IdentityObject; +import org.jboss.identity.model.IdentityObjectType; import org.jboss.identity.model.policy.PasswordExpirationPolicy; /** @@ -33,7 +32,7 @@ * @author Anil.Saldhana(a)redhat.com * @since Jul 13, 2008 */ -public class PasswordAttribute<T extends IdentityType> +public class PasswordAttribute<T extends IdentityObjectType> implements IdentityAttribute { /** Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/groups/GroupType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/groups/GroupType.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/groups/GroupType.java 2008-09-05 08:31:44 UTC (rev 62) @@ -21,19 +21,15 @@ */ package org.jboss.identity.model.groups; -import org.jboss.identity.model.IdentityType; -import org.jboss.identity.model.policy.RelationshipPolicy; +import org.jboss.identity.model.IdentityObjectType; -import java.util.Collection; -import java.util.List; - /** * Type of Group * @author Anil.Saldhana(a)redhat.com * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @since Jul 11, 2008 */ -public interface GroupType extends IdentityType +public interface GroupType extends IdentityObjectType { Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/groups/SimpleGroupType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/groups/SimpleGroupType.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/groups/SimpleGroupType.java 2008-09-05 08:31:44 UTC (rev 62) @@ -22,9 +22,8 @@ package org.jboss.identity.model.groups; import org.jboss.identity.model.policy.RelationshipPolicy; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; -import java.util.Collection; import java.util.List; /** @@ -58,7 +57,7 @@ } - public List<RelationshipPolicy<IdentityType, IdentityType>> getRelationshipPolicies() + public List<RelationshipPolicy<IdentityObjectType, IdentityObjectType>> getRelationshipPolicies() { return null; } Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/policy/PasswordExpirationPolicy.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/policy/PasswordExpirationPolicy.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/policy/PasswordExpirationPolicy.java 2008-09-05 08:31:44 UTC (rev 62) @@ -21,14 +21,14 @@ */ package org.jboss.identity.model.policy; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; /** * Policy to govern Passwords * @author Anil.Saldhana(a)redhat.com * @since Jul 13, 2008 */ -public interface PasswordExpirationPolicy<P extends IdentityType> +public interface PasswordExpirationPolicy<P extends IdentityObjectType> extends IdentityTypePolicy { } \ No newline at end of file Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/policy/RelationshipPolicy.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/policy/RelationshipPolicy.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/policy/RelationshipPolicy.java 2008-09-05 08:31:44 UTC (rev 62) @@ -21,14 +21,14 @@ */ package org.jboss.identity.model.policy; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; /** * A Policy that governs the Relationships * @author Anil.Saldhana(a)redhat.com * @since Jul 13, 2008 */ -public interface RelationshipPolicy<P extends IdentityType, Q extends IdentityType> +public interface RelationshipPolicy<P extends IdentityObjectType, Q extends IdentityObjectType> extends IdentityTypePolicy { /** Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java 2008-09-04 19:41:50 UTC (rev 61) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java 2008-09-05 08:31:44 UTC (rev 62) @@ -21,7 +21,7 @@ */ package org.jboss.identity.model.roles; -import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.IdentityObjectType; import org.jboss.identity.model.policy.RelationshipPolicy; import java.util.List; @@ -31,7 +31,7 @@ * @author Anil.Saldhana(a)redhat.com * @since Jun 30, 2008 */ -public enum RoleType implements IdentityType +public enum RoleType implements IdentityObjectType { /** @@ -58,7 +58,7 @@ return this.name(); } - public List<RelationshipPolicy<IdentityType, IdentityType>> getRelationshipPolicies() + public List<RelationshipPolicy<IdentityObjectType, IdentityObjectType>> getRelationshipPolicies() { return null; }