From commits-return-24931-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Mon Mar 01 07:52:16 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 89221 invoked from network); 1 Mar 2010 07:52:16 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Mar 2010 07:52:16 -0000 Received: (qmail 35423 invoked by uid 500); 28 Feb 2010 15:52:17 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 35394 invoked by uid 500); 28 Feb 2010 15:52:17 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 35386 invoked by uid 99); 28 Feb 2010 15:52:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Feb 2010 15:52:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Feb 2010 15:52:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3870D23889B9; Sun, 28 Feb 2010 15:51:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100228155157.3870D23889B9@eris.apache.org> 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; }