directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r158295 - in directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request: ./ interceptor/
Date Sun, 20 Mar 2005 04:11:54 GMT
Author: trustin
Date: Sat Mar 19 20:11:50 2005
New Revision: 158295

URL: http://svn.apache.org/viewcvs?view=rev&rev=158295
Log:
* Renamed requests to calls.
* Simplified class names.

Added:
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Add.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/AddRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Call.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Request.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Delete.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/DeleteRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedDN.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedNameRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffix.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffixRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntry.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntryRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffix.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffixRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/List.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixes.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixesRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Lookup.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookupWithAttrIds.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpWithAttributeIdsRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Modify.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyMany.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyManyRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRN.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRelativeNameRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Move.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveAndModifyRN.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveWithNewRelativeNameRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Search.java
      - copied, changed from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/SearchRequest.java
Removed:
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/AddRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/DeleteRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedNameRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffixRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntryRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffixRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixesRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpWithAttributeIdsRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyManyRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRelativeNameRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveWithNewRelativeNameRequest.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Request.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/SearchRequest.java
Modified:
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authenticatior.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authorizer.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/BaseInterceptor.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/DefaultAttributeTagger.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Interceptor.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorChain.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorException.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/NextInterceptor.java

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Add.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/AddRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Add.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/AddRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Add.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/AddRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Add.java Sat Mar 19 20:11:50 2005
@@ -3,13 +3,13 @@
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
 
