directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r158307 - in directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call: ./ interceptor/
Date Sun, 20 Mar 2005 05:56:41 GMT
Author: trustin
Date: Sat Mar 19 21:56:37 2005
New Revision: 158307

URL: http://svn.apache.org/viewcvs?view=rev&rev=158307
Log:
* Implemented doExecute() of all Calls
* Renamed Search.searchControls to Search.controls
* Renamed Search.expressionNode to Search.filter

Modified:
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Add.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Call.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Delete.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetMatchedDN.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetSuffix.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/HasEntry.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/IsSuffix.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/List.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ListSuffixes.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Lookup.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/LookupWithAttrIds.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Modify.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyMany.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyRN.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Move.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/MoveAndModifyRN.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Search.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/Authorizer.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/DefaultAttributeTagger.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/SchemaManager.java

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Add.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Add.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Add.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Add.java
Sat Mar 19 21:56:37 2005
@@ -1,16 +1,18 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
+import org.apache.ldap.server.BackingStore;
+
 public class Add extends Call {
 
     private final String userProvidedName;
     private final Name normalizedName;
     private final Attributes attributes;
     
-    public Add( String userProvidedName, Name normalizedName,
-                       Attributes attributes )
+    public Add( String userProvidedName, Name normalizedName, Attributes attributes )
     {
         if( userProvidedName == null )
         {
@@ -42,5 +44,10 @@
     
     public String getUserProvidedName() {
         return userProvidedName;
+    }
+
+    protected Object doExecute( BackingStore store ) throws NamingException {
+        store.add( userProvidedName, normalizedName, attributes );
+        return null;
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Call.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Call.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Call.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Call.java
Sat Mar 19 21:56:37 2005
@@ -8,18 +8,11 @@
 
 public abstract class Call {
 
-    protected final BackingStore store;
     protected Object response;
     protected Stack contextStack;
 
-    protected Call( BackingStore store )
+    protected Call()
     {
-        if( store == null )
-        {
-            throw new NullPointerException( "store" );
-        }
-
-        this.store = store;
     }
     
     /**
@@ -61,10 +54,10 @@
         this.contextStack = contextStack;
     }
     
-    public void execute() throws NamingException
+    public void execute( BackingStore store ) throws NamingException
     {
-        setResponse( doExecute() );
+        setResponse( doExecute( store ) );
     }
     
-    protected abstract Object doExecute() throws NamingException;
+    protected abstract Object doExecute( BackingStore store ) throws NamingException;
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Delete.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Delete.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Delete.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Delete.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,9 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
 
 public class Delete extends Call {
 
@@ -18,5 +21,10 @@
 
     public Name getName() {
         return name;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        store.delete( name );
+        return null;
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetMatchedDN.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetMatchedDN.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetMatchedDN.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetMatchedDN.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,10 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
+import org.apache.ldap.server.PartitionNexus;
 
 public class GetMatchedDN extends Call {
 
@@ -24,5 +28,9 @@
 
     public Name getName() {
         return name;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        return ( ( PartitionNexus ) store ).getMatchedDn( name, normalized );
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetSuffix.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetSuffix.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetSuffix.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/GetSuffix.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,10 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
+import org.apache.ldap.server.ContextPartition;
 
 public class GetSuffix extends Call {
 
@@ -24,5 +28,9 @@
 
     public Name getName() {
         return name;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        return ( ( ContextPartition) store ).getSuffix( normalized );
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/HasEntry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/HasEntry.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/HasEntry.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/HasEntry.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,9 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
 
 public class HasEntry extends Call {
 
@@ -18,5 +21,9 @@
 
     public Name getName() {
         return name;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        return store.hasEntry( name )? Boolean.TRUE : Boolean.FALSE;
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/IsSuffix.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/IsSuffix.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/IsSuffix.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/IsSuffix.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,9 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
 
 public class IsSuffix extends Call {
 
@@ -18,5 +21,9 @@
 
     public Name getName() {
         return name;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        return store.isSuffix( name )? Boolean.TRUE : Boolean.FALSE;
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/List.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/List.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/List.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/List.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,9 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
 
 public class List extends Call {
 
@@ -18,5 +21,9 @@
 
     public Name getBaseName() {
         return baseName;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        return store.list( baseName );
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ListSuffixes.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ListSuffixes.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ListSuffixes.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ListSuffixes.java
Sat Mar 19 21:56:37 2005
@@ -1,5 +1,10 @@
 package org.apache.ldap.server.jndi.call;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
+import org.apache.ldap.server.PartitionNexus;
+
 public class ListSuffixes extends Call {
 
     private final boolean normalized;
@@ -11,5 +16,9 @@
 
     public boolean isNormalized() {
         return normalized;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        return ( ( PartitionNexus ) store ).listSuffixes( normalized );
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Lookup.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Lookup.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Lookup.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Lookup.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,9 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
 
 public class Lookup extends Call {
 
@@ -18,5 +21,9 @@
 
     public Name getName() {
         return name;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        return store.lookup( name );
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/LookupWithAttrIds.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/LookupWithAttrIds.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/LookupWithAttrIds.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/LookupWithAttrIds.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,9 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
 
 public class LookupWithAttrIds extends Call {
 
@@ -28,5 +31,9 @@
     
     public String[] getAttributeIds() {
         return attributeIds;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        return store.lookup( name, attributeIds );
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Modify.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Modify.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Modify.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Modify.java
Sat Mar 19 21:56:37 2005
@@ -1,8 +1,11 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
+import org.apache.ldap.server.BackingStore;
+
 public class Modify extends Call {
 
     private final Name name;
@@ -38,5 +41,10 @@
     public Attributes getAttributes()
     {
         return attributes;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        store.modify( name, modOp, attributes );
+        return null;
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyMany.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyMany.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyMany.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyMany.java
Sat Mar 19 21:56:37 2005
@@ -1,8 +1,11 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
 import javax.naming.directory.ModificationItem;
 
+import org.apache.ldap.server.BackingStore;
+
 public class ModifyMany extends Call {
 
     private final Name name;
@@ -31,5 +34,10 @@
     public ModificationItem[] getModificationItems()
     {
         return modificationItems;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        store.modify( name, modificationItems );
+        return null;
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyRN.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyRN.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyRN.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/ModifyRN.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,9 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
 
 public class ModifyRN extends Call {
 
@@ -39,5 +42,10 @@
     public boolean isDeleteOldName()
     {
         return deleteOldName;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        store.modifyRn( name, newRelativeName, deleteOldName );
+        return null;
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Move.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Move.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Move.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Move.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,9 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
 
 public class Move extends Call {
 
@@ -31,5 +34,10 @@
     public Name getNewParentName()
     {
         return newParentName;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        store.move( name, newParentName );
+        return null;
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/MoveAndModifyRN.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/MoveAndModifyRN.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/MoveAndModifyRN.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/MoveAndModifyRN.java
Sat Mar 19 21:56:37 2005
@@ -1,6 +1,9 @@
 package org.apache.ldap.server.jndi.call;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.BackingStore;
 
 public class MoveAndModifyRN extends Call {
 
@@ -49,5 +52,10 @@
     public boolean isDeleteOldName()
     {
         return deleteOldName;
+    }
+
+    protected Object doExecute(BackingStore store) throws NamingException {
+        store.move( name, newParentName, newRelativeName, deleteOldName );
+        return null;
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Search.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Search.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Search.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/Search.java
Sat Mar 19 21:56:37 2005
@@ -3,19 +3,21 @@
 import java.util.Map;
 
 import javax.naming.Name;
+import javax.naming.NamingException;
 import javax.naming.directory.SearchControls;
 
 import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.server.BackingStore;
 
 public class Search extends Call {
 
     private final Name baseName;
     private final Map environment;
-    private final ExprNode expressionNode;
-    private final SearchControls searchControls;
+    private final ExprNode filter;
+    private final SearchControls controls;
     
-    public Search( Name baseName, Map environment, ExprNode expressionNode,
-                          SearchControls searchControls )
+    public Search( Name baseName, Map environment, ExprNode filters,
+                   SearchControls controls )
     {
         if( baseName == null )
         {
@@ -25,19 +27,19 @@
         {
             throw new NullPointerException( "environment" );
         }
-        if( expressionNode == null )
+        if( filters == null )
         {
-            throw new NullPointerException( "expressionNode" );
+            throw new NullPointerException( "filter" );
         }
-        if( searchControls == null )
+        if( controls == null )
         {
-            throw new NullPointerException( "searchControls" );
+            throw new NullPointerException( "controls" );
         }
         
         this.baseName = baseName;
         this.environment = environment;
-        this.expressionNode = expressionNode;
-        this.searchControls = searchControls;
+        this.filter = filters;
+        this.controls = controls;
     }
 
     public Name getBaseName()
@@ -50,13 +52,17 @@
         return environment;
     }
     
-    public ExprNode getExpressionNode()
+    public ExprNode getFilter()
     {
-        return expressionNode;
+        return filter;
     }
     
-    public SearchControls getSearchControls()
+    public SearchControls getControls()
     {
-        return searchControls;
+        return controls;
+    }
+
+    protected Object doExecute( BackingStore store ) throws NamingException {
+        return store.search( baseName, environment, filter, controls );
     }
 }

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/Authorizer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/Authorizer.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/Authorizer.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/Authorizer.java
Sat Mar 19 21:56:37 2005
@@ -373,7 +373,7 @@
     protected void process(NextInterceptor nextProcessor, Search call) throws NamingException
{
         super.process(nextProcessor, call);
         
-        SearchControls searchControls = call.getSearchControls();
+        SearchControls searchControls = call.getControls();
         if ( searchControls.getReturningAttributes() != null )
         {
             return;

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/DefaultAttributeTagger.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/DefaultAttributeTagger.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/DefaultAttributeTagger.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/DefaultAttributeTagger.java
Sat Mar 19 21:56:37 2005
@@ -246,7 +246,7 @@
     protected void process(NextInterceptor nextInterceptor, Search call) throws NamingException
{
         nextInterceptor.process( call );
         
-        SearchControls searchControls = call.getSearchControls();
+        SearchControls searchControls = call.getControls();
         if ( searchControls.getReturningAttributes() != null )
         {
             return;

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/SchemaManager.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/SchemaManager.java?view=diff&r1=158306&r2=158307
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/SchemaManager.java
(original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/call/interceptor/SchemaManager.java
Sat Mar 19 21:56:37 2005
@@ -127,8 +127,8 @@
         }
 
         boolean bypass = false;
-        SearchControls searchControls = call.getSearchControls();
-        ExprNode filter = call.getExpressionNode();
+        SearchControls searchControls = call.getControls();
+        ExprNode filter = call.getFilter();
         if ( searchControls.getSearchScope() == SearchControls.OBJECT_SCOPE &&
              filter instanceof SimpleNode )
         {



Mime
View raw message