Author: bdaw Date: 2008-09-19 12:37:25 -0400 (Fri, 19 Sep 2008) New Revision: 95 Added: trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/HibernateIdentityStoreInvocationContext.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/ trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/IdentityStoreInvocationContext.java Removed: trunk/identity-model/ Modified: trunk/identity-impl/pom.xml trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObject.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectAttribute.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectRelationship.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectRelationshipType.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectType.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FeaturesDescriptionImpl.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/HibernateIdentityStoreImpl.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java trunk/identity-impl/src/test/java/org/jboss/identity/impl/SimpleIdentityObjectRelationshipTypeImpl.java trunk/identity-impl/src/test/java/org/jboss/identity/impl/SimpleIdentityObjectTypeImpl.java trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/HibernateIdentityStoreTestCase.java trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/IdentityTypeEnum.java trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/RelationshipTypeEnum.java trunk/identity-spi/pom.xml trunk/identity-spi/src/main/java/org/jboss/identity/spi/attribute/PasswordAttribute.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObject.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectAttribute.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectRelationship.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectRelationshipType.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectType.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/policy/PasswordExpirationPolicy.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/policy/RelationshipPolicy.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/repository/IdentityStoreRepository.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/AttributeStore.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/FeaturesDescription.java trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/IdentityStore.java trunk/pom.xml Log: - IdentityStoreInvocationContext - remove identity-model module and merge content with spi Modified: trunk/identity-impl/pom.xml =================================================================== --- trunk/identity-impl/pom.xml 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/pom.xml 2008-09-19 16:37:25 UTC (rev 95) @@ -36,11 +36,6 @@ </dependency> <dependency> <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.identity</groupId> <artifactId>jboss-identity-api</artifactId> <version>${project.version}</version> </dependency> Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObject.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObject.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObject.java 2008-09-19 16:37:25 UTC (rev 95) @@ -43,7 +43,7 @@ import javax.persistence.NamedQuery; import org.jboss.identity.exception.PolicyValidationException; -import org.jboss.identity.model.core.IdentityObject; +import org.jboss.identity.spi.model.IdentityObject; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectAttribute.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectAttribute.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectAttribute.java 2008-09-19 16:37:25 UTC (rev 95) @@ -29,6 +29,7 @@ import javax.persistence.OneToMany; import javax.persistence.Id; import javax.persistence.GeneratedValue; +import javax.persistence.Embedded; import java.util.Set; import java.util.HashSet; @@ -46,7 +47,8 @@ private String name; - @CollectionOfElements + //@CollectionOfElements + @Embedded private Set<String> values = new HashSet<String>(); public HibernateIdentityObjectAttribute() Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectRelationship.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectRelationship.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectRelationship.java 2008-09-19 16:37:25 UTC (rev 95) @@ -32,8 +32,8 @@ import javax.persistence.JoinColumn; import javax.persistence.UniqueConstraint; -import org.jboss.identity.model.core.IdentityObjectRelationship; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; +import org.jboss.identity.spi.model.IdentityObjectRelationship; +import org.jboss.identity.spi.model.IdentityObjectRelationshipType; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectRelationshipType.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectRelationshipType.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectRelationshipType.java 2008-09-19 16:37:25 UTC (rev 95) @@ -30,7 +30,7 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; +import org.jboss.identity.spi.model.IdentityObjectRelationshipType; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectType.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectType.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/HibernateIdentityObjectType.java 2008-09-19 16:37:25 UTC (rev 95) @@ -30,7 +30,7 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; -import org.jboss.identity.model.core.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectType; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FeaturesDescriptionImpl.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FeaturesDescriptionImpl.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FeaturesDescriptionImpl.java 2008-09-19 16:37:25 UTC (rev 95) @@ -25,8 +25,8 @@ import org.jboss.identity.spi.store.FeaturesDescription; import org.jboss.identity.spi.store.OperationType; import org.jboss.identity.spi.exception.IdentityTypeNotSupportedException; -import org.jboss.identity.model.core.IdentityObjectType; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; +import org.jboss.identity.spi.model.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectRelationshipType; import org.jboss.identity.exception.IdentityException; import java.util.Set; Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/HibernateIdentityStoreImpl.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/HibernateIdentityStoreImpl.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/HibernateIdentityStoreImpl.java 2008-09-19 16:37:25 UTC (rev 95) @@ -24,9 +24,10 @@ import org.jboss.identity.spi.store.IdentityStore; import org.jboss.identity.spi.store.FeaturesDescription; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; -import org.jboss.identity.model.core.IdentityObject; -import org.jboss.identity.model.core.IdentityObjectType; +import org.jboss.identity.spi.store.IdentityStoreInvocationContext; +import org.jboss.identity.spi.model.IdentityObjectRelationshipType; +import org.jboss.identity.spi.model.IdentityObject; +import org.jboss.identity.spi.model.IdentityObjectType; import org.jboss.identity.exception.IdentityException; import org.jboss.identity.impl.model.HibernateIdentityObject; import org.jboss.identity.impl.model.HibernateIdentityObjectType; @@ -110,7 +111,7 @@ return supportedFeatures; } - public IdentityObject createIdentityObject(String name, IdentityObjectType identityObjectType) throws IdentityException + public IdentityObject createIdentityObject(IdentityStoreInvocationContext ctx, String name, IdentityObjectType identityObjectType) throws IdentityException { if (name == null) @@ -123,7 +124,7 @@ // Check if object with a given name and type is not present already - List results = getEntityManager().createNamedQuery("findIdentityObjectByNameAndType") + List results = getHibernateEntityManager(ctx).createNamedQuery("findIdentityObjectByNameAndType") .setParameter("name", name) .setParameter("typeName", identityObjectType.getName()).getResultList(); @@ -134,13 +135,13 @@ - HibernateIdentityObjectType hibernateType = getHibernateIdentityObjectType(identityObjectType); + HibernateIdentityObjectType hibernateType = getHibernateIdentityObjectType(ctx, identityObjectType); HibernateIdentityObject io = new HibernateIdentityObject(name, hibernateType); try { - getEntityManager().persist(io); + getHibernateEntityManager(ctx).persist(io); } catch (Exception e) { @@ -151,7 +152,7 @@ return io; } - public void removeIdentityObject(IdentityObject identity) throws IdentityException + public void removeIdentityObject(IdentityStoreInvocationContext ctx, IdentityObject identity) throws IdentityException { checkIOInstance(identity); @@ -159,8 +160,8 @@ try { - HibernateIdentityObject hibernateObject = getHibernateIdentityObject(identity); - getEntityManager().remove(hibernateObject); + HibernateIdentityObject hibernateObject = getHibernateIdentityObject(ctx, identity); + getHibernateEntityManager(ctx).remove(hibernateObject); } catch (Exception e) { @@ -168,16 +169,16 @@ } } - public <T extends IdentityObjectType> int getIdentityObjectsCount(T identityType) throws IdentityException + public int getIdentityObjectsCount(IdentityStoreInvocationContext ctx, IdentityObjectType identityType) throws IdentityException { checkIOType(identityType); - HibernateIdentityObjectType jpaType = getHibernateIdentityObjectType(identityType); + HibernateIdentityObjectType jpaType = getHibernateIdentityObjectType(ctx, identityType); int count; try { - count = ((Number)getEntityManager() + count = ((Number)getHibernateEntityManager(ctx) .createNamedQuery("countIdentityObjectsByType") .setParameter("typeName", jpaType.getName()) .getSingleResult()).intValue(); @@ -190,7 +191,7 @@ return count; } - public IdentityObject findIdentityObject(String name, IdentityObjectType type) throws IdentityException + public IdentityObject findIdentityObject(IdentityStoreInvocationContext ctx, String name, IdentityObjectType type) throws IdentityException { if (name == null) @@ -200,13 +201,13 @@ checkIOType(type); - HibernateIdentityObjectType hibernateType = getHibernateIdentityObjectType(type); + HibernateIdentityObjectType hibernateType = getHibernateIdentityObjectType(ctx, type); HibernateIdentityObject hibernateObject = null; try { - hibernateObject = (HibernateIdentityObject)getEntityManager().createNamedQuery("findIdentityObjectByNameAndType") + hibernateObject = (HibernateIdentityObject)getHibernateEntityManager(ctx).createNamedQuery("findIdentityObjectByNameAndType") .setParameter("name", name) .setParameter("typeName", hibernateType.getName()) .getSingleResult(); @@ -219,7 +220,7 @@ return hibernateObject; } - public IdentityObject findIdentityObject(Object id) throws IdentityException + public IdentityObject findIdentityObject(IdentityStoreInvocationContext ctx, Object id) throws IdentityException { if (id == null) { @@ -230,7 +231,7 @@ try { - hibernateObject = (HibernateIdentityObject)getEntityManager().find(HibernateIdentityObject.class, id); + hibernateObject = (HibernateIdentityObject)getHibernateEntityManager(ctx).find(HibernateIdentityObject.class, id); } catch(Exception e) { @@ -240,18 +241,18 @@ return hibernateObject; } - public Collection<IdentityObject> findIdentityObject(IdentityObjectType identityType, int offset, int limit, boolean orderedByName, boolean ascending) throws IdentityException + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx, IdentityObjectType identityType, int offset, int limit, boolean orderedByName, boolean ascending) throws IdentityException { checkIOType(identityType); - HibernateIdentityObjectType hibernateType = getHibernateIdentityObjectType(identityType); + HibernateIdentityObjectType hibernateType = getHibernateIdentityObjectType(ctx, identityType); List<IdentityObject> results = new LinkedList<IdentityObject>(); try { //TODO:OrderBy - Query q = getEntityManager().createNamedQuery("findIdentityObjectsByType") + Query q = getHibernateEntityManager(ctx).createNamedQuery("findIdentityObjectsByType") .setParameter("typeName", hibernateType.getName()) .setFirstResult(offset); @@ -271,19 +272,19 @@ return results; } - public Collection<IdentityObject> findIdentityObject(IdentityObjectType identityType, Map<String, String[]> attributes, int offset, int limit, boolean orderByName, boolean ascending) throws IdentityException + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx, IdentityObjectType identityType, Map<String, String[]> attributes, int offset, int limit, boolean orderByName, boolean ascending) throws IdentityException { //TODO: NYI throw new NotYetImplementedException(); } - public Collection<IdentityObject> findIdentityObject(IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, int offset, int limit, boolean orderByName, boolean ascending) throws IdentityException + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, int offset, int limit, boolean orderByName, boolean ascending) throws IdentityException { //TODO: NYI throw new NotYetImplementedException(); } - public void createRelationship(IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType) throws IdentityException + public void createRelationship(IdentityStoreInvocationContext ctx, IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType) throws IdentityException { //TODO: NYI //throw new NotYetImplementedException(); @@ -296,14 +297,14 @@ checkIOInstance(fromIdentity); checkIOInstance(toIdentity); - HibernateIdentityObject fromIO = getHibernateIdentityObject(fromIdentity); - HibernateIdentityObject toIO = getHibernateIdentityObject(toIdentity); - HibernateIdentityObjectRelationshipType type = getHibernateIdentityObjectRelationshipType(relationshipType); + HibernateIdentityObject fromIO = getHibernateIdentityObject(ctx, fromIdentity); + HibernateIdentityObject toIO = getHibernateIdentityObject(ctx, toIdentity); + HibernateIdentityObjectRelationshipType type = getHibernateIdentityObjectRelationshipType(ctx, relationshipType); getSupportedFeatures().isRelationshipTypeSupported(fromIO.getIdentityType(), toIO.getIdentityType(), relationshipType); - org.hibernate.Query query = getEntityManager().getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE) + org.hibernate.Query query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE) .setParameter("fromIO", fromIO) .setParameter("toIO", toIO) .setParameter("typeName", type.getName()); @@ -316,11 +317,11 @@ } HibernateIdentityObjectRelationship relationship = new HibernateIdentityObjectRelationship(type, fromIO, toIO); - getEntityManager().persist(relationship); + getHibernateEntityManager(ctx).persist(relationship); } - public void removeRelationship(IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType) throws IdentityException + public void removeRelationship(IdentityStoreInvocationContext ctx, IdentityObject fromIdentity, IdentityObject toIdentity, IdentityObjectRelationshipType relationshipType) throws IdentityException { if (relationshipType == null) @@ -331,14 +332,14 @@ checkIOInstance(fromIdentity); checkIOInstance(toIdentity); - HibernateIdentityObject fromIO = getHibernateIdentityObject(fromIdentity); - HibernateIdentityObject toIO = getHibernateIdentityObject(toIdentity); - HibernateIdentityObjectRelationshipType type = getHibernateIdentityObjectRelationshipType(relationshipType); + HibernateIdentityObject fromIO = getHibernateIdentityObject(ctx, fromIdentity); + HibernateIdentityObject toIO = getHibernateIdentityObject(ctx, toIdentity); + HibernateIdentityObjectRelationshipType type = getHibernateIdentityObjectRelationshipType(ctx, relationshipType); getSupportedFeatures().isRelationshipTypeSupported(fromIO.getIdentityType(), toIO.getIdentityType(), relationshipType); - org.hibernate.Query query = getEntityManager().getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE) + org.hibernate.Query query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE) .setParameter("fromIO", fromIO) .setParameter("toIO", toIO) .setParameter("typeName", type.getName()); @@ -354,19 +355,19 @@ fromIO.getFromRelationships().remove(relationship); toIO.getToRelationships().remove(relationship); - getEntityManager().remove(relationship); + getHibernateEntityManager(ctx).remove(relationship); } - public void removeRelationships(IdentityObject identity1, IdentityObject identity2) throws IdentityException + public void removeRelationships(IdentityStoreInvocationContext ctx, IdentityObject identity1, IdentityObject identity2) throws IdentityException { checkIOInstance(identity1); checkIOInstance(identity2); - HibernateIdentityObject hio1 = getHibernateIdentityObject(identity1); - HibernateIdentityObject hio2 = getHibernateIdentityObject(identity2); + HibernateIdentityObject hio1 = getHibernateIdentityObject(ctx, identity1); + HibernateIdentityObject hio2 = getHibernateIdentityObject(ctx, identity2); - org.hibernate.Query query = getEntityManager().getSession().createQuery(QUERY_RELATIONSHIP_BY_IDENTITIES) + org.hibernate.Query query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_IDENTITIES) .setParameter("IO1", hio1) .setParameter("IO2", hio2); @@ -377,19 +378,19 @@ HibernateIdentityObjectRelationship relationship = (HibernateIdentityObjectRelationship) iterator.next(); relationship.getFromIdentityObject().getFromRelationships().remove(relationship); relationship.getToIdentityObject().getToRelationships().remove(relationship); - getEntityManager().remove(relationship); + getHibernateEntityManager(ctx).remove(relationship); } } - public Set<IdentityObjectRelationshipType> resolveRelationships(IdentityObject fromIdentity, IdentityObject toIdentity) throws IdentityException + public Set<IdentityObjectRelationshipType> resolveRelationships(IdentityStoreInvocationContext ctx, IdentityObject fromIdentity, IdentityObject toIdentity) throws IdentityException { checkIOInstance(fromIdentity); checkIOInstance(toIdentity); - HibernateIdentityObject hio1 = getHibernateIdentityObject(fromIdentity); - HibernateIdentityObject hio2 = getHibernateIdentityObject(toIdentity); + HibernateIdentityObject hio1 = getHibernateIdentityObject(ctx, fromIdentity); + HibernateIdentityObject hio2 = getHibernateIdentityObject(ctx, toIdentity); - org.hibernate.Query query = getEntityManager().getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO) + org.hibernate.Query query = getHibernateEntityManager(ctx).getSession().createQuery(QUERY_RELATIONSHIP_BY_FROM_TO) .setParameter("fromIO", hio1) .setParameter("toIO", hio2); @@ -407,24 +408,24 @@ // Attribute store - public <T extends IdentityObjectType> Set<String> getSupportedAttributeNames(T identityType) throws IdentityException + public <T extends IdentityObjectType> Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext ctx, T identityType) throws IdentityException { //TODO: NYI return null; } - public Map<String, Set<String>> getAttributes(IdentityObject identity) throws IdentityException + public Map<String, Set<String>> getAttributes(IdentityStoreInvocationContext ctx, IdentityObject identity) throws IdentityException { checkIOInstance(identity); - HibernateIdentityObject hibernateObject = getHibernateIdentityObject(identity); + HibernateIdentityObject hibernateObject = getHibernateIdentityObject(ctx, identity); return hibernateObject.getAttributes(); } - public void updateAttributes(IdentityObject identity, Map<String, Set<String>> attributes) throws IdentityException + public void updateAttributes(IdentityStoreInvocationContext ctx, IdentityObject identity, Map<String, Set<String>> attributes) throws IdentityException { checkIOInstance(identity); @@ -434,13 +435,13 @@ throw new IllegalArgumentException("attributes are null"); } - HibernateIdentityObject hibernateObject = getHibernateIdentityObject(identity); + HibernateIdentityObject hibernateObject = getHibernateIdentityObject(ctx, identity); hibernateObject.setAttributes(attributes); } - public void addAttributes(IdentityObject identity, Map<String, Set<String>> attributes) throws IdentityException + public void addAttributes(IdentityStoreInvocationContext ctx, IdentityObject identity, Map<String, Set<String>> attributes) throws IdentityException { checkIOInstance(identity); @@ -450,7 +451,7 @@ throw new IllegalArgumentException("attributes are null"); } - HibernateIdentityObject hibernateObject = getHibernateIdentityObject(identity); + HibernateIdentityObject hibernateObject = getHibernateIdentityObject(ctx, identity); for (String name : attributes.keySet()) { @@ -458,7 +459,7 @@ } } - public void removeAttributes(IdentityObject identity, Set<String> attributes) throws IdentityException + public void removeAttributes(IdentityStoreInvocationContext ctx, IdentityObject identity, Set<String> attributes) throws IdentityException { checkIOInstance(identity); @@ -468,7 +469,7 @@ throw new IllegalArgumentException("attributes are null"); } - HibernateIdentityObject hibernateObject = getHibernateIdentityObject(identity); + HibernateIdentityObject hibernateObject = getHibernateIdentityObject(ctx, identity); for (String attr : attributes) { @@ -478,23 +479,28 @@ // Internal - public void addIdentityObjectType(IdentityObjectType type) throws IdentityException + public void addIdentityObjectType(IdentityStoreInvocationContext ctx, IdentityObjectType type) throws IdentityException { HibernateIdentityObjectType hibernateType = new HibernateIdentityObjectType(type); - getEntityManager().persist(hibernateType); + getHibernateEntityManager(ctx).persist(hibernateType); } - public void addIdentityObjectRelationshipType(IdentityObjectRelationshipType type) throws IdentityException + public void addIdentityObjectRelationshipType(IdentityStoreInvocationContext ctx, IdentityObjectRelationshipType type) throws IdentityException { HibernateIdentityObjectRelationshipType hibernateType = new HibernateIdentityObjectRelationshipType(type); - getEntityManager().persist(hibernateType); + getHibernateEntityManager(ctx).persist(hibernateType); } - protected HibernateEntityManager getEntityManager() + protected HibernateEntityManager getHibernateEntityManager(IdentityStoreInvocationContext ctx) throws IdentityException { - return null; + if (ctx instanceof HibernateIdentityStoreInvocationContext) + { + return ((HibernateIdentityStoreInvocationContext)ctx).getHibernateEntityManager(); + } + + throw new IdentityException("Not supported IdentityStoreInvocationContext implementation"); } private void checkIOInstance(IdentityObject io) @@ -524,14 +530,14 @@ } } - private HibernateIdentityObjectType getHibernateIdentityObjectType(IdentityObjectType type) throws IdentityException + private HibernateIdentityObjectType getHibernateIdentityObjectType(IdentityStoreInvocationContext ctx, IdentityObjectType type) throws IdentityException { HibernateIdentityObjectType hibernateType = null; try { - hibernateType = (HibernateIdentityObjectType)getEntityManager().createNamedQuery("findIdentityObjectTypeByName") + hibernateType = (HibernateIdentityObjectType)getHibernateEntityManager(ctx).createNamedQuery("findIdentityObjectTypeByName") .setParameter("name", type.getName()) .getSingleResult() ; } @@ -543,14 +549,14 @@ return hibernateType; } - private HibernateIdentityObject getHibernateIdentityObject(IdentityObject io) throws IdentityException + private HibernateIdentityObject getHibernateIdentityObject(IdentityStoreInvocationContext ctx, IdentityObject io) throws IdentityException { HibernateIdentityObject hibernateObject = null; try { - hibernateObject = (HibernateIdentityObject)getEntityManager().createNamedQuery("findIdentityObjectByNameAndType") + hibernateObject = (HibernateIdentityObject)getHibernateEntityManager(ctx).createNamedQuery("findIdentityObjectByNameAndType") .setParameter("name", io.getName()) .setParameter("typeName", io.getIdentityType().getName()) .getSingleResult(); @@ -563,14 +569,14 @@ return hibernateObject; } - private HibernateIdentityObjectRelationshipType getHibernateIdentityObjectRelationshipType(IdentityObjectRelationshipType iot) throws IdentityException + private HibernateIdentityObjectRelationshipType getHibernateIdentityObjectRelationshipType(IdentityStoreInvocationContext ctx, IdentityObjectRelationshipType iot) throws IdentityException { HibernateIdentityObjectRelationshipType relationshipType = null; try { - relationshipType = (HibernateIdentityObjectRelationshipType)getEntityManager().createNamedQuery("findIdentityObjectRelationshipTypeByName") + relationshipType = (HibernateIdentityObjectRelationshipType)getHibernateEntityManager(ctx).createNamedQuery("findIdentityObjectRelationshipTypeByName") .setParameter("name", iot.getName()) .getSingleResult(); } Added: trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/HibernateIdentityStoreInvocationContext.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/HibernateIdentityStoreInvocationContext.java (rev 0) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/HibernateIdentityStoreInvocationContext.java 2008-09-19 16:37:25 UTC (rev 95) @@ -0,0 +1,40 @@ +/* +* 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.impl.store; + +import org.jboss.identity.spi.store.IdentityStoreInvocationContext; +import org.hibernate.ejb.HibernateEntityManager; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class HibernateIdentityStoreInvocationContext implements IdentityStoreInvocationContext +{ + + public HibernateEntityManager getHibernateEntityManager() + { + 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-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java 2008-09-19 16:37:25 UTC (rev 95) @@ -29,9 +29,9 @@ import org.jboss.identity.api.Group; import org.jboss.identity.api.Role; import org.jboss.identity.exception.PolicyValidationException; -import org.jboss.identity.model.core.IdentityObject; -import org.jboss.identity.model.core.IdentityObjectAttribute; -import org.jboss.identity.model.core.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObject; +import org.jboss.identity.spi.model.IdentityObjectAttribute; +import org.jboss.identity.spi.model.IdentityObjectType; /** Modified: trunk/identity-impl/src/test/java/org/jboss/identity/impl/SimpleIdentityObjectRelationshipTypeImpl.java =================================================================== --- trunk/identity-impl/src/test/java/org/jboss/identity/impl/SimpleIdentityObjectRelationshipTypeImpl.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/test/java/org/jboss/identity/impl/SimpleIdentityObjectRelationshipTypeImpl.java 2008-09-19 16:37:25 UTC (rev 95) @@ -22,7 +22,7 @@ package org.jboss.identity.impl; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; +import org.jboss.identity.spi.model.IdentityObjectRelationshipType; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-impl/src/test/java/org/jboss/identity/impl/SimpleIdentityObjectTypeImpl.java =================================================================== --- trunk/identity-impl/src/test/java/org/jboss/identity/impl/SimpleIdentityObjectTypeImpl.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/test/java/org/jboss/identity/impl/SimpleIdentityObjectTypeImpl.java 2008-09-19 16:37:25 UTC (rev 95) @@ -22,7 +22,7 @@ package org.jboss.identity.impl; -import org.jboss.identity.model.core.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectType; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/HibernateIdentityStoreTestCase.java =================================================================== --- trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/HibernateIdentityStoreTestCase.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/HibernateIdentityStoreTestCase.java 2008-09-19 16:37:25 UTC (rev 95) @@ -22,7 +22,8 @@ package org.jboss.identity.impl.store; -import org.jboss.identity.model.core.IdentityObject; +import org.jboss.identity.spi.model.IdentityObject; +import org.jboss.identity.spi.store.IdentityStoreInvocationContext; import org.hibernate.ejb.HibernateEntityManager; import java.util.Collection; @@ -51,7 +52,8 @@ super.setUp(); store = new HibernateIdentityStoreImpl(){ - protected HibernateEntityManager getEntityManager() + + protected HibernateEntityManager getHibernateEntityManager(IdentityStoreInvocationContext ctx) { return em; } @@ -72,7 +74,7 @@ for (int i = 0; i < types.length; i++) { RelationshipTypeEnum type = types[i]; - store.addIdentityObjectRelationshipType(type); + store.addIdentityObjectRelationshipType(null, type); } em.getTransaction().commit(); @@ -88,7 +90,7 @@ for (int i = 0; i < types.length; i++) { IdentityTypeEnum type = types[i]; - store.addIdentityObjectType(type); + store.addIdentityObjectType(null, type); } em.getTransaction().commit(); @@ -98,35 +100,35 @@ em.getTransaction().begin(); - IdentityObject user1 = store.createIdentityObject("Adam", IdentityTypeEnum.USER); - IdentityObject user2 = store.createIdentityObject("Eva", IdentityTypeEnum.USER); + IdentityObject user1 = store.createIdentityObject(null, "Adam", IdentityTypeEnum.USER); + IdentityObject user2 = store.createIdentityObject(null, "Eva", IdentityTypeEnum.USER); - IdentityObject group1 = store.createIdentityObject("Devision1", IdentityTypeEnum.ORGANIZATION); - IdentityObject group2 = store.createIdentityObject("Devision2", IdentityTypeEnum.ORGANIZATION); - IdentityObject group3 = store.createIdentityObject("Devision3", IdentityTypeEnum.ORGANIZATION); - IdentityObject group4 = store.createIdentityObject("Devision4", IdentityTypeEnum.ORGANIZATION); + IdentityObject group1 = store.createIdentityObject(null, "Devision1", IdentityTypeEnum.ORGANIZATION); + IdentityObject group2 = store.createIdentityObject(null, "Devision2", IdentityTypeEnum.ORGANIZATION); + IdentityObject group3 = store.createIdentityObject(null, "Devision3", IdentityTypeEnum.ORGANIZATION); + IdentityObject group4 = store.createIdentityObject(null, "Devision4", IdentityTypeEnum.ORGANIZATION); em.flush(); - assertEquals(0, store.getIdentityObjectsCount(IdentityTypeEnum.ROLE)); - assertEquals(2, store.getIdentityObjectsCount(IdentityTypeEnum.USER)); - assertEquals(4, store.getIdentityObjectsCount(IdentityTypeEnum.ORGANIZATION)); + assertEquals(0, store.getIdentityObjectsCount(null, IdentityTypeEnum.ROLE)); + assertEquals(2, store.getIdentityObjectsCount(null, IdentityTypeEnum.USER)); + assertEquals(4, store.getIdentityObjectsCount(null, IdentityTypeEnum.ORGANIZATION)); em.flush(); - store.removeIdentityObject(user1); - store.removeIdentityObject(group1); - store.removeIdentityObject(group2); + store.removeIdentityObject(null, user1); + store.removeIdentityObject(null, group1); + store.removeIdentityObject(null, group2); - assertEquals(1, store.getIdentityObjectsCount(IdentityTypeEnum.USER)); - assertEquals(2, store.getIdentityObjectsCount(IdentityTypeEnum.ORGANIZATION)); + assertEquals(1, store.getIdentityObjectsCount(null, IdentityTypeEnum.USER)); + assertEquals(2, store.getIdentityObjectsCount(null, IdentityTypeEnum.ORGANIZATION)); - store.removeIdentityObject(user2); - store.removeIdentityObject(group3); - store.removeIdentityObject(group4); + store.removeIdentityObject(null, user2); + store.removeIdentityObject(null, group3); + store.removeIdentityObject(null, group4); - assertEquals(0, store.getIdentityObjectsCount(IdentityTypeEnum.USER)); - assertEquals(0, store.getIdentityObjectsCount(IdentityTypeEnum.ORGANIZATION)); + assertEquals(0, store.getIdentityObjectsCount(null, IdentityTypeEnum.USER)); + assertEquals(0, store.getIdentityObjectsCount(null, IdentityTypeEnum.ORGANIZATION)); em.getTransaction().commit(); @@ -136,29 +138,29 @@ em.getTransaction().begin(); - IdentityObject user1 = store.createIdentityObject("Adam", IdentityTypeEnum.USER); - IdentityObject user2 = store.createIdentityObject("Eva", IdentityTypeEnum.USER); + IdentityObject user1 = store.createIdentityObject(null, "Adam", IdentityTypeEnum.USER); + IdentityObject user2 = store.createIdentityObject(null, "Eva", IdentityTypeEnum.USER); - IdentityObject group1 = store.createIdentityObject("Devision1", IdentityTypeEnum.ORGANIZATION); - IdentityObject group2 = store.createIdentityObject("Devision2", IdentityTypeEnum.ORGANIZATION); - IdentityObject group3 = store.createIdentityObject("Devision3", IdentityTypeEnum.ORGANIZATION); - IdentityObject group4 = store.createIdentityObject("Devision4", IdentityTypeEnum.ORGANIZATION); + IdentityObject group1 = store.createIdentityObject(null, "Devision1", IdentityTypeEnum.ORGANIZATION); + IdentityObject group2 = store.createIdentityObject(null, "Devision2", IdentityTypeEnum.ORGANIZATION); + IdentityObject group3 = store.createIdentityObject(null, "Devision3", IdentityTypeEnum.ORGANIZATION); + IdentityObject group4 = store.createIdentityObject(null, "Devision4", IdentityTypeEnum.ORGANIZATION); em.flush(); - IdentityObject xx = store.findIdentityObject("Adam", IdentityTypeEnum.USER); + IdentityObject xx = store.findIdentityObject(null, "Adam", IdentityTypeEnum.USER); assertEquals(xx.getId(), user1.getId()); - xx = store.findIdentityObject(user2.getId()); + xx = store.findIdentityObject(null, user2.getId()); assertEquals(xx.getId(), user2.getId()); - Collection results = store.findIdentityObject(IdentityTypeEnum.USER, 0, 0, true, true); + Collection results = store.findIdentityObject(null, IdentityTypeEnum.USER, 0, 0, true, true); assertEquals(2, results.size()); - results = store.findIdentityObject(IdentityTypeEnum.ORGANIZATION, 0, 0, true, true); + results = store.findIdentityObject(null, IdentityTypeEnum.ORGANIZATION, 0, 0, true, true); assertEquals(4, results.size()); - results = store.findIdentityObject(IdentityTypeEnum.ROLE, 0, 0, true, true); + results = store.findIdentityObject(null, IdentityTypeEnum.ROLE, 0, 0, true, true); assertEquals(0, results.size()); @@ -170,8 +172,8 @@ em.getTransaction().begin(); - IdentityObject user1 = store.createIdentityObject("Adam", IdentityTypeEnum.USER); - IdentityObject user2 = store.createIdentityObject("Eva", IdentityTypeEnum.USER); + IdentityObject user1 = store.createIdentityObject(null, "Adam", IdentityTypeEnum.USER); + IdentityObject user2 = store.createIdentityObject(null, "Eva", IdentityTypeEnum.USER); em.flush(); @@ -190,11 +192,11 @@ vals.add("val4"); attrs.put("key2", vals); - store.addAttributes(user1, attrs); + store.addAttributes(null, user1, attrs); em.flush(); - Map<String, Set<String>> persistedAttrs = store.getAttributes(user1); + Map<String, Set<String>> persistedAttrs = store.getAttributes(null, user1); assertEquals(2, persistedAttrs.keySet().size()); @@ -211,11 +213,11 @@ vals.add("val1"); attrs.put("key3", vals); - store.addAttributes(user1, attrs); + store.addAttributes(null, user1, attrs); em.flush(); - persistedAttrs = store.getAttributes(user1); + persistedAttrs = store.getAttributes(null, user1); assertEquals(3, persistedAttrs.keySet().size()); @@ -230,11 +232,11 @@ em.flush(); - store.updateAttributes(user1, attrs); + store.updateAttributes(null, user1, attrs); em.flush(); - persistedAttrs = store.getAttributes(user1); + persistedAttrs = store.getAttributes(null, user1); assertEquals(1, persistedAttrs.keySet().size()); @@ -245,11 +247,11 @@ Set<String> names = new HashSet<String>(); names.add("key3"); - store.removeAttributes(user1, names); + store.removeAttributes(null, user1, names); em.flush(); - persistedAttrs = store.getAttributes(user1); + persistedAttrs = store.getAttributes(null, user1); assertEquals(0, persistedAttrs.keySet().size()); @@ -262,41 +264,41 @@ em.getTransaction().begin(); - IdentityObject user1 = store.createIdentityObject("Adam", IdentityTypeEnum.USER); - IdentityObject user2 = store.createIdentityObject("Eva", IdentityTypeEnum.USER); + IdentityObject user1 = store.createIdentityObject(null, "Adam", IdentityTypeEnum.USER); + IdentityObject user2 = store.createIdentityObject(null, "Eva", IdentityTypeEnum.USER); - IdentityObject group1 = store.createIdentityObject("Devision1", IdentityTypeEnum.ORGANIZATION); - IdentityObject group2 = store.createIdentityObject("Devision2", IdentityTypeEnum.ORGANIZATION); - IdentityObject group3 = store.createIdentityObject("Devision3", IdentityTypeEnum.ORGANIZATION); - IdentityObject group4 = store.createIdentityObject("Devision4", IdentityTypeEnum.ORGANIZATION); + IdentityObject group1 = store.createIdentityObject(null, "Devision1", IdentityTypeEnum.ORGANIZATION); + IdentityObject group2 = store.createIdentityObject(null, "Devision2", IdentityTypeEnum.ORGANIZATION); + IdentityObject group3 = store.createIdentityObject(null, "Devision3", IdentityTypeEnum.ORGANIZATION); + IdentityObject group4 = store.createIdentityObject(null, "Devision4", IdentityTypeEnum.ORGANIZATION); em.flush(); - store.createRelationship(group1, user1, RelationshipTypeEnum.MEMBER); - store.createRelationship(group2, user1, RelationshipTypeEnum.MEMBER); + store.createRelationship(null, group1, user1, RelationshipTypeEnum.MEMBER); + store.createRelationship(null, group2, user1, RelationshipTypeEnum.MEMBER); em.flush(); - assertEquals(1, store.resolveRelationships(group1, user1).size()); - assertEquals(0, store.resolveRelationships(user1, group1).size()); - assertEquals(1, store.resolveRelationships(group2, user1).size()); - assertEquals(0, store.resolveRelationships(user1, group2).size()); + assertEquals(1, store.resolveRelationships(null, group1, user1).size()); + assertEquals(0, store.resolveRelationships(null, user1, group1).size()); + assertEquals(1, store.resolveRelationships(null, group2, user1).size()); + assertEquals(0, store.resolveRelationships(null, user1, group2).size()); - store.removeRelationship(group2, user1, RelationshipTypeEnum.MEMBER); + store.removeRelationship(null, group2, user1, RelationshipTypeEnum.MEMBER); em.flush(); - assertEquals(1, store.resolveRelationships(group1, user1).size()); - assertEquals(0, store.resolveRelationships(user1, group1).size()); - assertEquals(0, store.resolveRelationships(group2, user1).size()); - assertEquals(0, store.resolveRelationships(user1, group2).size()); + assertEquals(1, store.resolveRelationships(null, group1, user1).size()); + assertEquals(0, store.resolveRelationships(null, user1, group1).size()); + assertEquals(0, store.resolveRelationships(null, group2, user1).size()); + assertEquals(0, store.resolveRelationships(null, user1, group2).size()); - store.removeRelationships(user1, group1); + store.removeRelationships(null, user1, group1); - assertEquals(0, store.resolveRelationships(group1, user1).size()); - assertEquals(0, store.resolveRelationships(user1, group1).size()); - assertEquals(0, store.resolveRelationships(group2, user1).size()); - assertEquals(0, store.resolveRelationships(user1, group2).size()); + assertEquals(0, store.resolveRelationships(null, group1, user1).size()); + assertEquals(0, store.resolveRelationships(null, user1, group1).size()); + assertEquals(0, store.resolveRelationships(null, group2, user1).size()); + assertEquals(0, store.resolveRelationships(null, user1, group2).size()); em.getTransaction().commit(); Modified: trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/IdentityTypeEnum.java =================================================================== --- trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/IdentityTypeEnum.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/IdentityTypeEnum.java 2008-09-19 16:37:25 UTC (rev 95) @@ -22,7 +22,7 @@ package org.jboss.identity.impl.store; -import org.jboss.identity.model.core.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectType; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/RelationshipTypeEnum.java =================================================================== --- trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/RelationshipTypeEnum.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-impl/src/test/java/org/jboss/identity/impl/store/RelationshipTypeEnum.java 2008-09-19 16:37:25 UTC (rev 95) @@ -23,7 +23,7 @@ package org.jboss.identity.impl.store; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; +import org.jboss.identity.spi.model.IdentityObjectRelationshipType; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-spi/pom.xml =================================================================== --- trunk/identity-spi/pom.xml 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-spi/pom.xml 2008-09-19 16:37:25 UTC (rev 95) @@ -33,11 +33,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.jboss.identity</groupId> - <artifactId>jboss-identity-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/attribute/PasswordAttribute.java =================================================================== --- trunk/identity-spi/src/main/java/org/jboss/identity/spi/attribute/PasswordAttribute.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/attribute/PasswordAttribute.java 2008-09-19 16:37:25 UTC (rev 95) @@ -23,8 +23,8 @@ import java.util.Date; -import org.jboss.identity.model.core.IdentityObjectType; -import org.jboss.identity.model.core.IdentityObjectAttribute; +import org.jboss.identity.spi.model.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectAttribute; import org.jboss.identity.spi.policy.PasswordExpirationPolicy; /** Copied: trunk/identity-spi/src/main/java/org/jboss/identity/spi/model (from rev 84, trunk/identity-model/src/main/java/org/jboss/identity/model/core) Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObject.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObject.java 2008-09-11 22:01:24 UTC (rev 84) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObject.java 2008-09-19 16:37:25 UTC (rev 95) @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.identity.model.core; +package org.jboss.identity.spi.model; import java.util.Map; import java.util.Set; Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectAttribute.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectAttribute.java 2008-09-11 22:01:24 UTC (rev 84) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectAttribute.java 2008-09-19 16:37:25 UTC (rev 95) @@ -19,7 +19,7 @@ * 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.core; +package org.jboss.identity.spi.model; /** * An attribute of an identity Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectRelationship.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectRelationship.java 2008-09-11 22:01:24 UTC (rev 84) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectRelationship.java 2008-09-19 16:37:25 UTC (rev 95) @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.identity.model.core; +package org.jboss.identity.spi.model; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectRelationshipType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectRelationshipType.java 2008-09-11 22:01:24 UTC (rev 84) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectRelationshipType.java 2008-09-19 16:37:25 UTC (rev 95) @@ -19,7 +19,7 @@ * 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.core; +package org.jboss.identity.spi.model; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectType.java 2008-09-11 22:01:24 UTC (rev 84) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/model/IdentityObjectType.java 2008-09-19 16:37:25 UTC (rev 95) @@ -19,7 +19,7 @@ * 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.core; +package org.jboss.identity.spi.model; /** * @author Anil.Saldhana(a)redhat.com Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/policy/PasswordExpirationPolicy.java =================================================================== --- trunk/identity-spi/src/main/java/org/jboss/identity/spi/policy/PasswordExpirationPolicy.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/policy/PasswordExpirationPolicy.java 2008-09-19 16:37:25 UTC (rev 95) @@ -21,7 +21,7 @@ */ package org.jboss.identity.spi.policy; -import org.jboss.identity.model.core.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectType; /** * Policy to govern Passwords Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/policy/RelationshipPolicy.java =================================================================== --- trunk/identity-spi/src/main/java/org/jboss/identity/spi/policy/RelationshipPolicy.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/policy/RelationshipPolicy.java 2008-09-19 16:37:25 UTC (rev 95) @@ -21,7 +21,7 @@ */ package org.jboss.identity.spi.policy; -import org.jboss.identity.model.core.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectType; import org.jboss.identity.exception.PolicyValidationException; /** Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/repository/IdentityStoreRepository.java =================================================================== --- trunk/identity-spi/src/main/java/org/jboss/identity/spi/repository/IdentityStoreRepository.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/repository/IdentityStoreRepository.java 2008-09-19 16:37:25 UTC (rev 95) @@ -25,7 +25,7 @@ import java.util.Set; import java.util.List; -import org.jboss.identity.model.core.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectType; import org.jboss.identity.spi.store.IdentityStore; import org.jboss.identity.spi.policy.RelationshipPolicy; Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/AttributeStore.java =================================================================== --- trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/AttributeStore.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/AttributeStore.java 2008-09-19 16:37:25 UTC (rev 95) @@ -22,8 +22,8 @@ package org.jboss.identity.spi.store; -import org.jboss.identity.model.core.IdentityObjectType; -import org.jboss.identity.model.core.IdentityObject; +import org.jboss.identity.spi.model.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObject; import org.jboss.identity.exception.IdentityException; import java.util.Set; @@ -40,49 +40,51 @@ { /** - * @param identityType - * @return names of supported attributes + * @param invocationContext + * @param identityType @return names of supported attributes + * @return * @throws org.jboss.identity.exception.IdentityException */ - <T extends IdentityObjectType> Set<String> getSupportedAttributeNames(T identityType) + <T extends IdentityObjectType> Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, T identityType) throws IdentityException; /** * Get attributes for the given identity * - * @param identity - * @return + * @param invocationContext + *@param identity @return * @throws IdentityException */ - Map<String, Set<String>> getAttributes(IdentityObject identity) throws IdentityException; + Map<String, Set<String>> getAttributes(IdentityStoreInvocationContext invocationContext, IdentityObject identity) throws IdentityException; /** * Update attributes with new values - previous values will be overwritten - * @param identity - * @param attributes - * @throws IdentityException + * @param invocationCtx + *@param identity + * @param attributes @throws IdentityException */ - void updateAttributes(IdentityObject identity, Map<String, Set<String>> attributes) + void updateAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, Map<String, Set<String>> attributes) throws IdentityException; /** * Add new attributes - if attribute with given name already exists the values * will be appended * - * @param identity - * @param attributes - * @throws IdentityException + * @param invocationCtx + *@param identity + * @param attributes @throws IdentityException */ - void addAttributes(IdentityObject identity, Map<String, Set<String>> attributes) + void addAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, Map<String, Set<String>> attributes) throws IdentityException; /** * Remove attributes * + * @param invocationCtx * @param identity * @param attributes */ - void removeAttributes(IdentityObject identity, Set<String> attributes) + void removeAttributes(IdentityStoreInvocationContext invocationCtx, IdentityObject identity, Set<String> attributes) throws IdentityException; } Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/FeaturesDescription.java =================================================================== --- trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/FeaturesDescription.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/FeaturesDescription.java 2008-09-19 16:37:25 UTC (rev 95) @@ -24,8 +24,8 @@ import java.util.Set; import java.util.Map; -import org.jboss.identity.model.core.IdentityObjectType; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; +import org.jboss.identity.spi.model.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectRelationshipType; import org.jboss.identity.spi.exception.IdentityTypeNotSupportedException; import org.jboss.identity.exception.IdentityException; Modified: trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/IdentityStore.java =================================================================== --- trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/IdentityStore.java 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/IdentityStore.java 2008-09-19 16:37:25 UTC (rev 95) @@ -26,9 +26,9 @@ import java.util.Map; import java.util.Set; -import org.jboss.identity.model.core.IdentityObject; -import org.jboss.identity.model.core.IdentityObjectType; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; +import org.jboss.identity.spi.model.IdentityObject; +import org.jboss.identity.spi.model.IdentityObjectType; +import org.jboss.identity.spi.model.IdentityObjectRelationshipType; import org.jboss.identity.exception.IdentityException; /** @@ -62,47 +62,53 @@ /** * Create new identity with a given name * + * @param invocationCtx * @param name * @param identityObjectType * @return * @throws IdentityException */ - IdentityObject createIdentityObject(String name, IdentityObjectType identityObjectType) throws IdentityException; + IdentityObject createIdentityObject(IdentityStoreInvocationContext invocationCtx, String name, IdentityObjectType identityObjectType) throws IdentityException; /** * Remove given identity * + * @param invocationCtx * @param identity + * @return * @throws IdentityException */ - void removeIdentityObject(IdentityObject identity) throws IdentityException; + void removeIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObject identity) throws IdentityException; /** + * @param invocationCtx * @param identityType - * @return a number of stored identities with a given type + * @return a number of stored identities with a given type * @throws IdentityException */ - <T extends IdentityObjectType> int getIdentityObjectsCount(T identityType) + int getIdentityObjectsCount(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType) throws IdentityException; /** * Find identity with a given name * + * @param invocationContext * @param name * @param identityObjectType * @return * @throws IdentityException */ - IdentityObject findIdentityObject(String name, IdentityObjectType identityObjectType) throws IdentityException; + IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, String name, IdentityObjectType identityObjectType) throws IdentityException; /** * Find identity with a given id * + * @param invocationContext * @param id * @return * @throws IdentityException */ - IdentityObject findIdentityObject(Object id) throws IdentityException; + IdentityObject findIdentityObject(IdentityStoreInvocationContext invocationContext, Object id) throws IdentityException; /** * Find identities with a given type paginated and ordered. @@ -110,34 +116,39 @@ * are not supported in this store implementation, dedicated * parameters will take no effect * + * @param invocationCtx * @param identityType * @param offset * @param limit 0 means unlimited page size * @param orderByName - *@param ascending default true @return @throws IdentityException + * @param ascending default true + * @return + * @throws IdentityException */ - Collection<IdentityObject> findIdentityObject(IdentityObjectType identityType, - int offset, int limit, - boolean orderByName, - boolean ascending) throws IdentityException; + Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType, + int offset, int limit, + boolean orderByName, + boolean ascending) throws IdentityException; /** * Find identities with a given attributes values. If the paginatedSearch or * orderedSearch operations * are not supported in this store implementation, dedicated parameters will take no effect * + * @param invocationCtx * @param identityType * @param attributes * @param offset * @param limit 0 means unlimited page size * @param orderByName - *@param ascending default true @return + * @param ascending default true + * @return * @throws IdentityException */ - Collection<IdentityObject> findIdentityObject(IdentityObjectType identityType, - Map<String, String[]> attributes, - int offset, int limit, - boolean orderByName, boolean ascending) throws IdentityException; + Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType, + Map<String, String[]> attributes, + int offset, int limit, + boolean orderByName, boolean ascending) throws IdentityException; /** * Find identites that have relationship with given identity. Relationships are directional (from parent to child). @@ -145,6 +156,7 @@ * are not supported in this store implementation, dedicated parameters will * take no effect * + * @param invocationCxt * @param identity * @param relationshipType * @param parent defines if given identity is parent or child side in the @@ -152,65 +164,71 @@ * @param offset * @param limit 0 means unlimited page size * @param orderByName - *@param ascending default true @return + * @param ascending default true + * @return * @throws IdentityException */ - Collection<IdentityObject> findIdentityObject(IdentityObject identity, - IdentityObjectRelationshipType relationshipType, - boolean parent, - int offset, int limit, - boolean orderByName, - boolean ascending) throws IdentityException; + Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, IdentityObject identity, + IdentityObjectRelationshipType relationshipType, + boolean parent, + int offset, int limit, + boolean orderByName, + boolean ascending) throws IdentityException; /** * Create directional relationship of a given type between identities * + * @param invocationCxt * @param fromIdentity * @param toIdentity * @param relationshipType * @throws IdentityException */ - void createRelationship(IdentityObject fromIdentity, - IdentityObject toIdentity, - IdentityObjectRelationshipType relationshipType) throws IdentityException; + void createRelationship(IdentityStoreInvocationContext invocationCxt, IdentityObject fromIdentity, + IdentityObject toIdentity, + IdentityObjectRelationshipType relationshipType) throws IdentityException; /** * Remove relationship between identities. Relationships can be directional so * order of parameters matters * + * @param invocationCxt * @param fromIdentity * @param toIdentity * @param relationshipType * @throws IdentityException */ - void removeRelationship(IdentityObject fromIdentity, - IdentityObject toIdentity, - IdentityObjectRelationshipType relationshipType) throws IdentityException; + void removeRelationship(IdentityStoreInvocationContext invocationCxt, IdentityObject fromIdentity, + IdentityObject toIdentity, + IdentityObjectRelationshipType relationshipType) throws IdentityException; /** * Remove all relationships between identities. Direction of relationships doesn't * matter - all active relationships * will be removed * + * @param invocationCtx * @param identity1 * @param identity2 + * @return * @throws IdentityException */ - void removeRelationships(IdentityObject identity1, IdentityObject identity2) + void removeRelationships(IdentityStoreInvocationContext invocationCtx, IdentityObject identity1, IdentityObject identity2) throws IdentityException; /** * Resolve relationship types between two identities. Relationships can be directional * so order of parameters matters * + * @param invocationCxt * @param fromIdentity * @param toIdentity * @return * @throws IdentityException */ - Set<IdentityObjectRelationshipType> resolveRelationships(IdentityObject fromIdentity, IdentityObject toIdentity) + Set<IdentityObjectRelationshipType> resolveRelationships(IdentityStoreInvocationContext invocationCxt, IdentityObject fromIdentity, IdentityObject toIdentity) throws IdentityException; } \ No newline at end of file Added: trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/IdentityStoreInvocationContext.java =================================================================== --- trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/IdentityStoreInvocationContext.java (rev 0) +++ trunk/identity-spi/src/main/java/org/jboss/identity/spi/store/IdentityStoreInvocationContext.java 2008-09-19 16:37:25 UTC (rev 95) @@ -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.spi.store; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public interface IdentityStoreInvocationContext +{ +} Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-09-19 11:38:01 UTC (rev 94) +++ trunk/pom.xml 2008-09-19 16:37:25 UTC (rev 95) @@ -16,7 +16,6 @@ <modules> <module>parent</module> <module>identity-common</module> - <module>identity-model</module> <module>identity-spi</module> <module>identity-api</module> <module>identity-impl</module>