Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 60767 invoked from network); 15 Sep 2009 21:00:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Sep 2009 21:00:08 -0000 Received: (qmail 64147 invoked by uid 500); 15 Sep 2009 21:00:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 64074 invoked by uid 500); 15 Sep 2009 21:00: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 64065 invoked by uid 99); 15 Sep 2009 21:00:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Sep 2009 21:00: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; Tue, 15 Sep 2009 21:00:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4EE2323888E5; Tue, 15 Sep 2009 20:59:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r815484 - /directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java Date: Tue, 15 Sep 2009 20:59:43 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090915205943.4EE2323888E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Sep 15 20:59:42 2009 New Revision: 815484 URL: http://svn.apache.org/viewvc?rev=815484&view=rev Log: Fixed the MR association : i we had more than one MR for an AT, they were all associated to the EQUALITY MR. Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java?rev=815484&r1=815483&r2=815484&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java (original) +++ directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java Tue Sep 15 20:59:42 2009 @@ -29,7 +29,6 @@ import javax.naming.NamingException; import org.apache.directory.shared.ldap.constants.MetaSchemaConstants; -import org.apache.directory.shared.ldap.schema.registries.Schema; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; @@ -37,19 +36,20 @@ import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.LdapComparator; +import org.apache.directory.shared.ldap.schema.LdapSyntax; import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.Normalizer; import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; import org.apache.directory.shared.ldap.schema.SchemaObject; -import org.apache.directory.shared.ldap.schema.LdapSyntax; import org.apache.directory.shared.ldap.schema.SyntaxChecker; import org.apache.directory.shared.ldap.schema.UsageEnum; import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription; import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription; import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription; -import org.apache.directory.shared.ldap.schema.registries.Registries; import org.apache.directory.shared.ldap.schema.registries.DefaultSchema; +import org.apache.directory.shared.ldap.schema.registries.Registries; +import org.apache.directory.shared.ldap.schema.registries.Schema; import org.apache.directory.shared.ldap.util.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -496,14 +496,14 @@ { String mrName = entry.get( MetaSchemaConstants.M_ORDERING_AT ).getString(); String mrOid = targetRegistries.getMatchingRuleRegistry().getOidByName( mrName ); - at.setEqualityOid( mrOid ); + at.setOrderingOid( mrOid ); } if ( entry.get( MetaSchemaConstants.M_SUBSTR_AT ) != null ) { String mrName = entry.get( MetaSchemaConstants.M_SUBSTR_AT ).getString(); String mrOid = targetRegistries.getMatchingRuleRegistry().getOidByName( mrName ); - at.setEqualityOid( mrOid ); + at.setSubstringOid( mrOid ); } if ( entry.get( MetaSchemaConstants.M_SUP_ATTRIBUTE_TYPE_AT ) != null )