[jboss-identity-commits] JBoss Identity SVN: r59 - in trunk: identity-model/src/main/java/org/jboss/identity/model/attribute and 2 other directories.

Author: bdaw Date: 2008-09-03 03:49:37 -0400 (Wed, 03 Sep 2008) New Revision: 59 Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.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/Group.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/roles/Role.java Log: - add getters for identities/groups into Identity - fix breaking code 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-03 07:38:39 UTC (rev 58) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java 2008-09-03 07:49:37 UTC (rev 59) @@ -60,14 +60,6 @@ return null; } - public void add(RelationshipPolicy<Group, Group> relationPolicy) - { - } - - public void addAll(Collection<RelationshipPolicy<Group, Group>> relationList) - { - } - public String getName() { return name; @@ -78,11 +70,6 @@ return null; } - public List<RelationshipPolicy<Group, Group>> getRelationshipPolicies() - { - return null; - } - public List<Role> getRoles() { return null; 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-03 07:38:39 UTC (rev 58) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/attribute/PasswordAttribute.java 2008-09-03 07:49:37 UTC (rev 59) @@ -33,7 +33,7 @@ * @author Anil.Saldhana(a)redhat.com * @since Jul 13, 2008 */ -public class PasswordAttribute<T extends IdentityObject> +public class PasswordAttribute<T extends IdentityType> implements IdentityAttribute { /** Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/groups/Group.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/groups/Group.java 2008-09-03 07:38:39 UTC (rev 58) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/groups/Group.java 2008-09-03 07:49:37 UTC (rev 59) @@ -65,21 +65,5 @@ */ List<Group> getSubGroups(); - /** - * Add a relationship policy - * @param aRelationPolicy - */ - void add(RelationshipPolicy<Group,Group> aRelationPolicy); - - /** - * Add a collection of relationship policies - * @param relationList - */ - void addAll(Collection<RelationshipPolicy<Group,Group>> relationList); - - /** - * Return a list of relationship policies - * @return - */ - List<RelationshipPolicy<Group,Group>> getRelationshipPolicies(); + } \ No newline at end of file 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-03 07:38:39 UTC (rev 58) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/groups/GroupType.java 2008-09-03 07:49:37 UTC (rev 59) @@ -22,7 +22,11 @@ package org.jboss.identity.model.groups; import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.policy.RelationshipPolicy; +import java.util.Collection; +import java.util.List; + /** * Type of Group * @author Anil.Saldhana(a)redhat.com @@ -31,5 +35,22 @@ */ public interface GroupType extends IdentityType { + /** + * Add a relationship policy + * @param aRelationPolicy + */ + void add(RelationshipPolicy<GroupType,GroupType> aRelationPolicy); + /** + * Add a collection of relationship policies + * @param relationList + */ + void addAll(Collection<RelationshipPolicy<GroupType,GroupType>> relationList); + + /** + * Return a list of relationship policies + * @return + */ + List<RelationshipPolicy<GroupType,GroupType>> getRelationshipPolicies(); + } \ No newline at end of file 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-03 07:38:39 UTC (rev 58) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/groups/SimpleGroupType.java 2008-09-03 07:49:37 UTC (rev 59) @@ -21,6 +21,11 @@ */ package org.jboss.identity.model.groups; +import org.jboss.identity.model.policy.RelationshipPolicy; + +import java.util.Collection; +import java.util.List; + /** * Simple Implementation of Group Type * @author Anil.Saldhana(a)redhat.com @@ -49,5 +54,20 @@ StringBuilder builder = new StringBuilder("Group["); builder.append(name).append("]"); return builder.toString(); - } + } + + public void add(RelationshipPolicy<GroupType, GroupType> aRelationPolicy) + { + + } + + public void addAll(Collection<RelationshipPolicy<GroupType, GroupType>> relationList) + { + + } + + public List<RelationshipPolicy<GroupType, GroupType>> getRelationshipPolicies() + { + return null; + } } Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/roles/Role.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/roles/Role.java 2008-09-03 07:38:39 UTC (rev 58) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/roles/Role.java 2008-09-03 07:49:37 UTC (rev 59) @@ -22,8 +22,11 @@ package org.jboss.identity.model.roles; import org.jboss.identity.model.IdentityObject; -import org.jboss.identity.model.roles.RoleType; +import org.jboss.identity.model.Identity; +import org.jboss.identity.model.groups.Group; +import java.util.List; + /** * Marker Interface represents a role * @author Anil.Saldhana(a)redhat.com @@ -36,4 +39,16 @@ * @return */ RoleType getRoleType(); + + /** + * Get a list of Identities + * @return + */ + List<Identity> getIdentities(); + + /** + * Get a list of Groups + * @return + */ + List<Group> getGroups(); } \ No newline at end of file