[exo-jcr-commits] exo-jcr SVN: r4933 - in core/trunk: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap and 1 other directory.

Author: tolusha Date: 2011-09-21 08:53:33 -0400 (Wed, 21 Sep 2011) New Revision: 4933 Added: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java Removed: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/CacheHandler.java Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADGroupDAOImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADMembershipDAOImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationServiceImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java Log: JCR-1670: Add caching to JCR Organization service Added: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java (rev 0) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -0,0 +1,245 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * 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.exoplatform.services.organization; + +import org.exoplatform.services.cache.CacheService; +import org.exoplatform.services.cache.ExoCache; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + * @author <a href=&quot;abazko(a)exoplatform.com&quot;&gt;Anatoliy Bazko</a> + * @version $Id: CacheHandler.java 34360 2009-07-22 23:58:59Z tolusha $ + */ +public class CacheHandler +{ + public static final String MEMBERSHIPTYPE_PREFIX = "mt="; + + public static final String GROUP_PREFIX = "g="; + + public static final String USER_PREFIX = "u="; + + /** + * Cache for Users. + */ + protected final ExoCache<Serializable, User> userCache; + + /** + * Cache for Users profiles. + */ + protected final ExoCache<Serializable, UserProfile> userProfileCache; + + /** + * Cache for MembershipTypes. + */ + protected final ExoCache<Serializable, MembershipType> membershipTypeCache; + + /** + * Cache for Memberships. + */ + protected final ExoCache<Serializable, Membership> membershipCache; + + /** + * Cache for Groups. + */ + protected final ExoCache<Serializable, Group> groupCache; + + /** + * Constructor CacheHandler. + * + * @param cservice + * The cache handler + */ + public CacheHandler(CacheService cservice) + { + this.userCache = cservice.getCacheInstance(this.getClass().getName() + "userCache"); + this.userProfileCache = cservice.getCacheInstance(this.getClass().getName() + "userProfileCache"); + this.membershipTypeCache = cservice.getCacheInstance(this.getClass().getName() + "membershipTypeCache"); + this.groupCache = cservice.getCacheInstance(this.getClass().getName() + "groupCache"); + this.membershipCache = cservice.getCacheInstance(this.getClass().getName() + "membershipCache"); + } + + public void put(Serializable key, Object value, CacheType cacheType) + { + if (cacheType == CacheType.USER) + { + userCache.put(key, (User)value); + } + else if (cacheType == CacheType.GROUP) + { + groupCache.put(key, (Group)value); + } + else if (cacheType == CacheType.MEMBERSHIP) + { + membershipCache.put(key, (Membership)value); + } + else if (cacheType == CacheType.MEMBERSHIPTYPE) + { + membershipTypeCache.put(key, (MembershipType)value); + } + else if (cacheType == CacheType.USER_PROFILE) + { + userProfileCache.put(key, (UserProfile)value); + } + } + + public Object get(Serializable key, CacheType cacheType) + { + Object obj = null; + if (cacheType == CacheType.USER) + { + obj = userCache.get(key); + } + else if (cacheType == CacheType.GROUP) + { + obj = groupCache.get(key); + } + else if (cacheType == CacheType.MEMBERSHIP) + { + obj = membershipCache.get(key); + } + else if (cacheType == CacheType.MEMBERSHIPTYPE) + { + obj = membershipTypeCache.get(key); + } + else if (cacheType == CacheType.USER_PROFILE) + { + obj = userProfileCache.get(key); + } + + if (obj != null && obj instanceof Cloneable) + { + try + { + // need to return the clone of the object since object is mutable + return obj.getClass().getMethod("clone").invoke(obj); + } + catch (Exception e) + { + return obj; + } + } + return obj; + } + + public void remove(Serializable key, CacheType cacheType) + { + if (cacheType == CacheType.USER) + { + userCache.remove(key); + } + else if (cacheType == CacheType.GROUP) + { + groupCache.remove(key); + } + else if (cacheType == CacheType.MEMBERSHIP) + { + try + { + for (Membership m : membershipCache.getCachedObjects()) + { + String mkey = getMembershipKey(m); + if (mkey.indexOf((String)key) >= 0) + { + membershipCache.remove(mkey); + } + } + } + catch (Exception e) + { + } + } + else if (cacheType == CacheType.MEMBERSHIPTYPE) + { + membershipTypeCache.remove(key); + } + else if (cacheType == CacheType.USER_PROFILE) + { + userProfileCache.remove(key); + } + } + + public void move(Serializable oldKey, Serializable newKey, CacheType cacheType) + { + if (cacheType == CacheType.USER) + { + userCache.put(newKey, userCache.remove(oldKey)); + } + else if (cacheType == CacheType.GROUP) + { + groupCache.put(newKey, groupCache.remove(oldKey)); + } + else if (cacheType == CacheType.MEMBERSHIP) + { + try + { + Map<Serializable, Membership> wait4Adding = new HashMap<Serializable, Membership>(); + + for (Membership m : membershipCache.getCachedObjects()) + { + String mkey = getMembershipKey(m); + if (mkey.indexOf((String)oldKey) >= 0) + { + wait4Adding.put(mkey.replace((String)oldKey, (String)newKey), membershipCache.remove(mkey)); + } + } + + membershipCache.putMap(wait4Adding); + } + catch (Exception e) + { + } + } + else if (cacheType == CacheType.MEMBERSHIPTYPE) + { + membershipTypeCache.put(newKey, membershipTypeCache.remove(oldKey)); + } + else if (cacheType == CacheType.USER_PROFILE) + { + userProfileCache.put(newKey, userProfileCache.remove(oldKey)); + } + } + + public String getMembershipKey(Membership m) + { + StringBuilder key = new StringBuilder(); + key.append(GROUP_PREFIX + m.getGroupId()); + key.append(MEMBERSHIPTYPE_PREFIX + m.getMembershipType()); + key.append(USER_PREFIX + m.getUserName()); + + return key.toString(); + } + + public String getMembershipKey(String username, String groupId, String type) + { + StringBuilder key = new StringBuilder(); + key.append(GROUP_PREFIX + groupId); + key.append(MEMBERSHIPTYPE_PREFIX + type); + key.append(USER_PREFIX + username); + + return key.toString(); + } + + public static enum CacheType + { + USER, GROUP, MEMBERSHIP, MEMBERSHIPTYPE, USER_PROFILE + } +} Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADGroupDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADGroupDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADGroupDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -19,6 +19,7 @@ package org.exoplatform.services.organization.ldap; import org.exoplatform.services.ldap.LDAPService; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.Group; import java.util.ArrayList; Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADMembershipDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADMembershipDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADMembershipDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -19,11 +19,12 @@ package org.exoplatform.services.organization.ldap; import org.exoplatform.services.ldap.LDAPService; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.Membership; import org.exoplatform.services.organization.OrganizationService; +import org.exoplatform.services.organization.CacheHandler.CacheType; import org.exoplatform.services.organization.impl.MembershipImpl; -import org.exoplatform.services.organization.ldap.CacheHandler.CacheType; import java.util.ArrayList; import java.util.Collection; Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -19,8 +19,9 @@ package org.exoplatform.services.organization.ldap; import org.exoplatform.services.ldap.LDAPService; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.User; -import org.exoplatform.services.organization.ldap.CacheHandler.CacheType; +import org.exoplatform.services.organization.CacheHandler.CacheType; import javax.naming.Context; import javax.naming.NamingException; Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -21,10 +21,11 @@ import org.exoplatform.services.ldap.LDAPService; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.User; +import org.exoplatform.services.organization.CacheHandler.CacheType; import org.exoplatform.services.organization.impl.GroupImpl; -import org.exoplatform.services.organization.ldap.CacheHandler.CacheType; import java.util.ArrayList; import java.util.Enumeration; Deleted: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/CacheHandler.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/CacheHandler.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/CacheHandler.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -1,176 +0,0 @@ -/* - * Copyright (C) 2011 eXo Platform SAS. - * - * 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.exoplatform.services.organization.ldap; - -import org.exoplatform.services.cache.CacheService; -import org.exoplatform.services.cache.ExoCache; -import org.exoplatform.services.organization.Group; -import org.exoplatform.services.organization.Membership; -import org.exoplatform.services.organization.MembershipType; -import org.exoplatform.services.organization.User; - -import java.io.Serializable; - -/** - * @author <a href=&quot;abazko(a)exoplatform.com&quot;&gt;Anatoliy Bazko</a> - * @version $Id: CacheHandler.java 34360 2009-07-22 23:58:59Z tolusha $ - */ -public class CacheHandler -{ - public static final String MEMBERSHIPTYPE_PREFIX = "mt="; - - public static final String GROUP_PREFIX = "g="; - - public static final String USER_PREFIX = "u="; - - /** - * Cache for Users. - */ - private final ExoCache<Serializable, User> userCache; - - /** - * Cache for MembershipTypes. - */ - private final ExoCache<Serializable, MembershipType> membershipTypeCache; - - /** - * Cache for Memberships. - */ - private final ExoCache<Serializable, Membership> membershipCache; - - /** - * Cache for Groups. - */ - private final ExoCache<Serializable, Group> groupCache; - - /** - * Constructor CacheHandler. - * - * @param cservice - * The cache handler - */ - public CacheHandler(CacheService cservice) - { - this.userCache = cservice.getCacheInstance(this.getClass().getName() + "userCache"); - this.membershipTypeCache = cservice.getCacheInstance(this.getClass().getName() + "membershipTypeCache"); - this.groupCache = cservice.getCacheInstance(this.getClass().getName() + "groupCache"); - this.membershipCache = cservice.getCacheInstance(this.getClass().getName() + "membershipCache"); - } - - public void put(Serializable key, Object value, CacheType cacheType) - { - if (cacheType == CacheType.USER) - { - userCache.put(key, (User)value); - } - else if (cacheType == CacheType.GROUP) - { - groupCache.put(key, (Group)value); - } - else if (cacheType == CacheType.MEMBERSHIP) - { - membershipCache.put(key, (Membership)value); - } - else if (cacheType == CacheType.MEMBERSHIPTYPE) - { - membershipTypeCache.put(key, (MembershipType)value); - } - } - - public Object get(Serializable key, CacheType cacheType) - { - if (cacheType == CacheType.USER) - { - return userCache.get(key); - } - else if (cacheType == CacheType.GROUP) - { - return groupCache.get(key); - } - else if (cacheType == CacheType.MEMBERSHIP) - { - return membershipCache.get(key); - } - else if (cacheType == CacheType.MEMBERSHIPTYPE) - { - return membershipTypeCache.get(key); - } - - return null; - } - - public void remove(Serializable key, CacheType cacheType) - { - if (cacheType == CacheType.USER) - { - userCache.remove(key); - } - else if (cacheType == CacheType.GROUP) - { - groupCache.remove(key); - } - else if (cacheType == CacheType.MEMBERSHIP) - { - try - { - String tKey = ((String)key).toUpperCase(); - for (Membership m : membershipCache.getCachedObjects()) - { - String mkey = getMembershipKey(m); - if (mkey.toUpperCase().indexOf(tKey) >= 0) - { - membershipCache.remove(mkey); - } - } - } - catch (Exception e) - { - } - } - else if (cacheType == CacheType.MEMBERSHIPTYPE) - { - membershipTypeCache.remove(key); - } - } - - public String getMembershipKey(Membership m) - { - StringBuilder key = new StringBuilder(); - key.append(GROUP_PREFIX + m.getGroupId()); - key.append(MEMBERSHIPTYPE_PREFIX + m.getMembershipType()); - key.append(USER_PREFIX + m.getUserName()); - - return key.toString(); - } - - public String getMembershipKey(String username, String groupId, String type) - { - StringBuilder key = new StringBuilder(); - key.append(GROUP_PREFIX + groupId); - key.append(MEMBERSHIPTYPE_PREFIX + type); - key.append(USER_PREFIX + username); - - return key.toString(); - } - - static enum CacheType - { - USER, GROUP, MEMBERSHIP, MEMBERSHIPTYPE - } -} Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -21,12 +21,13 @@ import org.exoplatform.services.ldap.LDAPService; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.GroupEventListener; import org.exoplatform.services.organization.GroupEventListenerHandler; import org.exoplatform.services.organization.GroupHandler; +import org.exoplatform.services.organization.CacheHandler.CacheType; import org.exoplatform.services.organization.impl.GroupImpl; -import org.exoplatform.services.organization.ldap.CacheHandler.CacheType; import java.util.ArrayList; import java.util.Collection; Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -22,6 +22,7 @@ import org.exoplatform.services.ldap.LDAPService; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.Membership; import org.exoplatform.services.organization.MembershipEventListener; @@ -30,9 +31,9 @@ import org.exoplatform.services.organization.MembershipType; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; +import org.exoplatform.services.organization.CacheHandler.CacheType; import org.exoplatform.services.organization.impl.MembershipImpl; import org.exoplatform.services.organization.impl.mock.SimpleMembershipListAccess; -import org.exoplatform.services.organization.ldap.CacheHandler.CacheType; import java.util.ArrayList; import java.util.Collection; Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -21,12 +21,13 @@ import org.exoplatform.services.ldap.LDAPService; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.MembershipType; import org.exoplatform.services.organization.MembershipTypeEventListener; import org.exoplatform.services.organization.MembershipTypeEventListenerHandler; import org.exoplatform.services.organization.MembershipTypeHandler; +import org.exoplatform.services.organization.CacheHandler.CacheType; import org.exoplatform.services.organization.impl.MembershipTypeImpl; -import org.exoplatform.services.organization.ldap.CacheHandler.CacheType; import java.util.ArrayList; import java.util.Collection; Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationServiceImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationServiceImpl.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationServiceImpl.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -24,6 +24,7 @@ import org.exoplatform.services.database.HibernateService; import org.exoplatform.services.ldap.LDAPService; import org.exoplatform.services.organization.BaseOrganizationService; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.hibernate.UserProfileDAOImpl; /** Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -21,13 +21,14 @@ import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.services.ldap.LDAPService; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.Query; import org.exoplatform.services.organization.User; import org.exoplatform.services.organization.UserEventListener; import org.exoplatform.services.organization.UserEventListenerHandler; import org.exoplatform.services.organization.UserHandler; +import org.exoplatform.services.organization.CacheHandler.CacheType; import org.exoplatform.services.organization.impl.UserImpl; -import org.exoplatform.services.organization.ldap.CacheHandler.CacheType; import java.util.ArrayList; import java.util.Collections; Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933) @@ -21,6 +21,7 @@ import org.exoplatform.services.ldap.LDAPService; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.services.organization.CacheHandler; import org.exoplatform.services.organization.UserProfile; import org.exoplatform.services.organization.UserProfileEventListener; import org.exoplatform.services.organization.UserProfileEventListenerHandler;