directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1145082 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/ shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/ shared/trunk/ldap/schema/data/src/main/resource...
Date Mon, 11 Jul 2011 09:21:12 GMT
Author: pamarcelot
Date: Mon Jul 11 09:21:12 2011
New Revision: 1145082

URL: http://svn.apache.org/viewvc?rev=1145082&view=rev
Log:
Fix for DIRSERVER-1633 (Startup failure after first startup).

Added:
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=schemamodifications.ldif
      - copied, changed from r1144201, directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=schemamodifications.ldif
Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.10.ldif

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=1145082&r1=1145081&r2=1145082&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
Mon Jul 11 09:21:12 2011
@@ -444,7 +444,7 @@ public final class SchemaPartition exten
     /**
      * Updates the schemaModifiersName and schemaModifyTimestamp attributes of
      * the schemaModificationAttributes entry for the global schema at 
-     * ou=schema,cn=schemaModifications.  This entry is hardcoded at that 
+     * ou=schemaModifications,ou=schema.  This entry is hardcoded at that 
      * position for now.
      * 
      * The current time is used to set the timestamp and the Dn of current user

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java?rev=1145082&r1=1145081&r2=1145082&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java
Mon Jul 11 09:21:12 2011
@@ -70,7 +70,7 @@ public final class SchemaConstants
     public final static String OU_SCHEMA                            = "ou=schema";
 
     // The Dn for the schema modifications
-    public final static String SCHEMA_MODIFICATIONS_DN              = "cn=schemaModifications,ou=schema";
+    public final static String SCHEMA_MODIFICATIONS_DN              = "ou=schemaModifications,ou=schema";
 
 
     // Special attributes 1.1 , * and + for search operations

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.10.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.10.ldif?rev=1145082&r1=1145081&r2=1145082&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.10.ldif
(original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.10.ldif
Mon Jul 11 09:21:12 2011
@@ -1,6 +1,6 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.10,ou=objectClasses,cn=apache,ou=schema
-m-must: cn
+m-must: ou
 m-must: subschemaSubentryName
 m-must: schemaModifyTimestamp
 m-must: schemaModifiersName

Copied: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=schemamodifications.ldif
(from r1144201, directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=schemamodifications.ldif)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/ou%3Dschemamodifications.ldif?p2=directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/ou%3Dschemamodifications.ldif&p1=directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/ou%3Dschemamodifications.ldif&r1=1144201&r2=1145082&rev=1145082&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=schemamodifications.ldif
(original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=schemamodifications.ldif
Mon Jul 11 09:21:12 2011
@@ -1,8 +1,8 @@
 version: 1
-dn: cn=schemaModifications,ou=schema
+dn: ou=schemaModifications,ou=schema
 objectClass: schemaModificationAttributes
 objectClass: top
-cn: schemaModifications
+ou: schemaModifications
 schemaModifiersName: uid=admin,ou=system
 schemaModifyTimestamp: 20090818022733Z
 subschemaSubentryName: cn=schema



Mime
View raw message