directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
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 GMT
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<AdministrativePoint> getTriggerExecutionAPCache();
     
     /**
-     * @return The subentry UUID cache
+     * @return The subentry cache
      */
-    SubentryCache getSubentryUuidCache();
-    
-    
-    /**
-     * @return The subentry DN cache
-     */
-    DnNode<Subentry> 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<Subentry> 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<Subentry> subentryDnCache = new DnNode<Subentry>();
-
     /** 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<Subentry> getSubentryDnCache()
-    {
-        return subentryDnCache;
-    }
-    
-    
-    /**
-     * {@inheritDoc}
-     */
     public PasswordPolicyConfiguration getPwdPolicy( Entry userEntry ) throws LdapException
     {
         if ( pwdPolicyContainer == null )



Mime
View raw message