directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r519098 - /directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
Date Fri, 16 Mar 2007 18:45:10 GMT
Author: elecharny
Date: Fri Mar 16 11:45:09 2007
New Revision: 519098

URL: http://svn.apache.org/viewvc?view=rev&rev=519098
Log:
Moved the "objectClass" definition to shared-ldap-constants.
Modified the classes which were using the SystemSchemaConstants for "objctClass"

Modified:
    directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java

Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?view=diff&rev=519098&r1=519097&r2=519098
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
(original)
+++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
Fri Mar 16 11:45:09 2007
@@ -61,6 +61,7 @@
 import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
 import org.apache.directory.server.schema.registries.SyntaxRegistry;
 import org.apache.directory.server.utils.AttributesFactory;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
@@ -187,8 +188,8 @@
             if ( ! hasEntry( dn ) )
             {
                 Attributes entry = new AttributesImpl();
-                entry.put( SystemSchemaConstants.OBJECT_CLASS_AT, "top" );
-                entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "organizationalUnit"
);
+                entry.put( SchemaConstants.OBJECT_CLASS_AT, "top" );
+                entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( "organizationalUnit" );
                 entry.put( CoreSchemaConstants.OU_AT, "schema" );
                 store.add( dn, entry );
             }
@@ -598,7 +599,7 @@
         }
         storeConfig.setIndexedAttributes( indexSet );
 
-        Attributes rootEntry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT,
"organizationalUnit", true );
+        Attributes rootEntry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit",
true );
         rootEntry.put( CoreSchemaConstants.OU_AT, "schema" );
         storeConfig.setContextEntry( rootEntry );
         
@@ -625,10 +626,10 @@
     private void createSchemaModificationAttributesEntry() throws NamingException
     {
         Attributes entry = new AttributesImpl( 
-            SystemSchemaConstants.OBJECT_CLASS_AT, 
+            SchemaConstants.OBJECT_CLASS_AT, 
             ApacheSchemaConstants.SCHEMA_MODIFICATION_ATTRIBUTES_OC,
             true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "top" );
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( "top" );
         
         entry.put( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT, ADMIN_NORM_NAME );
         entry.put( SystemSchemaConstants.MODIFIERS_NAME_AT, ADMIN_NORM_NAME );
@@ -733,8 +734,8 @@
         }
         
         Attributes entry = new AttributesImpl();
-        entry.put( SystemSchemaConstants.OBJECT_CLASS_AT, "top" );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "organizationalUnit" );
+        entry.put( SchemaConstants.OBJECT_CLASS_AT, "top" );
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( "organizationalUnit" );
         entry.put( CoreSchemaConstants.OU_AT, dn.getRdn().getValue() );
         store.add( dn, entry );
     }



Mime
View raw message