directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r916985 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ apacheds/trunk/xdbm-search/src/main/java/org/...
Date Sat, 27 Feb 2010 16:36:41 GMT
Author: elecharny
Date: Sat Feb 27 16:36:41 2010
New Revision: 916985

URL: http://svn.apache.org/viewvc?rev=916985&view=rev
Log:
Removed some reference to JNDI SearchControls in shared-ldap, fixing the code accordingly

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SearchScope.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java?rev=916985&r1=916984&r2=916985&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
Sat Feb 27 16:36:41 2010
@@ -192,7 +192,7 @@
     {
         super( session, dn );
         this.aliasDerefMode = aliasDerefMode;
-        this.scope = SearchScope.getSearchScope( searchControls );
+        this.scope = SearchScope.getSearchScope( searchControls.getSearchScope() );
         this.timeLimit = searchControls.getTimeLimit();
         this.sizeLimit = searchControls.getCountLimit();
         

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=916985&r1=916984&r2=916985&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
(original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
Sat Feb 27 16:36:41 2010
@@ -936,7 +936,7 @@
             DirectoryListener listener = new EventListenerAdapter( ( ServerLdapContext )
this, namingListener );
             NotificationCriteria criteria = new NotificationCriteria();
             criteria.setFilter( filter );
-            criteria.setScope( SearchScope.getSearchScope( searchControls ) );
+            criteria.setScope( SearchScope.getSearchScope( searchControls.getSearchScope()
) );
             criteria.setAliasDerefMode( AliasDerefMode.getEnum( getEnvironment() ) );
             criteria.setBase( buildTarget( name ) );
             

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java?rev=916985&r1=916984&r2=916985&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
(original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
Sat Feb 27 16:36:41 2010
@@ -22,23 +22,23 @@
 
 import javax.naming.directory.SearchControls;
 
-import org.apache.directory.shared.ldap.filter.AndNode;
-import org.apache.directory.shared.ldap.filter.BranchNode;
-import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.filter.ScopeNode;
-import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.xdbm.EmptyIndexCursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.SingletonIndexCursor;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.search.SearchEngine;
-import org.apache.directory.server.xdbm.search.Evaluator;
-import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.shared.ldap.filter.AndNode;
+import org.apache.directory.shared.ldap.filter.BranchNode;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.filter.ScopeNode;
+import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
+import org.apache.directory.shared.ldap.name.LdapDN;
 
 
 /**
@@ -166,7 +166,7 @@
         // Add the scope node using the effective base to the filter
         BranchNode root = new AndNode();
         ExprNode node = new ScopeNode( aliasDerefMode, effectiveBase.toString(), 
-            SearchScope.getSearchScope( searchCtls ) );
+            SearchScope.getSearchScope( searchCtls.getSearchScope() ) );
         root.getChildren().add( node );
         root.getChildren().add( filter );
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SearchScope.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SearchScope.java?rev=916985&r1=916984&r2=916985&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SearchScope.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SearchScope.java
Sat Feb 27 16:36:41 2010
@@ -19,8 +19,6 @@
  */
 package org.apache.directory.shared.ldap.filter;
 
-import javax.naming.directory.SearchControls;
-
 import org.apache.directory.shared.i18n.I18n;
 
 /**
@@ -90,19 +88,6 @@
     
     /**
      * Gets the SearchScope enumerated type for the corresponding 
-     * SearchControls scope setting.
-     *
-     * @param searchControls the search controls to get SearchScope for
-     * @return the SearchScope enumerated type for the SearchControls
-     */
-    public static SearchScope getSearchScope( SearchControls searchControls )
-    {
-        return getSearchScope( searchControls.getSearchScope() );
-    }
-    
-    
-    /**
-     * Gets the SearchScope enumerated type for the corresponding 
      * scope numeric value.
      *
      * @param scope the numeric value to get SearchScope for



Mime
View raw message