Author: bdaw Date: 2008-09-05 04:52:51 -0400 (Fri, 05 Sep 2008) New Revision: 63 Added: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObject.java trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObjectType.java trunk/identity-model/src/main/java/org/jboss/identity/model/groups/Group.java trunk/identity-model/src/main/java/org/jboss/identity/model/roles/Role.java trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java Log: - Read IdentityType as extension to IdentityObjectType 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-05 08:31:44 UTC (rev 62) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObject.java 2008-09-05 08:52:51 UTC (rev 63) @@ -31,7 +31,7 @@ * @author Anil.Saldhana(a)redhat.com * @version : 0.1 $ */ -public abstract interface IdentityObject +public interface IdentityObject { /** Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObjectType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObjectType.java 2008-09-05 08:31:44 UTC (rev 62) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityObjectType.java 2008-09-05 08:52:51 UTC (rev 63) @@ -32,7 +32,7 @@ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @since Jul 10, 2008 */ -public abstract interface IdentityObjectType +public interface IdentityObjectType { /** * <p>Return the name of the identity type</p> Added: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java (rev 0) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java 2008-09-05 08:52:51 UTC (rev 63) @@ -0,0 +1,31 @@ +/* +* 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.model; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public interface IdentityType extends IdentityObjectType +{ +} 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-05 08:31:44 UTC (rev 62) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/groups/Group.java 2008-09-05 08:52:51 UTC (rev 63) @@ -50,5 +50,10 @@ */ String getDescription(); + /** + * @return + */ + GroupType getGroupType(); + } \ No newline at end of file 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-05 08:31:44 UTC (rev 62) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/roles/Role.java 2008-09-05 08:52:51 UTC (rev 63) @@ -30,6 +30,7 @@ /** * Marker Interface represents a role * @author Anil.Saldhana(a)redhat.com + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @since Jun 30, 2008 */ public interface Role extends IdentityObject @@ -45,5 +46,9 @@ */ String getDescription(); + /** + * @return group type + */ + RoleType getRoleType(); } \ No newline at end of file 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-05 08:31:44 UTC (rev 62) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java 2008-09-05 08:52:51 UTC (rev 63) @@ -29,6 +29,7 @@ /** * Type of Role * @author Anil.Saldhana(a)redhat.com + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @since Jun 30, 2008 */ public enum RoleType implements IdentityObjectType @@ -37,20 +38,20 @@ /** * Plain Role */ - REGULAR, + ROLE_REGULAR, /** * A role that is nested within another */ - NESTED, + ROLE_NESTED, /** * A role that is part of an hierarchy * (Eg. LDAP Role) */ - HIERARCHICAL, + ROLE_HIERARCHICAL, /** * Custom Role */ - CUSTOM; + ROLE_CUSTOM; public String getName()