-public class AddRequest extends Request {
+public class Add extends Call {
 
     private final String userProvidedName;
     private final Name normalizedName;
     private final Attributes attributes;
     
-    public AddRequest( String userProvidedName, Name normalizedName,
+    public Add( String userProvidedName, Name normalizedName,
                        Attributes attributes )
     {
         if( userProvidedName == null )

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Call.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Request.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Call.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Request.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Call.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Request.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Call.java Sat Mar 19 20:11:50 2005
@@ -2,12 +2,12 @@
 
 import java.util.Stack;
 
-public abstract class Request {
+public abstract class Call {
 
     private Object response;
     private Stack contextStack;
 
-    protected Request()
+    protected Call()
     {
     }
     

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Delete.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/DeleteRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Delete.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/DeleteRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Delete.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/DeleteRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Delete.java Sat Mar 19 20:11:50 2005
@@ -2,11 +2,11 @@
 
 import javax.naming.Name;
 
-public class DeleteRequest extends Request {
+public class Delete extends Call {
 
     private final Name name;
     
-    public DeleteRequest( Name name )
+    public Delete( Name name )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedDN.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedNameRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedDN.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedNameRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedDN.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedNameRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetMatchedDN.java Sat Mar 19 20:11:50 2005
@@ -2,12 +2,12 @@
 
 import javax.naming.Name;
 
-public class GetMatchedNameRequest extends Request {
+public class GetMatchedDN extends Call {
 
     private final Name name;
     private final boolean normalized;
     
-    public GetMatchedNameRequest( Name name, boolean normalized )
+    public GetMatchedDN( Name name, boolean normalized )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffix.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffixRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffix.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffixRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffix.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffixRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/GetSuffix.java Sat Mar 19 20:11:50 2005
@@ -2,12 +2,12 @@
 
 import javax.naming.Name;
 
-public class GetSuffixRequest extends Request {
+public class GetSuffix extends Call {
 
     private final Name name;
     private final boolean normalized;
     
-    public GetSuffixRequest( Name name, boolean normalized )
+    public GetSuffix( Name name, boolean normalized )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntry.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntryRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntry.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntryRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntry.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntryRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/HasEntry.java Sat Mar 19 20:11:50 2005
@@ -2,11 +2,11 @@
 
 import javax.naming.Name;
 
-public class HasEntryRequest extends Request {
+public class HasEntry extends Call {
 
     private final Name name;
     
-    public HasEntryRequest( Name name )
+    public HasEntry( Name name )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffix.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffixRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffix.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffixRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffix.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffixRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/IsSuffix.java Sat Mar 19 20:11:50 2005
@@ -2,11 +2,11 @@
 
 import javax.naming.Name;
 
-public class IsSuffixRequest extends Request {
+public class IsSuffix extends Call {
 
     private final Name name;
     
-    public IsSuffixRequest( Name name )
+    public IsSuffix( Name name )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/List.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/List.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/List.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/List.java Sat Mar 19 20:11:50 2005
@@ -2,11 +2,11 @@
 
 import javax.naming.Name;
 
-public class ListRequest extends Request {
+public class List extends Call {
 
     private final Name baseName;
     
-    public ListRequest( Name baseName )
+    public List( Name baseName )
     {
         if( baseName == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixes.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixesRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixes.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixesRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixes.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixesRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ListSuffixes.java Sat Mar 19 20:11:50 2005
@@ -1,10 +1,10 @@
 package org.apache.ldap.server.jndi.request;
 
-public class ListSuffixesRequest extends Request {
+public class ListSuffixes extends Call {
 
     private final boolean normalized;
     
-    public ListSuffixesRequest( boolean normalized )
+    public ListSuffixes( boolean normalized )
     {
         this.normalized = normalized;
     }

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Lookup.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Lookup.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Lookup.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Lookup.java Sat Mar 19 20:11:50 2005
@@ -2,11 +2,11 @@
 
 import javax.naming.Name;
 
-public class LookUpRequest extends Request {
+public class Lookup extends Call {
 
     private final Name name;
     
-    public LookUpRequest( Name name )
+    public Lookup( Name name )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookupWithAttrIds.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpWithAttributeIdsRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookupWithAttrIds.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpWithAttributeIdsRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookupWithAttrIds.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookUpWithAttributeIdsRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/LookupWithAttrIds.java Sat Mar 19 20:11:50 2005
@@ -2,12 +2,12 @@
 
 import javax.naming.Name;
 
-public class LookUpWithAttributeIdsRequest extends Request {
+public class LookupWithAttrIds extends Call {
 
     private final Name name;
     private final String[] attributeIds;
     
-    public LookUpWithAttributeIdsRequest( Name name, String[] attributeIds )
+    public LookupWithAttrIds( Name name, String[] attributeIds )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Modify.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Modify.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Modify.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Modify.java Sat Mar 19 20:11:50 2005
@@ -3,13 +3,13 @@
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
 
-public class ModifyRequest extends Request {
+public class Modify extends Call {
 
     private final Name name;
     private final int modOp;
     private final Attributes attributes;
     
-    public ModifyRequest( Name name, int modOp, Attributes attributes )
+    public Modify( Name name, int modOp, Attributes attributes )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyMany.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyManyRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyMany.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyManyRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyMany.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyManyRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyMany.java Sat Mar 19 20:11:50 2005
@@ -3,12 +3,12 @@
 import javax.naming.Name;
 import javax.naming.directory.ModificationItem;
 
-public class ModifyManyRequest extends Request {
+public class ModifyMany extends Call {
 
     private final Name name;
     private final ModificationItem[] modificationItems;
     
-    public ModifyManyRequest( Name name, ModificationItem[] modificationItems )
+    public ModifyMany( Name name, ModificationItem[] modificationItems )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRN.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRelativeNameRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRN.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRelativeNameRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRN.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRelativeNameRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/ModifyRN.java Sat Mar 19 20:11:50 2005
@@ -2,13 +2,13 @@
 
 import javax.naming.Name;
 
-public class ModifyRelativeNameRequest extends Request {
+public class ModifyRN extends Call {
 
     private final Name name;
     private final String newRelativeName;
     private final boolean deleteOldName;
     
-    public ModifyRelativeNameRequest( Name name, String newRelativeName,
+    public ModifyRN( Name name, String newRelativeName,
                                       boolean deleteOldName )
     {
         if( name == null )

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Move.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Move.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Move.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Move.java Sat Mar 19 20:11:50 2005
@@ -2,12 +2,12 @@
 
 import javax.naming.Name;
 
-public class MoveRequest extends Request {
+public class Move extends Call {
 
     private final Name name;
     private final Name newParentName;
     
-    public MoveRequest( Name name, Name newParentName )
+    public Move( Name name, Name newParentName )
     {
         if( name == null )
         {

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveAndModifyRN.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveWithNewRelativeNameRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveAndModifyRN.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveWithNewRelativeNameRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveAndModifyRN.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveWithNewRelativeNameRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/MoveAndModifyRN.java Sat Mar 19 20:11:50 2005
@@ -2,14 +2,14 @@
 
 import javax.naming.Name;
 
-public class MoveWithNewRelativeNameRequest extends Request {
+public class MoveAndModifyRN extends Call {
 
     private final Name name;
     private final Name newParentName;
     private final String newRelativeName;
     private final boolean deleteOldName;
     
-    public MoveWithNewRelativeNameRequest( Name name, Name newParentName, String newRelativeName,
+    public MoveAndModifyRN( Name name, Name newParentName, String newRelativeName,
                                            boolean deleteOldName )
     {
         if( name == null )

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Search.java (from r158082, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/SearchRequest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Search.java?view=diff&rev=158295&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/SearchRequest.java&r1=158082&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Search.java&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/SearchRequest.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/Search.java Sat Mar 19 20:11:50 2005
@@ -7,14 +7,14 @@
 
 import org.apache.ldap.common.filter.ExprNode;
 
-public class SearchRequest extends Request {
+public class Search extends Call {
 
     private final Name baseName;
     private final Map environment;
     private final ExprNode expressionNode;
     private final SearchControls searchControls;
     
-    public SearchRequest( Name baseName, Map environment, ExprNode expressionNode,
+    public Search( Name baseName, Map environment, ExprNode expressionNode,
                           SearchControls searchControls )
     {
         if( baseName == null )

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authenticatior.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authenticatior.java?view=diff&r1=158294&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authenticatior.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authenticatior.java Sat Mar 19 20:11:50 2005
@@ -36,7 +36,7 @@
 import org.apache.ldap.server.auth.LdapPrincipal;
 import org.apache.ldap.server.jndi.ServerContext;
 import org.apache.ldap.server.jndi.ServerLdapContext;
-import org.apache.ldap.server.jndi.request.Request;
+import org.apache.ldap.server.jndi.request.Call;
 
 /**
  * A service used to for authenticating users.
@@ -120,7 +120,7 @@
     {
     }
 
-    public void process( NextInterceptor nextProcessor, Request request ) throws NamingException
+    public void process( NextInterceptor nextProcessor, Call request ) throws NamingException
     {
         // check if we are already authenticated and if so we return making
         // sure first that the credentials are not exposed within context

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authorizer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authorizer.java?view=diff&r1=158294&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authorizer.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Authorizer.java Sat Mar 19 20:11:50 2005
@@ -36,17 +36,17 @@
 import org.apache.ldap.server.db.SearchResultFilter;
 import org.apache.ldap.server.jndi.ServerContext;
 import org.apache.ldap.server.jndi.ibs.FilterService;
-import org.apache.ldap.server.jndi.request.DeleteRequest;
-import org.apache.ldap.server.jndi.request.HasEntryRequest;
-import org.apache.ldap.server.jndi.request.LookUpRequest;
-import org.apache.ldap.server.jndi.request.LookUpWithAttributeIdsRequest;
-import org.apache.ldap.server.jndi.request.ModifyManyRequest;
-import org.apache.ldap.server.jndi.request.ModifyRelativeNameRequest;
-import org.apache.ldap.server.jndi.request.ModifyRequest;
-import org.apache.ldap.server.jndi.request.MoveRequest;
-import org.apache.ldap.server.jndi.request.MoveWithNewRelativeNameRequest;
-import org.apache.ldap.server.jndi.request.Request;
-import org.apache.ldap.server.jndi.request.SearchRequest;
+import org.apache.ldap.server.jndi.request.Delete;
+import org.apache.ldap.server.jndi.request.HasEntry;
+import org.apache.ldap.server.jndi.request.Lookup;
+import org.apache.ldap.server.jndi.request.LookupWithAttrIds;
+import org.apache.ldap.server.jndi.request.ModifyMany;
+import org.apache.ldap.server.jndi.request.ModifyRN;
+import org.apache.ldap.server.jndi.request.Modify;
+import org.apache.ldap.server.jndi.request.Move;
+import org.apache.ldap.server.jndi.request.MoveAndModifyRN;
+import org.apache.ldap.server.jndi.request.Call;
+import org.apache.ldap.server.jndi.request.Search;
 
 
 /**
@@ -92,7 +92,7 @@
     //    Lookup, search and list operations need to be handled using a filter
     // and so we need access to the filter service.
 
-    protected void process( NextInterceptor nextProcessor, DeleteRequest request ) throws NamingException
+    protected void process( NextInterceptor nextProcessor, Delete request ) throws NamingException
     {
         Name name = request.getName();
         Name principalDn = getPrincipal( request ).getDn();
@@ -141,7 +141,7 @@
      *
      * @see org.apache.ldap.server.jndi.BaseInterceptor#hasEntry(Name)
      */
-    protected void process( NextInterceptor nextProcessor, HasEntryRequest request ) throws NamingException
+    protected void process( NextInterceptor nextProcessor, HasEntry request ) throws NamingException
     {
         super.process( nextProcessor, request );
     }
@@ -160,7 +160,7 @@
      *
      * @see BaseInterceptor#modify(Name, int, Attributes)
      */
-    protected void process( NextInterceptor nextProcessor, ModifyRequest request ) throws NamingException
+    protected void process( NextInterceptor nextProcessor, Modify request ) throws NamingException
     {
         protectModifyAlterations( request, request.getName() );
         nextProcessor.process( request );
@@ -175,14 +175,14 @@
      *
      * @see BaseInterceptor#modify(Name, ModificationItem[])
      */
-    protected void process( NextInterceptor nextProcessor, ModifyManyRequest request ) throws NamingException
+    protected void process( NextInterceptor nextProcessor, ModifyMany request ) throws NamingException
     {
         protectModifyAlterations( request, request.getName() );
         nextProcessor.process( request );
     }
 
 
-    private void protectModifyAlterations( Request request, Name dn ) throws LdapNoPermissionException
+    private void protectModifyAlterations( Call request, Name dn ) throws LdapNoPermissionException
     {
         Name principalDn = getPrincipal( request ).getDn();
 
@@ -232,28 +232,28 @@
     // ------------------------------------------------------------------------
 
 
-    protected void process( NextInterceptor nextProcessor, ModifyRelativeNameRequest request ) throws NamingException
+    protected void process( NextInterceptor nextProcessor, ModifyRN request ) throws NamingException
     {
         protectDnAlterations( request, request.getName() );
         nextProcessor.process( request );
     }
 
 
-    protected void process( NextInterceptor nextProcessor, MoveRequest request ) throws NamingException
+    protected void process( NextInterceptor nextProcessor, Move request ) throws NamingException
     {
         protectDnAlterations( request, request.getName() );
         nextProcessor.process( request );
     }
 
 
-    protected void process( NextInterceptor nextProcessor, MoveWithNewRelativeNameRequest request ) throws NamingException
+    protected void process( NextInterceptor nextProcessor, MoveAndModifyRN request ) throws NamingException
     {
         protectDnAlterations( request, request.getName() );
         nextProcessor.process( request );
     }
 
 
-    private void protectDnAlterations( Request request, Name dn ) throws LdapNoPermissionException
+    private void protectDnAlterations( Call request, Name dn ) throws LdapNoPermissionException
     {
         Name principalDn = getPrincipal( request ).getDn();
 
@@ -290,7 +290,7 @@
         }
     }
     
-    protected void process(NextInterceptor nextProcessor, LookUpRequest request) throws NamingException {
+    protected void process(NextInterceptor nextProcessor, Lookup request) throws NamingException {
         super.process(nextProcessor, request);
         
         Attributes attributes = ( Attributes ) request.getResponse();
@@ -305,7 +305,7 @@
         request.setResponse( retval );
     }
 
-    protected void process(NextInterceptor nextProcessor, LookUpWithAttributeIdsRequest request) throws NamingException {
+    protected void process(NextInterceptor nextProcessor, LookupWithAttrIds request) throws NamingException {
         super.process(nextProcessor, request);
         
         Attributes attributes = ( Attributes ) request.getResponse();
@@ -370,7 +370,7 @@
         }
     }
     
-    protected void process(NextInterceptor nextProcessor, SearchRequest request) throws NamingException {
+    protected void process(NextInterceptor nextProcessor, Search request) throws NamingException {
         super.process(nextProcessor, request);
         
         SearchControls searchControls = request.getSearchControls();

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/BaseInterceptor.java?view=diff&r1=158294&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/BaseInterceptor.java Sat Mar 19 20:11:50 2005
@@ -21,23 +21,23 @@
 
 import org.apache.ldap.server.auth.LdapPrincipal;
 import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.server.jndi.request.AddRequest;
-import org.apache.ldap.server.jndi.request.DeleteRequest;
-import org.apache.ldap.server.jndi.request.GetMatchedNameRequest;
-import org.apache.ldap.server.jndi.request.GetSuffixRequest;
-import org.apache.ldap.server.jndi.request.HasEntryRequest;
-import org.apache.ldap.server.jndi.request.IsSuffixRequest;
-import org.apache.ldap.server.jndi.request.ListRequest;
-import org.apache.ldap.server.jndi.request.ListSuffixesRequest;
-import org.apache.ldap.server.jndi.request.LookUpRequest;
-import org.apache.ldap.server.jndi.request.LookUpWithAttributeIdsRequest;
-import org.apache.ldap.server.jndi.request.ModifyManyRequest;
-import org.apache.ldap.server.jndi.request.ModifyRelativeNameRequest;
-import org.apache.ldap.server.jndi.request.ModifyRequest;
-import org.apache.ldap.server.jndi.request.MoveRequest;
-import org.apache.ldap.server.jndi.request.MoveWithNewRelativeNameRequest;
-import org.apache.ldap.server.jndi.request.Request;
-import org.apache.ldap.server.jndi.request.SearchRequest;
+import org.apache.ldap.server.jndi.request.Add;
+import org.apache.ldap.server.jndi.request.Delete;
+import org.apache.ldap.server.jndi.request.GetMatchedDN;
+import org.apache.ldap.server.jndi.request.GetSuffix;
+import org.apache.ldap.server.jndi.request.HasEntry;
+import org.apache.ldap.server.jndi.request.IsSuffix;
+import org.apache.ldap.server.jndi.request.List;
+import org.apache.ldap.server.jndi.request.ListSuffixes;
+import org.apache.ldap.server.jndi.request.Lookup;
+import org.apache.ldap.server.jndi.request.LookupWithAttrIds;
+import org.apache.ldap.server.jndi.request.ModifyMany;
+import org.apache.ldap.server.jndi.request.ModifyRN;
+import org.apache.ldap.server.jndi.request.Modify;
+import org.apache.ldap.server.jndi.request.Move;
+import org.apache.ldap.server.jndi.request.MoveAndModifyRN;
+import org.apache.ldap.server.jndi.request.Call;
+import org.apache.ldap.server.jndi.request.Search;
 
 
 /**
@@ -71,7 +71,7 @@
      * 
      * @return the principal making the call
      */
-    public static LdapPrincipal getPrincipal( Request request )
+    public static LdapPrincipal getPrincipal( Call request )
     {
         ServerContext ctx = ( ServerContext ) request.getContextStack().peek();
         return ctx.getPrincipal();
@@ -90,72 +90,72 @@
      * analog method that does the work of the Interceptor for that Invocation
      * method.
      */
-    public void process( NextInterceptor nextProcessor, Request request )
+    public void process( NextInterceptor nextProcessor, Call request )
             throws NamingException
     {
-        if( request instanceof AddRequest )
+        if( request instanceof Add )
         {
-            process( nextProcessor, ( AddRequest ) request );
+            process( nextProcessor, ( Add ) request );
         }
-        else if( request instanceof DeleteRequest )
+        else if( request instanceof Delete )
         {
-            process( nextProcessor, ( DeleteRequest ) request );
+            process( nextProcessor, ( Delete ) request );
         }
-        else if( request instanceof GetMatchedNameRequest )
+        else if( request instanceof GetMatchedDN )
         {
-            process( nextProcessor, ( GetMatchedNameRequest ) request );
+            process( nextProcessor, ( GetMatchedDN ) request );
         }
-        else if( request instanceof GetSuffixRequest )
+        else if( request instanceof GetSuffix )
         {
-            process( nextProcessor, ( GetSuffixRequest ) request );
+            process( nextProcessor, ( GetSuffix ) request );
         }
-        else if( request instanceof HasEntryRequest )
+        else if( request instanceof HasEntry )
         {
-            process( nextProcessor, ( HasEntryRequest ) request );
+            process( nextProcessor, ( HasEntry ) request );
         }
-        else if( request instanceof IsSuffixRequest )
+        else if( request instanceof IsSuffix )
         {
-            process( nextProcessor, ( IsSuffixRequest ) request );
+            process( nextProcessor, ( IsSuffix ) request );
         }
-        else if( request instanceof ListRequest )
+        else if( request instanceof List )
         {
-            process( nextProcessor, ( ListRequest ) request );
+            process( nextProcessor, ( List ) request );
         }
-        else if( request instanceof ListSuffixesRequest )
+        else if( request instanceof ListSuffixes )
         {
-            process( nextProcessor, ( ListSuffixesRequest ) request );
+            process( nextProcessor, ( ListSuffixes ) request );
         }
-        else if( request instanceof LookUpRequest )
+        else if( request instanceof Lookup )
         {
-            process( nextProcessor, ( LookUpRequest ) request );
+            process( nextProcessor, ( Lookup ) request );
         }
-        else if( request instanceof LookUpWithAttributeIdsRequest )
+        else if( request instanceof LookupWithAttrIds )
         {
-            process( nextProcessor, ( LookUpWithAttributeIdsRequest ) request );
+            process( nextProcessor, ( LookupWithAttrIds ) request );
         }
-        else if( request instanceof ModifyRequest )
+        else if( request instanceof Modify )
         {
-            process( nextProcessor, ( ModifyRequest ) request );
+            process( nextProcessor, ( Modify ) request );
         }
-        else if( request instanceof ModifyManyRequest )
+        else if( request instanceof ModifyMany )
         {
-            process( nextProcessor, ( ModifyManyRequest ) request );
+            process( nextProcessor, ( ModifyMany ) request );
         }
-        else if( request instanceof ModifyRelativeNameRequest )
+        else if( request instanceof ModifyRN )
         {
-            process( nextProcessor, ( ModifyRelativeNameRequest ) request );
+            process( nextProcessor, ( ModifyRN ) request );
         }
-        else if( request instanceof MoveRequest )
+        else if( request instanceof Move )
         {
-            process( nextProcessor, ( MoveRequest ) request );
+            process( nextProcessor, ( Move ) request );
         }
-        else if( request instanceof MoveWithNewRelativeNameRequest )
+        else if( request instanceof MoveAndModifyRN )
         {
-            process( nextProcessor, ( MoveWithNewRelativeNameRequest ) request );
+            process( nextProcessor, ( MoveAndModifyRN ) request );
         }
-        else if( request instanceof SearchRequest )
+        else if( request instanceof Search )
         {
-            process( nextProcessor, ( SearchRequest ) request );
+            process( nextProcessor, ( Search ) request );
         }
         else {
             throw new IllegalArgumentException(
@@ -167,97 +167,97 @@
     // Invocation Analogs
     // ------------------------------------------------------------------------
 
-    protected void process( NextInterceptor nextProcessor, AddRequest request )
+    protected void process( NextInterceptor nextProcessor, Add request )
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, DeleteRequest request ) 
+    protected void process( NextInterceptor nextProcessor, Delete request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, GetMatchedNameRequest request ) 
+    protected void process( NextInterceptor nextProcessor, GetMatchedDN request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, GetSuffixRequest request ) 
+    protected void process( NextInterceptor nextProcessor, GetSuffix request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, HasEntryRequest request ) 
+    protected void process( NextInterceptor nextProcessor, HasEntry request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, IsSuffixRequest request ) 
+    protected void process( NextInterceptor nextProcessor, IsSuffix request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, ListRequest request ) 
+    protected void process( NextInterceptor nextProcessor, List request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, ListSuffixesRequest request ) 
+    protected void process( NextInterceptor nextProcessor, ListSuffixes request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, LookUpRequest request ) 
+    protected void process( NextInterceptor nextProcessor, Lookup request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, LookUpWithAttributeIdsRequest request ) 
+    protected void process( NextInterceptor nextProcessor, LookupWithAttrIds request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, ModifyRequest request ) 
+    protected void process( NextInterceptor nextProcessor, Modify request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, ModifyManyRequest request ) 
+    protected void process( NextInterceptor nextProcessor, ModifyMany request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, ModifyRelativeNameRequest request ) 
+    protected void process( NextInterceptor nextProcessor, ModifyRN request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, MoveRequest request ) 
+    protected void process( NextInterceptor nextProcessor, Move request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, MoveWithNewRelativeNameRequest request ) 
+    protected void process( NextInterceptor nextProcessor, MoveAndModifyRN request ) 
             throws NamingException
     {
         nextProcessor.process( request );
     }
 
-    protected void process( NextInterceptor nextProcessor, SearchRequest request ) 
+    protected void process( NextInterceptor nextProcessor, Search request ) 
             throws NamingException
     {
         nextProcessor.process( request );

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/DefaultAttributeTagger.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/DefaultAttributeTagger.java?view=diff&r1=158294&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/DefaultAttributeTagger.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/DefaultAttributeTagger.java Sat Mar 19 20:11:50 2005
@@ -37,15 +37,15 @@
 import org.apache.ldap.server.RootNexus;
 import org.apache.ldap.server.db.ResultFilteringEnumeration;
 import org.apache.ldap.server.db.SearchResultFilter;
-import org.apache.ldap.server.jndi.request.AddRequest;
-import org.apache.ldap.server.jndi.request.LookUpRequest;
-import org.apache.ldap.server.jndi.request.LookUpWithAttributeIdsRequest;
-import org.apache.ldap.server.jndi.request.ModifyManyRequest;
-import org.apache.ldap.server.jndi.request.ModifyRelativeNameRequest;
-import org.apache.ldap.server.jndi.request.ModifyRequest;
-import org.apache.ldap.server.jndi.request.MoveRequest;
-import org.apache.ldap.server.jndi.request.MoveWithNewRelativeNameRequest;
-import org.apache.ldap.server.jndi.request.SearchRequest;
+import org.apache.ldap.server.jndi.request.Add;
+import org.apache.ldap.server.jndi.request.Lookup;
+import org.apache.ldap.server.jndi.request.LookupWithAttrIds;
+import org.apache.ldap.server.jndi.request.ModifyMany;
+import org.apache.ldap.server.jndi.request.ModifyRN;
+import org.apache.ldap.server.jndi.request.Modify;
+import org.apache.ldap.server.jndi.request.Move;
+import org.apache.ldap.server.jndi.request.MoveAndModifyRN;
+import org.apache.ldap.server.jndi.request.Search;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
 import org.apache.ldap.server.schema.GlobalRegistries;
 
@@ -112,7 +112,7 @@
      *
      * @see BaseInterceptor#add(String, Name, Attributes)
      */
-    protected void process( NextInterceptor nextInterceptor, AddRequest request ) throws NamingException
+    protected void process( NextInterceptor nextInterceptor, Add request ) throws NamingException
     {
         String principal = getPrincipal( request ).getName();
         Attributes entry = request.getAttributes();
@@ -129,7 +129,7 @@
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, ModifyRequest request ) throws NamingException
+    protected void process( NextInterceptor nextInterceptor, Modify request ) throws NamingException
     {
         nextInterceptor.process( request );
         
@@ -147,7 +147,7 @@
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, ModifyManyRequest request ) throws NamingException
+    protected void process( NextInterceptor nextInterceptor, ModifyMany request ) throws NamingException
     {
         nextInterceptor.process( request );
 
@@ -165,7 +165,7 @@
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, ModifyRelativeNameRequest request ) throws NamingException
+    protected void process( NextInterceptor nextInterceptor, ModifyRN request ) throws NamingException
     {
         nextInterceptor.process( request );
         
@@ -184,7 +184,7 @@
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, MoveRequest request ) throws NamingException
+    protected void process( NextInterceptor nextInterceptor, Move request ) throws NamingException
     {
         nextInterceptor.process( request );
 
@@ -202,7 +202,7 @@
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, MoveWithNewRelativeNameRequest request ) throws NamingException
+    protected void process( NextInterceptor nextInterceptor, MoveAndModifyRN request ) throws NamingException
     {
         nextInterceptor.process( request );
 
@@ -220,7 +220,7 @@
     }
 
 
-    protected void process(NextInterceptor nextInterceptor, LookUpRequest request) throws NamingException {
+    protected void process(NextInterceptor nextInterceptor, Lookup request) throws NamingException {
         nextInterceptor.process( request );
         
         Attributes attributes = ( Attributes ) request.getResponse();
@@ -229,7 +229,7 @@
         request.setResponse( retval );
     }
 
-    protected void process(NextInterceptor nextInterceptor, LookUpWithAttributeIdsRequest request) throws NamingException {
+    protected void process(NextInterceptor nextInterceptor, LookupWithAttrIds request) throws NamingException {
         nextInterceptor.process( request );
         
         Attributes attributes = ( Attributes ) request.getResponse();
@@ -243,7 +243,7 @@
         request.setResponse( retval );
     }
 
-    protected void process(NextInterceptor nextInterceptor, SearchRequest request) throws NamingException {
+    protected void process(NextInterceptor nextInterceptor, Search request) throws NamingException {
         nextInterceptor.process( request );
         
         SearchControls searchControls = request.getSearchControls();

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Interceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Interceptor.java?view=diff&r1=158294&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Interceptor.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/Interceptor.java Sat Mar 19 20:11:50 2005
@@ -20,7 +20,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.jndi.request.Request;
+import org.apache.ldap.server.jndi.request.Call;
 
 /**
  * Processes or filters any directory operations.  You can intercept the
@@ -56,6 +56,6 @@
      * @param invocation the invocation to process
      * @throws NamingException on failures while handling the invocation
      */
-    void process( NextInterceptor nextProcessor, Request request )
+    void process( NextInterceptor nextProcessor, Call request )
             throws NamingException;
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorChain.java?view=diff&r1=158294&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorChain.java Sat Mar 19 20:11:50 2005
@@ -8,7 +8,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.jndi.request.Request;
+import org.apache.ldap.server.jndi.request.Call;
 
 /**
  * Manages {@link Interceptor} stack.  The first {@link Interceptor} is
@@ -34,7 +34,7 @@
             // do nothing
         }
 
-        public void process(NextInterceptor nextProcessor, Request request)
+        public void process(NextInterceptor nextProcessor, Call request)
                 throws NamingException
         {
             // do nothing
@@ -199,7 +199,7 @@
      * Start invocation chain with the specified invocation.
      * @throws NamingException if invocation failed
      */
-    public void process( Request request ) throws NamingException
+    public void process( Call request ) throws NamingException
     {
         Entry head = this.head;
         try
@@ -280,7 +280,7 @@
             this.processor = processor;
             this.nextProcessor = new NextInterceptor()
             {
-                public void process(Request request)
+                public void process(Call request)
                         throws NamingException {
                     Interceptor processor = Entry.this.nextEntry.processor;
                     try

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorException.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorException.java?view=diff&r1=158294&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorException.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/InterceptorException.java Sat Mar 19 20:11:50 2005
@@ -20,7 +20,7 @@
 import org.apache.ldap.common.exception.LdapException;
 import org.apache.ldap.common.exception.LdapNamingException;
 import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.server.jndi.request.Request;
+import org.apache.ldap.server.jndi.request.Call;
 
 
 /**
@@ -36,7 +36,7 @@
     private static final long serialVersionUID = 3258690996517746233L;
 
     /** The Invokation the Interceptor failed on */
-    private final Request request;
+    private final Call request;
     /** The Interceptor causing the failure */
     private final Interceptor requestProcessor;
 
@@ -47,7 +47,7 @@
      * @param requestProcessor the Interceptor causing the failure
      * @param invocation the Invocation the Interceptor failed on
      */
-    public InterceptorException( Interceptor requestProcessor, Request request )
+    public InterceptorException( Interceptor requestProcessor, Call request )
     {
         super( ResultCodeEnum.OTHER );
         this.request = request;
@@ -63,7 +63,7 @@
      * @param explanation String explanation of why the Interceptor failed
      */
     public InterceptorException( Interceptor requestProcessor,
-                                      Request request, String explanation )
+                                      Call request, String explanation )
     {
         super( explanation, ResultCodeEnum.OTHER );
         this.request = request;
@@ -79,7 +79,7 @@
      * @param rootCause the root cause of this exception
      */
     public InterceptorException( Interceptor requestProcessor,
-                                      Request request, Throwable rootCause )
+                                      Call request, Throwable rootCause )
     {
         this( requestProcessor, request );
         super.setRootCause( rootCause );
@@ -94,7 +94,7 @@
      * @param rootCause the root cause of this exception
      */
     public InterceptorException( Interceptor requestProcessor,
-                                      Request request,
+                                      Call request,
                                       String explanation,
                                       Throwable rootCause )
     {
@@ -107,7 +107,7 @@
      *
      * @return the invovation object this exception is associated with
      */
-    public Request getRequest()
+    public Call getRequest()
     {
         return request;
     }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/NextInterceptor.java?view=diff&r1=158294&r2=158295
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/request/interceptor/NextInterceptor.java Sat Mar 19 20:11:50 2005
@@ -2,8 +2,8 @@
 
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.jndi.request.Request;
+import org.apache.ldap.server.jndi.request.Call;
 
 public interface NextInterceptor {
-    void process( Request request ) throws NamingException;
+    void process( Call request ) throws NamingException;
 }



Mime
View raw message