Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 16895 invoked from network); 25 Aug 2010 14:19:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 Aug 2010 14:19:04 -0000 Received: (qmail 27448 invoked by uid 500); 25 Aug 2010 14:19:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 27394 invoked by uid 500); 25 Aug 2010 14:19:02 -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 27383 invoked by uid 99); 25 Aug 2010 14:19:02 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Aug 2010 14:19:02 +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; Wed, 25 Aug 2010 14:18:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B0E623889B2; Wed, 25 Aug 2010 14:17:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r989126 - /directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java Date: Wed, 25 Aug 2010 14:17:26 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100825141726.4B0E623889B2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Wed Aug 25 14:17:25 2010 New Revision: 989126 URL: http://svn.apache.org/viewvc?rev=989126&view=rev Log: o fixed the regex pattern to consider white spaces Modified: directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java Modified: directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java?rev=989126&r1=989125&r2=989126&view=diff ============================================================================== --- directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java (original) +++ directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java Wed Aug 25 14:17:25 2010 @@ -85,7 +85,7 @@ public class SingleLdifSchemaLoader exte private void initializeSchemas( InputStream in ) throws Exception { - Pattern schemaStartPattern = Pattern.compile( "cn=[a-z0-9-_]*\\s*,\\s*ou\\s*=\\s*schema" ); + Pattern schemaStartPattern = Pattern.compile( "cn\\s*=\\s*[a-z0-9-_]*\\s*,\\s*ou\\s*=\\s*schema" ); LdifReader ldifReader = new LdifReader( in ); @@ -116,8 +116,8 @@ public class SingleLdifSchemaLoader exte { for ( String scObjTypeRdn : schemaObjectTypeRdns ) { - Pattern regex = Pattern.compile( "m-oid=[0-9\\.]*" + ",ou=" + scObjTypeRdn + ",cn=" + schemaName - + ",ou=schema", Pattern.CASE_INSENSITIVE ); + Pattern regex = Pattern.compile( "m-oid\\s*=\\s*[0-9\\.]*\\s*" + ",\\s*ou\\s*=\\s*" + scObjTypeRdn + "\\s*,\\s*cn\\s*=\\s*" + schemaName + + "\\s*,\\s*ou=schema\\s*", Pattern.CASE_INSENSITIVE ); String dn = ldifEntry.getDn().getName();