Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 74077 invoked from network); 24 Sep 2009 23:24:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Sep 2009 23:24:21 -0000 Received: (qmail 30676 invoked by uid 500); 24 Sep 2009 23:24:21 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 30617 invoked by uid 500); 24 Sep 2009 23:24:20 -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 30606 invoked by uid 99); 24 Sep 2009 23:24:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 23:24:20 +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; Thu, 24 Sep 2009 23:24:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB68A2388906; Thu, 24 Sep 2009 23:23:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818658 - in /directory: apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/... Date: Thu, 24 Sep 2009 23:23:58 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090924232358.EB68A2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Sep 24 23:23:57 2009 New Revision: 818658 URL: http://svn.apache.org/viewvc?rev=818658&view=rev Log: o Fixed the Comparator injected classes tests by adding the schema name and FQCN into the generated LdapComparator SchemaObject Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=818658&r1=818657&r2=818658&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java (original) +++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java Thu Sep 24 23:23:57 2009 @@ -67,6 +67,8 @@ if ( ( schemaName != null ) && isSchemaLoaded( name ) ) { + comparator.setSchemaName( schemaName ); + comparatorRegistry.unregister( oid ); comparatorRegistry.register( comparator ); Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=818658&r1=818657&r2=818658&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Thu Sep 24 23:23:57 2009 @@ -37,8 +37,6 @@ import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; -import jdbm.helper.IntegerComparator; - import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.integ.CiRunner; import org.apache.directory.server.core.integ.Level; @@ -50,6 +48,7 @@ import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.MatchingRule; +import org.apache.directory.shared.ldap.schema.comparators.BooleanComparator; import org.apache.directory.shared.ldap.schema.comparators.StringComparator; import org.apache.directory.shared.ldap.schema.registries.ComparatorRegistry; import org.apache.directory.shared.ldap.schema.registries.MatchingRuleRegistry; @@ -282,7 +281,7 @@ dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID ); ModificationItem[] mods = new ModificationItem[1]; - Attribute attr = new BasicAttribute( MetaSchemaConstants.M_FQCN_AT, IntegerComparator.class.getName() ); + Attribute attr = new BasicAttribute( MetaSchemaConstants.M_FQCN_AT, BooleanComparator.class.getName() ); mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ); getSchemaContext( service ).modifyAttributes( dn, mods ); @@ -293,7 +292,7 @@ getComparatorRegistry().getSchemaName( OID ), "apachemeta" ); Class clazz = getComparatorRegistry().lookup( OID ).getClass(); - assertEquals( clazz, IntegerComparator.class ); + assertEquals( clazz, BooleanComparator.class ); } @@ -306,7 +305,7 @@ dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID ); Attributes mods = new BasicAttributes( true ); - mods.put( MetaSchemaConstants.M_FQCN_AT, IntegerComparator.class.getName() ); + mods.put( MetaSchemaConstants.M_FQCN_AT, BooleanComparator.class.getName() ); getSchemaContext( service ).modifyAttributes( dn, DirContext.REPLACE_ATTRIBUTE, mods ); assertTrue( "comparator OID should still be present", @@ -316,7 +315,7 @@ getComparatorRegistry().getSchemaName( OID ), "apachemeta" ); Class clazz = getComparatorRegistry().lookup( OID ).getClass(); - assertEquals( clazz, IntegerComparator.class ); + assertEquals( clazz, BooleanComparator.class ); } 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=818658&r1=818657&r2=818658&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 Thu Sep 24 23:23:57 2009 @@ -231,6 +231,7 @@ comparator = ( LdapComparator ) clazz.newInstance(); comparator.setOid( oid ); injectRegistries( comparator, targetRegistries ); + comparator.setFqcn( className ); return comparator; } @@ -274,8 +275,9 @@ } String className = entry.get( MetaSchemaConstants.M_FQCN_AT ).get().getString(); - return getLdapComparator( entry.get( MetaSchemaConstants.M_OID_AT ).getString(), - className, entry.get( MetaSchemaConstants.M_BYTECODE_AT ), targetRegistries ); + String oid = entry.get( MetaSchemaConstants.M_OID_AT ).getString(); + EntryAttribute byteCode = entry.get( MetaSchemaConstants.M_BYTECODE_AT ); + return getLdapComparator( oid, className, byteCode, targetRegistries ); }