From commits-return-16829-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Sun Jan 06 14:49:29 2008 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 17017 invoked from network); 6 Jan 2008 14:49:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Jan 2008 14:49:29 -0000 Received: (qmail 50237 invoked by uid 500); 6 Jan 2008 14:49:18 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 50188 invoked by uid 500); 6 Jan 2008 14:49: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 50177 invoked by uid 99); 6 Jan 2008 14:49:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jan 2008 06:49:17 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jan 2008 14:49:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C5C2A1A9850; Sun, 6 Jan 2008 06:49:05 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r609320 - /directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Date: Sun, 06 Jan 2008 14:49:05 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080106144905.C5C2A1A9850@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sun Jan 6 06:49:04 2008 New Revision: 609320 URL: http://svn.apache.org/viewvc?rev=609320&view=rev Log: Applied Simon Temple patch Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=609320&r1=609319&r2=609320&view=diff ============================================================================== --- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original) +++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Sun Jan 6 06:49:04 2008 @@ -29,6 +29,7 @@ import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.protocol.shared.store.LdifFileLoader; import org.apache.directory.server.protocol.shared.store.LdifLoadFilter; +import org.apache.directory.server.schema.registries.AttributeTypeRegistry; import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.message.AttributesImpl; @@ -207,7 +208,7 @@ } - protected void setLdifFilters( List filters ) + public void setLdifFilters( List filters ) { this.ldifFilters.clear(); this.ldifFilters.addAll( filters ); @@ -318,8 +319,15 @@ } - LdapPrincipal admin = new LdapPrincipal( new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN ), - AuthenticationLevel.STRONG ); + LdapDN dn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN ); + + // Must normalize the dn or - IllegalStateException! + AttributeTypeRegistry reg = directoryService.getRegistries().getAttributeTypeRegistry(); + dn.normalize( reg.getNormalizerMapping() ); + + LdapPrincipal admin = new LdapPrincipal( dn, AuthenticationLevel.STRONG ); + + DirContext root = directoryService.getJndiContext( admin ); ensureLdifFileBase( root );