directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r917193 - in /directory: apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
Date Sun, 28 Feb 2010 15:51:57 GMT
Author: seelmann
Date: Sun Feb 28 15:51:56 2010
New Revision: 917193

URL: http://svn.apache.org/viewvc?rev=917193&view=rev
Log:
Fixed LdapUrlTest, removed usage of JNDI SearchControls 

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=917193&r1=917192&r2=917193&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
Sun Feb 28 15:51:56 2010
@@ -23,7 +23,6 @@
 
 import javax.naming.Context;
 import javax.naming.NamingException;
-import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.ReferralManager;
@@ -45,6 +44,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.LdapURL;
@@ -94,7 +94,7 @@
         // - we don't have extensions
         // - the DN is not empty
 
-        if ( ldapUrl.getScope() != SearchControls.OBJECT_SCOPE )
+        if ( ldapUrl.getScope() != SearchScope.OBJECT )
         {
             // This is the default value if we don't have any scope
             // Let's assume that it's incorrect if we get something

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java?rev=917193&r1=917192&r2=917193&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
Sun Feb 28 15:51:56 2010
@@ -1556,9 +1556,9 @@
      * 
      * @return Returns the scope.
      */
-    public int getScope()
+    public SearchScope getScope()
     {
-        return scope.ordinal();
+        return scope;
     }
 
 



Mime
View raw message