You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/07/10 07:36:38 UTC
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/...
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();