Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 18943 invoked from network); 22 Nov 2009 22:43:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Nov 2009 22:43:09 -0000 Received: (qmail 47813 invoked by uid 500); 22 Nov 2009 22:43:09 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 47753 invoked by uid 500); 22 Nov 2009 22:43:08 -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 47744 invoked by uid 99); 22 Nov 2009 22:43:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Nov 2009 22:43:08 +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, 22 Nov 2009 22:43:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5AA7723889B5; Sun, 22 Nov 2009 22:42:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r883170 - in /directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers: CachingDnNormalizer.java DnNormalizer.java NameAndOptionalUIDNormalizer.java Date: Sun, 22 Nov 2009 22:42:44 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091122224244.5AA7723889B5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sun Nov 22 22:42:43 2009 New Revision: 883170 URL: http://svn.apache.org/viewvc?rev=883170&view=rev Log: Added the setSchemaManager method Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java?rev=883170&r1=883169&r2=883170&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java (original) +++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java Sun Nov 22 22:42:43 2009 @@ -21,6 +21,7 @@ import javax.naming.NamingException; +import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.registries.Registries; @@ -38,7 +39,7 @@ { /** serial version UID */ private static final long serialVersionUID = -206263185305284269L; - + public CachingDnNormalizer() { super( new DnNormalizer() ); @@ -52,4 +53,14 @@ { super.applyRegistries( registries ); } + + + + /** + * {@inheritDoc} + */ + public void setSchemaManager( SchemaManager schemaManager ) + { + super.normalizer.setSchemaManager( schemaManager ); + } } Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java?rev=883170&r1=883169&r2=883170&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java (original) +++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java Sun Nov 22 22:42:43 2009 @@ -41,6 +41,9 @@ // The serial UID private static final long serialVersionUID = 1L; + /** A reference to the schema manager used to normalize the DN */ + private SchemaManager schemaManager; + /** * Empty constructor */ @@ -100,7 +103,7 @@ /** * {@inheritDoc} */ - public void applySchemaManager( SchemaManager schemaManager ) + public void setSchemaManager( SchemaManager schemaManager ) { this.schemaManager = schemaManager; } Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java?rev=883170&r1=883169&r2=883170&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java (original) +++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java Sun Nov 22 22:42:43 2009 @@ -22,10 +22,12 @@ import javax.naming.NamingException; +import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.entry.client.ClientStringValue; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.Normalizer; +import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.util.StringTools; @@ -37,16 +39,16 @@ */ public class NameAndOptionalUIDNormalizer extends Normalizer { - private static final String OID = "2.5.13.23"; - // The serial UID private static final long serialVersionUID = 1L; - //public final static NameAndOptionalUIDNormalizer INSTANCE = new NameAndOptionalUIDNormalizer(); + /** A reference to the schema manager used to normalize the DN */ + private SchemaManager schemaManager; + public NameAndOptionalUIDNormalizer() { - super( OID ); + super( SchemaConstants.UNIQUE_MEMBER_MATCH_MATCH_MR_OID ); } @@ -146,4 +148,13 @@ return new LdapDN( value ).getNormName(); } } + + + /** + * {@inheritDoc} + */ + public void setSchemaManager( SchemaManager schemaManager ) + { + this.schemaManager = schemaManager; + } }