Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 33799 invoked from network); 2 Jan 2011 23:12:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Jan 2011 23:12:06 -0000 Received: (qmail 34943 invoked by uid 500); 2 Jan 2011 23:12:06 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 34882 invoked by uid 500); 2 Jan 2011 23:12:06 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 34875 invoked by uid 99); 2 Jan 2011 23:12:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jan 2011 23:12:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jan 2011 23:12:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C3C0E2388A39; Sun, 2 Jan 2011 23:11:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1054487 - in /directory/apacheds/branches/apacheds-AP: core-api/src/main/java/org/apache/directory/server/core/ core-api/src/test/java/org/apache/directory/server/core/ core/src/main/java/org/apache/directory/server/core/ Date: Sun, 02 Jan 2011 23:11:45 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110102231145.C3C0E2388A39@eris.apache.org> Author: elecharny Date: Sun Jan 2 23:11:45 2011 New Revision: 1054487 URL: http://svn.apache.org/viewvc?rev=1054487&view=rev Log: o Merged the DN and UUID to Subentry cache into a single cache Modified: directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Modified: directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=1054487&r1=1054486&r2=1054487&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original) +++ directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Sun Jan 2 23:11:45 2011 @@ -24,7 +24,6 @@ import java.util.List; import java.util.Set; import org.apache.directory.server.core.administrative.AdministrativePoint; -import org.apache.directory.server.core.administrative.Subentry; import org.apache.directory.server.core.administrative.SubentryCache; import org.apache.directory.server.core.changelog.ChangeLog; import org.apache.directory.server.core.entry.ServerEntryFactory; @@ -552,15 +551,9 @@ public interface DirectoryService extend DnNode getTriggerExecutionAPCache(); /** - * @return The subentry UUID cache + * @return The subentry cache */ - SubentryCache getSubentryUuidCache(); - - - /** - * @return The subentry DN cache - */ - DnNode getSubentryDnCache(); + SubentryCache getSubentryCache(); /** Modified: directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java?rev=1054487&r1=1054486&r2=1054487&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java (original) +++ directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java Sun Jan 2 23:11:45 2011 @@ -28,7 +28,6 @@ import java.util.Set; import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.administrative.AdministrativePoint; -import org.apache.directory.server.core.administrative.Subentry; import org.apache.directory.server.core.administrative.SubentryCache; import org.apache.directory.server.core.changelog.ChangeLog; import org.apache.directory.server.core.event.EventService; @@ -522,16 +521,7 @@ public class MockDirectoryService implem /** * {@inheritDoc} */ - public SubentryCache getSubentryUuidCache() - { - return null; - } - - - /** - * {@inheritDoc} - */ - public DnNode getSubentryDnCache() + public SubentryCache getSubentryCache() { return null; } Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1054487&r1=1054486&r2=1054487&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sun Jan 2 23:11:45 2011 @@ -41,7 +41,6 @@ import javax.naming.directory.Attributes import org.apache.directory.server.constants.ServerDNConstants; import org.apache.directory.server.core.admin.AdministrativePointInterceptor; import org.apache.directory.server.core.administrative.AdministrativePoint; -import org.apache.directory.server.core.administrative.Subentry; import org.apache.directory.server.core.administrative.SubentryCache; import org.apache.directory.server.core.authn.AuthenticationInterceptor; import org.apache.directory.server.core.authz.AciAuthorizationInterceptor; @@ -264,9 +263,6 @@ public class DefaultDirectoryService imp /** the hash mapping the UUID of a subentry to its SubtreeSpecification/types */ private final SubentryCache subentryCache = new SubentryCache(); - /** the hash mapping the DN of a subentry to its SubtreeSpecification/types */ - private final DnNode subentryDnCache = new DnNode(); - /** a container to hold all the ppolicies */ private PpolicyConfigContainer pwdPolicyContainer; @@ -1926,7 +1922,7 @@ public class DefaultDirectoryService imp /** * {@inheritDoc} */ - public SubentryCache getSubentryUuidCache() + public SubentryCache getSubentryCache() { return subentryCache; } @@ -1935,15 +1931,6 @@ public class DefaultDirectoryService imp /** * {@inheritDoc} */ - public DnNode getSubentryDnCache() - { - return subentryDnCache; - } - - - /** - * {@inheritDoc} - */ public PasswordPolicyConfiguration getPwdPolicy( Entry userEntry ) throws LdapException { if ( pwdPolicyContainer == null )