directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r809761 - in /directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core: DefaultDirectoryService.java schema/PartitionSchemaLoader.java
Date Mon, 31 Aug 2009 22:12:01 GMT
Author: akarasulu
Date: Mon Aug 31 22:12:01 2009
New Revision: 809761

URL: http://svn.apache.org/viewvc?rev=809761&view=rev
Log:
all compiles at least - most tests will not pass

Modified:
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=809761&r1=809760&r2=809761&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
Mon Aug 31 22:12:01 2009
@@ -1441,7 +1441,6 @@
         extractor.extractOrCopy();
         LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
         registries = new Registries();
-        loader.loadAllEnabled( registries );
         
         // --------------------------------------------------------------------
         // Load schemas into the schema registry from LDIF schema repository

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=809761&r1=809760&r2=809761&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
Mon Aug 31 22:12:01 2009
@@ -197,16 +197,19 @@
          */
         EntryFilteringCursor cursor = dao.listAllNames();
         
+        // @TODO WARNING: this does not work figure out what we need to do  
+        // with this OID registry registration below that we commented out.
+        
         while ( cursor.next() )
         {
             ServerEntry entry = cursor.get();
             String oid = entry.get( mOidAT ).getString();
             EntryAttribute names = entry.get( mNameAT );
-            targetRegistries.getOidRegistry().register( oid, oid );
+            //targetRegistries.getOidRegistry().register( oid, oid );
             
             for ( Value<?> value:names )
             {
-                targetRegistries.getOidRegistry().register( value.getString(), oid );
+                //targetRegistries.getOidRegistry().register( value.getString(), oid );
             }
         }
         
@@ -320,7 +323,7 @@
         while ( list.hasNext() )
         {
             Schema schema = list.next();
-            loadDepsFirst( schema, new Stack<String>(), notLoaded, schema, targetRegistries,
null );
+            loadDepsFirst( schema, new Stack<String>(), notLoaded, schema, targetRegistries
);
             list = notLoaded.values().iterator();
         }
     }
@@ -875,6 +878,6 @@
         HashMap<String,Schema> notLoaded = new HashMap<String,Schema>();
         notLoaded.put( schema.getSchemaName(), schema );                        
         Properties props = new Properties();
-        loadDepsFirst( schema, new Stack<String>(), notLoaded, schema, registries,
props );
+        loadDepsFirst( schema, new Stack<String>(), notLoaded, schema, registries );
     }
 }



Mime
View raw message