directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r954997 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/interceptor/ core-api/src/test/java/org/apache/directory/server/core/ core/src/main/java/org/apache/directory/server/core/authz/ core/src/main/j...
Date Tue, 15 Jun 2010 18:21:04 GMT
Author: elecharny
Date: Tue Jun 15 18:21:04 2010
New Revision: 954997

URL: http://svn.apache.org/viewvc?rev=954997&view=rev
Log:
Rename opContext to compareContext for the compare operation

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=954997&r1=954996&r2=954997&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
Tue Jun 15 18:21:04 2010
@@ -134,7 +134,7 @@ public interface Interceptor
     /**
      * Filters {@link DefaultPartitionNexus#compare( CompareOperationContext )} call.
      */
-    boolean compare( NextInterceptor next, CompareOperationContext opContext) throws LdapException;
+    boolean compare( NextInterceptor next, CompareOperationContext compareContext) throws
LdapException;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=954997&r1=954996&r2=954997&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
Tue Jun 15 18:21:04 2010
@@ -946,14 +946,14 @@ public class InterceptorChain
                 }
 
 
-                public boolean compare( CompareOperationContext opContext ) throws LdapException
+                public boolean compare( CompareOperationContext compareContext ) throws LdapException
                 {
                     Element next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
 
                     try
                     {
-                        return interceptor.compare( next.nextInterceptor, opContext );
+                        return interceptor.compare( next.nextInterceptor, compareContext
);
                     }
                     catch ( LdapException le )
                     {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=954997&r1=954996&r2=954997&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
Tue Jun 15 18:21:04 2010
@@ -51,7 +51,7 @@ public interface NextInterceptor
     /**
      * Calls the next interceptor's {@link Interceptor#compare( NextInterceptor, CompareOperationContext
)}.
      */
-    boolean compare( CompareOperationContext opContext ) throws LdapException;
+    boolean compare( CompareOperationContext compareContext ) throws LdapException;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java?rev=954997&r1=954996&r2=954997&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
Tue Jun 15 18:21:04 2010
@@ -86,10 +86,10 @@ public class MockInterceptor implements 
     }
 
 
-    public boolean compare( NextInterceptor next, CompareOperationContext opContext ) throws
LdapException
+    public boolean compare( NextInterceptor next, CompareOperationContext compareContext
) throws LdapException
     {
         interceptors.add( this );
-        return next.compare( opContext );
+        return next.compare( compareContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=954997&r1=954996&r2=954997&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
Tue Jun 15 18:21:04 2010
@@ -1029,35 +1029,35 @@ public class AciAuthorizationInterceptor
     /**
      * {@inheritDoc}
      */
-    public boolean compare( NextInterceptor next, CompareOperationContext copmpareContext
) throws LdapException
+    public boolean compare( NextInterceptor next, CompareOperationContext compareContext
) throws LdapException
     {
-        CoreSession session = copmpareContext.getSession();
-        DN dn = copmpareContext.getDn();
-        String oid = copmpareContext.getOid();
-        Value<?> value = copmpareContext.getValue();
+        CoreSession session = compareContext.getSession();
+        DN dn = compareContext.getDn();
+        String oid = compareContext.getOid();
+        Value<?> value = compareContext.getValue();
 
-        Entry entry = copmpareContext.getOriginalEntry();
+        Entry entry = compareContext.getOriginalEntry();
 
         LdapPrincipal principal = session.getEffectivePrincipal();
         DN principalDn = principal.getDN();
 
         if ( isPrincipalAnAdministrator( principalDn ) || !session.getDirectoryService().isAccessControlEnabled()
)
         {
-            return next.compare( copmpareContext );
+            return next.compare( compareContext );
         }
 
         Set<DN> userGroups = groupCache.getGroups( principalDn.getNormName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
-        addPerscriptiveAciTuples( copmpareContext, tuples, dn, entry );
+        addPerscriptiveAciTuples( compareContext, tuples, dn, entry );
         addEntryAciTuples( tuples, entry );
-        addSubentryAciTuples( copmpareContext, tuples, dn, entry );
+        addSubentryAciTuples( compareContext, tuples, dn, entry );
 
-        engine.checkPermission( schemaManager, copmpareContext, userGroups, principalDn,
principal.getAuthenticationLevel(),
+        engine.checkPermission( schemaManager, compareContext, userGroups, principalDn, principal.getAuthenticationLevel(),
             dn, null, null, READ_PERMS, tuples, entry, null );
-        engine.checkPermission( schemaManager, copmpareContext, userGroups, principalDn,
principal.getAuthenticationLevel(),
+        engine.checkPermission( schemaManager, compareContext, userGroups, principalDn, principal.getAuthenticationLevel(),
             dn, oid, value, COMPARE_PERMS, tuples, entry, null );
 
-        return next.compare( copmpareContext );
+        return next.compare( compareContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=954997&r1=954996&r2=954997&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
Tue Jun 15 18:21:04 2010
@@ -199,10 +199,10 @@ public class TimerInterceptor implements
     /**
      * {@inheritDoc}
      */
-    public boolean compare( NextInterceptor next, CompareOperationContext opContext ) throws
LdapException
+    public boolean compare( NextInterceptor next, CompareOperationContext compareContext
) throws LdapException
     {
         long t0 = System.nanoTime();
-        boolean compare = next.compare( opContext );
+        boolean compare = next.compare( compareContext );
         long delta = System.nanoTime() - t0;
         
         if ( IS_DEBUG_STATS )



Mime
View raw message