directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r528793 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core: authn/ authz/ exception/ interceptor/ interceptor/context/ normalization/ partition/
Date Sat, 14 Apr 2007 10:43:24 GMT
Author: elecharny
Date: Sat Apr 14 03:43:22 2007
New Revision: 528793

URL: http://svn.apache.org/viewvc?view=rev&rev=528793
Log:
Renamed GetMatchedDN to getMatchedName

Added:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameServiceContext.java
      - copied, changed from r528782, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedDNServiceContext.java
Removed:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedDNServiceContext.java
Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
Sat Apr 14 03:43:22 2007
@@ -230,15 +230,15 @@
     }
 
 
-    public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedDNContext
) throws NamingException
+    public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedNameContext
) throws NamingException
     {
         if ( IS_DEBUG )
         {
-            log.debug( "Matching name = '" + getMatchedDNContext.getDn().getUpName() + "'"
);
+            log.debug( "Matching name = '" + getMatchedNameContext.getDn().getUpName() +
"'" );
         }
 
         checkAuthenticated();
-        return next.getMatchedName( getMatchedDNContext );
+        return next.getMatchedName( getMatchedNameContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
Sat Apr 14 03:43:22 2007
@@ -1010,7 +1010,7 @@
     }
 
 
-    public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedDNContext
) throws NamingException
+    public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedNameContext
) throws NamingException
     {
         // Access the principal requesting the operation, and bypass checks if it is the
admin
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -1020,12 +1020,12 @@
         
         if ( isPrincipalAnAdministrator( principalDn ) || !enabled )
         {
-            return next.getMatchedName( getMatchedDNContext );
+            return next.getMatchedName( getMatchedNameContext );
         }
 
         // get the present matched name
         Attributes entry;
-        LdapDN matched = next.getMatchedName( getMatchedDNContext );
+        LdapDN matched = next.getMatchedName( getMatchedNameContext );
 
         // check if we have disclose on error permission for the entry at the matched dn
         // if not remove rdn and check that until nothing is left in the name and return

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
Sat Apr 14 03:43:22 2007
@@ -34,7 +34,7 @@
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.interceptor.context.EntryServiceContext;
-import org.apache.directory.server.core.interceptor.context.GetMatchedDNServiceContext;
+import org.apache.directory.server.core.interceptor.context.GetMatchedNameServiceContext;
 import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
 import org.apache.directory.server.core.interceptor.context.RenameServiceContext;
 import org.apache.directory.server.core.interceptor.context.ModifyServiceContext;
@@ -140,7 +140,7 @@
         {
             LdapNameNotFoundException e2 = new LdapNameNotFoundException( "Parent " + parentDn.getUpName()

                 + " not found" );
-            e2.setResolvedName( new LdapDN( nexus.getMatchedName( new GetMatchedDNServiceContext(
parentDn ) ).getUpName() ) );
+            e2.setResolvedName( new LdapDN( nexus.getMatchedName( new GetMatchedNameServiceContext(
parentDn ) ).getUpName() ) );
             throw e2;
         }
         
@@ -523,7 +523,7 @@
             e.setResolvedName( 
                 new LdapDN( 
                     proxy.getMatchedName( 
-                        new GetMatchedDNServiceContext( dn ) ).getUpName() ) );
+                        new GetMatchedNameServiceContext( dn ) ).getUpName() ) );
             throw e;
         }
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
Sat Apr 14 03:43:22 2007
@@ -111,9 +111,9 @@
     }
 
 
-    public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedDNContext
) throws NamingException
+    public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedNameContext
) throws NamingException
     {
-        return next.getMatchedName( getMatchedDNContext );
+        return next.getMatchedName( getMatchedNameContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
Sat Apr 14 03:43:22 2007
@@ -127,7 +127,7 @@
     /**
      * Filters {@link PartitionNexus#getMatchedName( ServiceContext )} call.
      */
-    LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedDNContext ) throws
NamingException;
+    LdapDN getMatchedName( NextInterceptor next, ServiceContext getMatchedNameContext ) throws
NamingException;
 
 
     /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
Sat Apr 14 03:43:22 2007
@@ -91,9 +91,9 @@
         }
 
 
-        public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedDNContext
) throws NamingException
+        public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedNameContext
) throws NamingException
         {
-            return ( LdapDN ) nexus.getMatchedName( getMatchedDNContext ).clone();
+            return ( LdapDN ) nexus.getMatchedName( getMatchedNameContext ).clone();
         }
 
 
@@ -543,7 +543,7 @@
     }
 
 
