Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 85E866195 for ; Sun, 10 Jul 2011 05:37:20 +0000 (UTC) Received: (qmail 75709 invoked by uid 500); 10 Jul 2011 05:37:19 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 75564 invoked by uid 500); 10 Jul 2011 05:37:03 -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 75535 invoked by uid 99); 10 Jul 2011 05:36:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Jul 2011 05:36:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sun, 10 Jul 2011 05:36:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6E27A2388C06 for ; Sun, 10 Jul 2011 05:36:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1144779 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/schema/ core-constants/src/main/java/org/apache/directory/server/constants/ core/src/main/java/org/apache/directory/server/core/ core/src/main/... Date: Sun, 10 Jul 2011 05:36:38 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110710053638.6E27A2388C06@eris.apache.org> Author: elecharny Date: Sun Jul 10 05:36:37 2011 New Revision: 1144779 URL: http://svn.apache.org/viewvc?rev=1144779&view=rev Log: o Removed the ServerDNConstants.SCHEMA_MODIFICATIONS_DN constant, it's already defined in SchemaConstants Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=1144779&r1=1144778&r2=1144779&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Sun Jul 10 05:36:37 2011 @@ -235,7 +235,7 @@ public final class SchemaPartition exten throw new RuntimeException( e ); } - schemaModificationDn = new Dn( schemaManager, ServerDNConstants.SCHEMA_MODIFICATIONS_DN ); + schemaModificationDn = new Dn( schemaManager, SchemaConstants.SCHEMA_MODIFICATIONS_DN ); } Modified: directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java?rev=1144779&r1=1144778&r2=1144779&view=diff ============================================================================== --- directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java (original) +++ directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java Sun Jul 10 05:36:37 2011 @@ -55,15 +55,6 @@ public final class ServerDNConstants /** The DN for the gloval schema subentry normalized */ public static final String CN_SCHEMA_DN_NORMALIZED = "2.5.4.3=schema"; - /** the DN for the schema in dit area */ - //public static final String OU_SCHEMA_DN = "ou=schema"; - - /** the normalized DN for the schema in DIT area */ - //public static final String OU_SCHEMA_DN_NORMALIZED = "2.5.4.11=schema"; - - /** The DN for the schema modifications */ - public static final String SCHEMA_MODIFICATIONS_DN = "cn=schemaModifications,ou=schema"; - /** the base dn under which all users reside */ public static final String USERS_SYSTEM_DN = "ou=users,ou=system"; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=1144779&r1=1144778&r2=1144779&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Sun Jul 10 05:36:37 2011 @@ -428,6 +428,7 @@ public class DefaultCoreSession implemen public boolean isAdministrator() { String normName = getEffectivePrincipal().getName(); + return normName.equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ); } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1144779&r1=1144778&r2=1144779&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Sun Jul 10 05:36:37 2011 @@ -359,7 +359,7 @@ public class DefaultSchemaService implem { try { - schemaModificationAttributesDn = new Dn( getSchemaManager(), ServerDNConstants.SCHEMA_MODIFICATIONS_DN ); + schemaModificationAttributesDn = new Dn( getSchemaManager(), SchemaConstants.SCHEMA_MODIFICATIONS_DN ); } catch ( LdapException e ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1144779&r1=1144778&r2=1144779&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sun Jul 10 05:36:37 2011 @@ -32,7 +32,6 @@ import java.util.concurrent.ConcurrentHa import javax.naming.directory.SearchControls; -import org.apache.directory.server.constants.ServerDNConstants; import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor; @@ -190,7 +189,7 @@ public class SchemaInterceptor extends B subschemaSubentryDn.apply( schemaManager ); subschemaSubentryDnNorm = subschemaSubentryDn.getNormName(); - schemaModificationAttributesDn = directoryService.getDnFactory().create( ServerDNConstants.SCHEMA_MODIFICATIONS_DN ); + schemaModificationAttributesDn = directoryService.getDnFactory().create( SchemaConstants.SCHEMA_MODIFICATIONS_DN ); schemaModificationAttributesDn.apply( schemaManager ); computeSuperiors();