Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 65904 invoked from network); 27 Aug 2009 21:47:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Aug 2009 21:47:37 -0000 Received: (qmail 49931 invoked by uid 500); 27 Aug 2009 21:47:37 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 49874 invoked by uid 500); 27 Aug 2009 21:47:37 -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 49863 invoked by uid 99); 27 Aug 2009 21:47:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Aug 2009 21:47:37 +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, 27 Aug 2009 21:47:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 52F7F23888EC; Thu, 27 Aug 2009 21:47:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r808651 - /directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/AttributeClassLoader.java Date: Thu, 27 Aug 2009 21:47:13 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090827214713.52F7F23888EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Thu Aug 27 21:47:12 2009 New Revision: 808651 URL: http://svn.apache.org/viewvc?rev=808651&view=rev Log: fixing use of server attribute to use entry attribute instead Modified: directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/AttributeClassLoader.java Modified: directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/AttributeClassLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/AttributeClassLoader.java?rev=808651&r1=808650&r2=808651&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/AttributeClassLoader.java (original) +++ directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/AttributeClassLoader.java Thu Aug 27 21:47:12 2009 @@ -17,15 +17,12 @@ * under the License. * */ - - package org.apache.directory.server.schema.loader.ldif; import javax.naming.NamingException; import javax.naming.directory.InvalidAttributeValueException; -import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Value; @@ -38,7 +35,7 @@ */ public class AttributeClassLoader extends ClassLoader { - public ServerAttribute attribute; + public EntryAttribute attribute; public AttributeClassLoader() @@ -49,12 +46,12 @@ public void setAttribute( EntryAttribute attribute ) throws NamingException { - if ( ((ServerAttribute)attribute).getAttributeType().getSyntax().isHumanReadable() ) + if ( attribute.isHR() ) { throw new InvalidAttributeValueException( "The attribute must be binary" ); } - this.attribute = (ServerAttribute)attribute; + this.attribute = attribute; }