-    public LdapDN getMatchedName( ServiceContext getMatchedDNContext ) throws NamingException
+    public LdapDN getMatchedName( ServiceContext getMatchedNameContext ) throws NamingException
     {
         Entry entry = getStartingEntry();
         Interceptor head = entry.configuration.getInterceptor();
@@ -551,7 +551,7 @@
 
         try
         {
-            return head.getMatchedName( next, getMatchedDNContext );
+            return head.getMatchedName( next, getMatchedNameContext );
         }
         catch ( NamingException ne )
         {
@@ -1041,14 +1041,14 @@
                 }
 
 
-                public LdapDN getMatchedName ( ServiceContext getMatchedDNContext ) throws
NamingException
+                public LdapDN getMatchedName ( ServiceContext getMatchedNameContext ) throws
NamingException
                 {
                     Entry next = getNextEntry();
                     Interceptor interceptor = next.configuration.getInterceptor();
 
                     try
                     {
-                        return interceptor.getMatchedName( next.nextInterceptor, getMatchedDNContext
);
+                        return interceptor.getMatchedName( next.nextInterceptor, getMatchedNameContext
);
                     }
                     catch ( NamingException ne )
                     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
Sat Apr 14 03:43:22 2007
@@ -60,7 +60,7 @@
     /**
      * Calls the next interceptor's {@link Interceptor#getMatchedName( NextInterceptor, ServiceContext
)}.
      */
-    LdapDN getMatchedName ( ServiceContext getMatchedDNContext ) throws NamingException;
+    LdapDN getMatchedName ( ServiceContext getMatchedNameContext ) throws NamingException;
 
 
     /**

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameServiceContext.java
(from r528782, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedDNServiceContext.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameServiceContext.java?view=diff&rev=528793&p1=directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedDNServiceContext.java&r1=528782&p2=directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameServiceContext.java&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedDNServiceContext.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameServiceContext.java
Sat Apr 14 03:43:22 2007
@@ -22,28 +22,28 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 /**
- * A GetMatchedDN context used for Interceptors. It contains all the informations
- * needed for the getMatchedDN operation, and used by all the interceptors
+ * A GetMatchedName context used for Interceptors. It contains all the informations
+ * needed for the getMatchedName operation, and used by all the interceptors
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class GetMatchedDNServiceContext  extends AbstractServiceContext
+public class GetMatchedNameServiceContext  extends AbstractServiceContext
 {
     /**
-     * Creates a new instance of GetMatchedDNServiceContext.
+     * Creates a new instance of GetMatchedNameServiceContext.
      */
-    public GetMatchedDNServiceContext()
+    public GetMatchedNameServiceContext()
     {
         super();
     }
     
     /**
-     * Creates a new instance of GetMatchedDNServiceContext.
+     * Creates a new instance of GetMatchedNameServiceContext.
      *
-     * @param dn The entry DN used to get the rootDSE
+     * @param dn The DN to match
      */
-    public GetMatchedDNServiceContext( LdapDN dn )
+    public GetMatchedNameServiceContext( LdapDN dn )
     {
         super( dn );
     }
@@ -53,6 +53,6 @@
      */
     public String toString()
     {
-        return "GetMatchedDNContext with DN '" + getDn().getUpName() + "'";
+        return "GetMatchedNameContext with DN '" + getDn().getUpName() + "'";
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
Sat Apr 14 03:43:22 2007
@@ -370,10 +370,10 @@
     // Normalize all Name based arguments for other interface operations
     // ------------------------------------------------------------------------
 
-    public LdapDN getMatchedName ( NextInterceptor nextInterceptor, ServiceContext getMatchedDNContext
) throws NamingException
+    public LdapDN getMatchedName ( NextInterceptor nextInterceptor, ServiceContext getMatchedNameContext
) throws NamingException
     {
-        LdapDN.normalize( getMatchedDNContext.getDn(), attrNormalizers );
-        return nextInterceptor.getMatchedName( getMatchedDNContext );
+        LdapDN.normalize( getMatchedNameContext.getDn(), attrNormalizers );
+        return nextInterceptor.getMatchedName( getMatchedNameContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Sat Apr 14 03:43:22 2007
@@ -589,11 +589,11 @@
 
 
     /**
-     * @see PartitionNexus#getMatchedName(org.apache.directory.shared.ldap.name.LdapDN)
+     * @see PartitionNexus#getMatchedName( ServiceContext )
      */
-    public LdapDN getMatchedName ( ServiceContext getMatchedDNContext ) throws NamingException
+    public LdapDN getMatchedName ( ServiceContext getMatchedNameContext ) throws NamingException
     {
-        LdapDN dn = ( LdapDN ) getMatchedDNContext.getDn().clone();
+        LdapDN dn = ( LdapDN ) getMatchedNameContext.getDn().clone();
         
         while ( dn.size() > 0 )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
Sat Apr 14 03:43:22 2007
@@ -221,14 +221,14 @@
     /**
      * Gets the most significant Dn that exists within the server for any Dn.
      *
-     * @param getMatchedDNContext the context containing the  distinguished name 
+     * @param getMatchedNameContext the context containing the  distinguished name 
      * to use for matching.
      * @return a distinguished name representing the matching portion of dn,
      * as originally provided by the user on creation of the matched entry or 
      * the empty string distinguished name if no match was found.
      * @throws NamingException if there are any problems
      */
-    public abstract LdapDN getMatchedName ( ServiceContext getMatchedDNContext ) throws NamingException;
+    public abstract LdapDN getMatchedName ( ServiceContext getMatchedNameContext ) throws
NamingException;
 
 
     /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?view=diff&rev=528793&r1=528792&r2=528793
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
Sat Apr 14 03:43:22 2007
@@ -208,22 +208,22 @@
     }
 
 
-    public LdapDN getMatchedName ( ServiceContext getMatchedDNContext ) throws NamingException
+    public LdapDN getMatchedName ( ServiceContext getMatchedNameContext ) throws NamingException
     {
-        return getMatchedName( getMatchedDNContext, null );
+        return getMatchedName( getMatchedNameContext, null );
     }
 
 
-    public LdapDN getMatchedName( ServiceContext getMatchedDNContext, Collection bypass )
throws NamingException
+    public LdapDN getMatchedName( ServiceContext getMatchedNameContext, Collection bypass
) throws NamingException
     {
         ensureStarted();
         InvocationStack stack = InvocationStack.getInstance();
-        Object[] args = new Object[] { getMatchedDNContext };
-        stack.push( new Invocation( this, caller, "getMatchedDn", args, bypass ) );
+        Object[] args = new Object[] { getMatchedNameContext };
+        stack.push( new Invocation( this, caller, "getMatchedName", args, bypass ) );
         
         try
         {
-            return this.configuration.getInterceptorChain().getMatchedName( getMatchedDNContext
);
+            return this.configuration.getInterceptorChain().getMatchedName( getMatchedNameContext
);
         }
         finally
         {



Mime
View raw message