Author: bdaw
Date: 2009-11-11 17:47:31 -0500 (Wed, 11 Nov 2009)
New Revision: 928
Modified:
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityTypeEventListener.java
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RelationshipEventListener.java
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RoleEventListener.java
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RoleTypeEventListener.java
idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java
idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java
Log:
- improve event API by passing current session object to listeners
Modified:
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityTypeEventListener.java
===================================================================
---
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityTypeEventListener.java 2009-11-11
22:20:53 UTC (rev 927)
+++
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityTypeEventListener.java 2009-11-11
22:47:31 UTC (rev 928)
@@ -1,9 +1,6 @@
package org.jboss.identity.idm.api.event;
-import org.jboss.identity.idm.api.IdentityType;
-import org.jboss.identity.idm.api.Attribute;
-import org.jboss.identity.idm.api.User;
-import org.jboss.identity.idm.api.Credential;/*
+import org.jboss.identity.idm.api.*;/*
* JBoss, a division of Red Hat
* Copyright 2009, Red Hat Middleware, LLC, and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -33,81 +30,93 @@
/**
* Method invoked before given IdentityType is created
+ * @param session
* @param identityType
*/
- void preCreate(IdentityType identityType);
+ void preCreate(IdentitySession session, IdentityType identityType);
/**
* Method invoked after given IdentityType is created
+ * @param session
* @param identityType
*/
- void postCreate(IdentityType identityType);
+ void postCreate(IdentitySession session, IdentityType identityType);
/**
* Method invoked before given IdentityType is removed
+ * @param session
* @param identityType
*/
- void preRemove(IdentityType identityType);
+ void preRemove(IdentitySession session, IdentityType identityType);
/**
* Method invoked after given IdentityType is removed
+ * @param session
* @param identityType
*/
- void postRemove(IdentityType identityType);
+ void postRemove(IdentitySession session, IdentityType identityType);
/**
* Method invoked before attributes are added for a given IdentityType
+ * @param session
* @param identityType
* @param attributes
*/
- void preAttributesAdd(IdentityType identityType, Attribute[] attributes);
+ void preAttributesAdd(IdentitySession session, IdentityType identityType, Attribute[]
attributes);
/**
* Method invoked after attributes are added for a given IdentityType
+ * @param session
* @param identityType
* @param attributes
*/
- void postAttributesAdd(IdentityType identityType, Attribute[] attributes);
+ void postAttributesAdd(IdentitySession session, IdentityType identityType,
Attribute[] attributes);
/**
* Method invoked before attributes are removed for a given IdentityType
+ * @param session
* @param identityType
* @param attributes
*/
- void preAttributesRemove(IdentityType identityType, String[] attributes);
+ void preAttributesRemove(IdentitySession session, IdentityType identityType, String[]
attributes);
/**
* Method invoked after attributes are removed for a given IdentityType
+ * @param session
* @param identityType
* @param attributes
*/
- void postAttributesRemove(IdentityType identityType, String[] attributes);
+ void postAttributesRemove(IdentitySession session, IdentityType identityType,
String[] attributes);
/**
* Method invoked before attributes are updated for a given IdentityType
+ * @param session
* @param identityType
* @param attributes
*/
- void preAttributesUpdate(IdentityType identityType, Attribute[] attributes);
+ void preAttributesUpdate(IdentitySession session, IdentityType identityType,
Attribute[] attributes);
/**
* Method invoked after attributes are updated for a given IdentityType
+ * @param session
* @param identityType
* @param attributes
*/
- void postAttributesUpdate(IdentityType identityType, Attribute[] attributes);
+ void postAttributesUpdate(IdentitySession session, IdentityType identityType,
Attribute[] attributes);
/**
* Method invoked before credential is updated for a given User
+ * @param session
* @param user
* @param credential
*/
- void preCredentialUpdate(User user, Credential credential);
+ void preCredentialUpdate(IdentitySession session, User user, Credential credential);
/**
* Method invoked after credential is updated for a given User
+ * @param session
* @param user
* @param credential
*/
- void postCredentialUpdate(User user, Credential credential);
+ void postCredentialUpdate(IdentitySession session, User user, Credential credential);
}
Modified:
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RelationshipEventListener.java
===================================================================
---
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RelationshipEventListener.java 2009-11-11
22:20:53 UTC (rev 927)
+++
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RelationshipEventListener.java 2009-11-11
22:47:31 UTC (rev 928)
@@ -1,7 +1,8 @@
package org.jboss.identity.idm.api.event;
import org.jboss.identity.idm.api.Group;
-import org.jboss.identity.idm.api.User;/*
+import org.jboss.identity.idm.api.User;
+import org.jboss.identity.idm.api.IdentitySession;/*
* JBoss, a division of Red Hat
* Copyright 2009, Red Hat Middleware, LLC, and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -31,63 +32,71 @@
/**
* Method invoked before association is created between Group and User
+ * @param session
* @param parent
* @param member
*/
- void preUserAssociationCreate(Group parent, User member);
+ void preUserAssociationCreate(IdentitySession session, Group parent, User member);
/**
* Method invoked before association is created between Groups
- * \
+ *
+ * @param session
* @param parent
* @param member
*/
- void preGroupAssociationCreate(Group parent, Group member);
+ void preGroupAssociationCreate(IdentitySession session, Group parent, Group member);
/**
* Method invoked after association is created between Group and User
*
+ * @param session
* @param parent
* @param member
*/
- void postUserAssociationCreate(Group parent, User member);
+ void postUserAssociationCreate(IdentitySession session, Group parent, User member);
/**
* Method invoked after association is created between Groups
*
+ * @param session
* @param parent
* @param member
*/
- void postGroupAssociationCreate(Group parent, Group member);
+ void postGroupAssociationCreate(IdentitySession session, Group parent, Group member);
/**
* Method invoked before association is removed between Group and User
+ * @param session
* @param parent
* @param member
*/
- void preUserAssociationRemove(Group parent, User member);
+ void preUserAssociationRemove(IdentitySession session, Group parent, User member);
/**
* Method invoked before association is removed between Groups
+ * @param session
* @param parent
* @param member
*/
- void preGroupAssociationRemove(Group parent, Group member);
+ void preGroupAssociationRemove(IdentitySession session, Group parent, Group member);
/**
* Method invoked after association is removed between Group and User
*
+ * @param session
* @param parent
* @param member
*/
- void postUserAssociationRemove(Group parent, User member);
+ void postUserAssociationRemove(IdentitySession session, Group parent, User member);
/**
* Method invoked after association is removed between Groups
*
+ * @param session
* @param parent
* @param member
*/
- void postGroupAssociationRemove(Group parent, Group member);
+ void postGroupAssociationRemove(IdentitySession session, Group parent, Group member);
}
Modified:
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RoleEventListener.java
===================================================================
---
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RoleEventListener.java 2009-11-11
22:20:53 UTC (rev 927)
+++
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RoleEventListener.java 2009-11-11
22:47:31 UTC (rev 928)
@@ -1,6 +1,7 @@
package org.jboss.identity.idm.api.event;
import org.jboss.identity.idm.api.Role;
+import org.jboss.identity.idm.api.IdentitySession;
import java.util.Map;
import java.util.Collection;/*
@@ -33,54 +34,62 @@
/**
* Method invoked before Role is created
+ * @param session
* @param role
*/
- void preCreate(Role role);
+ void preCreate(IdentitySession session, Role role);
/**
* Method invoked after Role is created
+ * @param session
* @param role
*/
- void postCreate(Role role);
+ void postCreate(IdentitySession session, Role role);
/**
* Method invoked before Role is created
+ * @param session
* @param role
*/
- void preRemove(Role role);
+ void preRemove(IdentitySession session, Role role);
/**
* Method invoked after Role is created
+ * @param session
* @param role
*/
- void postRemove(Role role);
+ void postRemove(IdentitySession session, Role role);
/**
* Method invoked before properties are set
+ * @param session
* @param role
* @param properties
*/
- void prePropertiesSet(Role role, Map<String, String> properties);
+ void prePropertiesSet(IdentitySession session, Role role, Map<String, String>
properties);
/**
* Method invoked after properties are set
+ * @param session
* @param role
* @param properties
*/
- void postPropertiesSet(Role role, Map<String, String> properties);
+ void postPropertiesSet(IdentitySession session, Role role, Map<String, String>
properties);
/**
* Method invoked before properties are removed
+ * @param session
* @param role
* @param names
*/
- void prePropertiesRemove(Role role, Collection<String> names);
+ void prePropertiesRemove(IdentitySession session, Role role, Collection<String>
names);
/**
* Method invoked after properties are removed
+ * @param session
* @param role
* @param names
*/
- void postPropertiesRemove(Role role, Collection<String> names);
+ void postPropertiesRemove(IdentitySession session, Role role, Collection<String>
names);
}
Modified:
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RoleTypeEventListener.java
===================================================================
---
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RoleTypeEventListener.java 2009-11-11
22:20:53 UTC (rev 927)
+++
idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/RoleTypeEventListener.java 2009-11-11
22:47:31 UTC (rev 928)
@@ -1,6 +1,7 @@
package org.jboss.identity.idm.api.event;
import org.jboss.identity.idm.api.RoleType;
+import org.jboss.identity.idm.api.IdentitySession;
import java.util.Map;
import java.util.Collection;/*
@@ -33,55 +34,63 @@
/**
* Method invoked before RoleType is created
+ * @param session
* @param roleType
*/
- void preCreate(RoleType roleType);
+ void preCreate(IdentitySession session, RoleType roleType);
/**
* Method invoked after RoleType is created
+ * @param session
* @param roleType
*/
- void postCreate(RoleType roleType);
+ void postCreate(IdentitySession session, RoleType roleType);
/**
* Method invoked before RoleType is created
+ * @param session
* @param roleType
*/
- void preRemove(RoleType roleType);
+ void preRemove(IdentitySession session, RoleType roleType);
/**
* Method invoked after RoleType is created
+ * @param session
* @param roleType
*/
- void postRemove(RoleType roleType);
+ void postRemove(IdentitySession session, RoleType roleType);
/**
* Method invoked before properties are set
+ * @param session
* @param roleType
* @param properties
*/
- void prePropertiesSet(RoleType roleType, Map<String, String> properties);
+ void prePropertiesSet(IdentitySession session, RoleType roleType, Map<String,
String> properties);
/**
* Method invoked after properties are set
+ * @param session
* @param roleType
* @param properties
*/
- void postPropertiesSet(RoleType roleType, Map<String, String> properties);
+ void postPropertiesSet(IdentitySession session, RoleType roleType, Map<String,
String> properties);
/**
* Method invoked before properties are removed
+ * @param session
* @param roleType
* @param names
*/
- void prePropertiesRemove(RoleType roleType, Collection<String> names);
+ void prePropertiesRemove(IdentitySession session, RoleType roleType,
Collection<String> names);
/**
* Method invoked after properties are removed
+ * @param session
* @param roleType
* @param names
*/
- void postPropertiesRemove(RoleType roleType, Collection<String> names);
+ void postPropertiesRemove(IdentitySession session, RoleType roleType,
Collection<String> names);
Modified:
idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java
===================================================================
---
idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java 2009-11-11
22:20:53 UTC (rev 927)
+++
idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java 2009-11-11
22:47:31 UTC (rev 928)
@@ -49,7 +49,7 @@
* @version : 0.1 $
*/
public abstract class AbstractManager
- implements Serializable, IdentityTypeEventListener, RelationshipEventListener,
RoleTypeEventListener, RoleEventListener
+ implements Serializable
{
protected final IdentitySessionImpl identitySession;
@@ -287,7 +287,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).preCreate(identityType);
+ ((IdentityTypeEventListener)el).preCreate(identitySession, identityType);
}
}
}
@@ -298,7 +298,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).postCreate(identityType);
+ ((IdentityTypeEventListener)el).postCreate(identitySession, identityType);
}
}
}
@@ -309,7 +309,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).preRemove(identityType);
+ ((IdentityTypeEventListener)el).preRemove(identitySession, identityType);
}
}
}
@@ -320,7 +320,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).postRemove(identityType);
+ ((IdentityTypeEventListener)el).postRemove(identitySession, identityType);
}
}
}
@@ -331,7 +331,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).preAttributesAdd(identityType, attributes);
+ ((IdentityTypeEventListener)el).preAttributesAdd(identitySession,
identityType, attributes);
}
}
}
@@ -342,7 +342,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).postAttributesAdd(identityType, attributes);
+ ((IdentityTypeEventListener)el).postAttributesAdd(identitySession,
identityType, attributes);
}
}
}
@@ -353,7 +353,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).preAttributesRemove(identityType,
attributes);
+ ((IdentityTypeEventListener)el).preAttributesRemove(identitySession,
identityType, attributes);
}
}
}
@@ -364,7 +364,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).postAttributesRemove(identityType,
attributes);
+ ((IdentityTypeEventListener)el).postAttributesRemove(identitySession,
identityType, attributes);
}
}
}
@@ -375,7 +375,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).preAttributesUpdate(identityType,
attributes);
+ ((IdentityTypeEventListener)el).preAttributesUpdate(identitySession,
identityType, attributes);
}
}
}
@@ -386,7 +386,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).postAttributesUpdate(identityType,
attributes);
+ ((IdentityTypeEventListener)el).postAttributesUpdate(identitySession,
identityType, attributes);
}
}
}
@@ -397,7 +397,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).preCredentialUpdate(user, credential);
+ ((IdentityTypeEventListener)el).preCredentialUpdate(identitySession, user,
credential);
}
}
}
@@ -408,7 +408,7 @@
{
if (el instanceof IdentityTypeEventListener)
{
- ((IdentityTypeEventListener)el).postCredentialUpdate(user, credential);
+ ((IdentityTypeEventListener)el).postCredentialUpdate(identitySession, user,
credential);
}
}
}
@@ -419,7 +419,7 @@
{
if (el instanceof RelationshipEventListener)
{
- ((RelationshipEventListener)el).preUserAssociationCreate(parent, childs);
+ ((RelationshipEventListener)el).preUserAssociationCreate(identitySession,
parent, childs);
}
}
}
@@ -430,7 +430,7 @@
{
if (el instanceof RelationshipEventListener)
{
- ((RelationshipEventListener)el).preGroupAssociationCreate(parent, childs);
+ ((RelationshipEventListener)el).preGroupAssociationCreate(identitySession,
parent, childs);
}
}
}
@@ -441,7 +441,7 @@
{
if (el instanceof RelationshipEventListener)
{
- ((RelationshipEventListener)el).postUserAssociationCreate(parent, childs);
+ ((RelationshipEventListener)el).postUserAssociationCreate(identitySession,
parent, childs);
}
}
}
@@ -452,7 +452,7 @@
{
if (el instanceof RelationshipEventListener)
{
- ((RelationshipEventListener)el).postGroupAssociationCreate(parent, childs);
+ ((RelationshipEventListener)el).postGroupAssociationCreate(identitySession,
parent, childs);
}
}
}
@@ -463,7 +463,7 @@
{
if (el instanceof RelationshipEventListener)
{
- ((RelationshipEventListener)el).preUserAssociationRemove(parent, childs);
+ ((RelationshipEventListener)el).preUserAssociationRemove(identitySession,
parent, childs);
}
}
}
@@ -474,7 +474,7 @@
{
if (el instanceof RelationshipEventListener)
{
- ((RelationshipEventListener)el).preGroupAssociationRemove(parent, childs);
+ ((RelationshipEventListener)el).preGroupAssociationRemove(identitySession,
parent, childs);
}
}
}
@@ -485,7 +485,7 @@
{
if (el instanceof RelationshipEventListener)
{
- ((RelationshipEventListener)el).postUserAssociationRemove(parent, childs);
+ ((RelationshipEventListener)el).postUserAssociationRemove(identitySession,
parent, childs);
}
}
}
@@ -496,7 +496,7 @@
{
if (el instanceof RelationshipEventListener)
{
- ((RelationshipEventListener)el).postGroupAssociationRemove(parent, childs);
+ ((RelationshipEventListener)el).postGroupAssociationRemove(identitySession,
parent, childs);
}
}
}
@@ -507,7 +507,7 @@
{
if (el instanceof RoleTypeEventListener)
{
- ((RoleTypeEventListener)el).preCreate(roleType);
+ ((RoleTypeEventListener)el).preCreate(identitySession, roleType);
}
}
}
@@ -518,7 +518,7 @@
{
if (el instanceof RoleTypeEventListener)
{
- ((RoleTypeEventListener)el).postCreate(roleType);
+ ((RoleTypeEventListener)el).postCreate(identitySession, roleType);
}
}
}
@@ -529,7 +529,7 @@
{
if (el instanceof RoleTypeEventListener)
{
- ((RoleTypeEventListener)el).preRemove(roleType);
+ ((RoleTypeEventListener)el).preRemove(identitySession, roleType);
}
}
}
@@ -540,7 +540,7 @@
{
if (el instanceof RoleTypeEventListener)
{
- ((RoleTypeEventListener)el).postRemove(roleType);
+ ((RoleTypeEventListener)el).postRemove(identitySession, roleType);
}
}
}
@@ -551,7 +551,7 @@
{
if (el instanceof RoleTypeEventListener)
{
- ((RoleTypeEventListener)el).prePropertiesSet(roleType, properties);
+ ((RoleTypeEventListener)el).prePropertiesSet(identitySession, roleType,
properties);
}
}
}
@@ -562,7 +562,7 @@
{
if (el instanceof RoleTypeEventListener)
{
- ((RoleTypeEventListener)el).postPropertiesSet(roleType, properties);
+ ((RoleTypeEventListener)el).postPropertiesSet(identitySession, roleType,
properties);
}
}
}
@@ -573,7 +573,7 @@
{
if (el instanceof RoleEventListener)
{
- ((RoleEventListener)el).preCreate(role);
+ ((RoleEventListener)el).preCreate(identitySession, role);
}
}
}
@@ -584,7 +584,7 @@
{
if (el instanceof RoleEventListener)
{
- ((RoleEventListener)el).postCreate(role);
+ ((RoleEventListener)el).postCreate(identitySession, role);
}
}
}
@@ -595,7 +595,7 @@
{
if (el instanceof RoleEventListener)
{
- ((RoleEventListener)el).preRemove(role);
+ ((RoleEventListener)el).preRemove(identitySession, role);
}
}
}
@@ -606,7 +606,7 @@
{
if (el instanceof RoleEventListener)
{
- ((RoleEventListener)el).postRemove(role);
+ ((RoleEventListener)el).postRemove(identitySession, role);
}
}
}
@@ -617,7 +617,7 @@
{
if (el instanceof RoleEventListener)
{
- ((RoleEventListener)el).prePropertiesSet(role, properties);
+ ((RoleEventListener)el).prePropertiesSet(identitySession, role, properties);
}
}
}
@@ -628,7 +628,7 @@
{
if (el instanceof RoleEventListener)
{
- ((RoleEventListener)el).postPropertiesSet(role, properties);
+ ((RoleEventListener)el).postPropertiesSet(identitySession, role,
properties);
}
}
}
@@ -639,7 +639,7 @@
{
if (el instanceof RoleTypeEventListener)
{
- ((RoleTypeEventListener)el).prePropertiesRemove(roleType, names);
+ ((RoleTypeEventListener)el).prePropertiesRemove(identitySession, roleType,
names);
}
}
}
@@ -650,7 +650,7 @@
{
if (el instanceof RoleTypeEventListener)
{
- ((RoleTypeEventListener)el).postPropertiesRemove(roleType, names);
+ ((RoleTypeEventListener)el).postPropertiesRemove(identitySession, roleType,
names);
}
}
}
@@ -661,7 +661,7 @@
{
if (el instanceof RoleEventListener)
{
- ((RoleEventListener)el).postPropertiesRemove(role, names);
+ ((RoleEventListener)el).postPropertiesRemove(identitySession, role, names);
}
}
}
@@ -672,7 +672,7 @@
{
if (el instanceof RoleEventListener)
{
- ((RoleEventListener)el).postPropertiesRemove(role, names);
+ ((RoleEventListener)el).postPropertiesRemove(identitySession, role, names);
}
}
}
Modified:
idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java
===================================================================
---
idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java 2009-11-11
22:20:53 UTC (rev 927)
+++
idm/trunk/idm-core/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java 2009-11-11
22:47:31 UTC (rev 928)
@@ -59,15 +59,15 @@
private final IdentityStore identityStore;
- public JBossCacheIdentityStoreWrapper(IdentityStore identityStore,
IdentityStoreCacheProvider cacheSupport, String cacheNS) throws IdentityException
+ public JBossCacheIdentityStoreWrapper(IdentityStore identityStore,
IdentityStoreCacheProvider cacheSupport, String cacheScope) throws IdentityException
{
- super(identityStore, cacheSupport, cacheNS);
+ super(identityStore, cacheSupport, cacheScope);
this.identityStore = identityStore;
log.fine("------------------------------------------------------");
log.fine("JBossCacheIdentityStoreWrapper created ....." +
- "(IdentityStore: " + identityStore.getId() + "; cache namespace:
" + cacheNS + ")");
+ "(IdentityStore: " + identityStore.getId() + "; cache scope:
" + cacheScope + ")");
log.fine("------------------------------------------------------");
}