Author: akarasulu
Date: Thu Feb  1 21:13:57 2007
New Revision: 502501

URL: http://svn.apache.org/viewvc?view=rev&rev=502501
Log:
changing global schema subentry from cn=schema,ou=system to cn=schema where it aught to be

Modified:
    directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java

Modified: directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java?view=diff&rev=502501&r1=502500&r2=502501
==============================================================================
--- directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java (original)
+++ directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java Thu Feb  1 21:13:57 2007
@@ -39,7 +39,7 @@
  */
 public class SubschemaSubentryITest extends AbstractAdminTestCase
 {
-    private static final String GLOBAL_SUBSCHEMA_DN = "cn=schema,ou=system";
+    private static final String GLOBAL_SUBSCHEMA_DN = "cn=schema";
     private static final String SUBSCHEMA_SUBENTRY = "subschemaSubentry";
 
     

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=502501&r1=502500&r2=502501
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Thu Feb  1 21:13:57 2007
@@ -133,7 +133,7 @@
         // setup that root DSE
         this.rootDSE = rootDSE;
         Attribute attr = new AttributeImpl( "subschemaSubentry" );
-        attr.add( "cn=schema,ou=system" );
+        attr.add( GLOBAL_SCHEMA_SUBENTRY_DN );
         rootDSE.put( attr );
 
         attr = new AttributeImpl( "supportedLDAPVersion" );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?view=diff&rev=502501&r1=502500&r2=502501
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java Thu Feb  1 21:13:57 2007
@@ -50,6 +50,9 @@
     /** the default user principal or DN */
     public final static String ADMIN_PRINCIPAL = "uid=admin,ou=system";
     
+    /** the DN for the global schema subentry */
+    public final static String GLOBAL_SCHEMA_SUBENTRY_DN = "cn=schema";
+    
     /** the normalized user principal or DN */
     public final static String ADMIN_PRINCIPAL_NORMALIZED = "0.9.2342.19200300.100.1.1=admin,2.5.4.11=system";