directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r808399 - in /directory: apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/ apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/ shared/bran...
Date Thu, 27 Aug 2009 12:30:21 GMT
Author: akarasulu
Date: Thu Aug 27 12:30:20 2009
New Revision: 808399

URL: http://svn.apache.org/viewvc?rev=808399&view=rev
Log:
do not need this extra getSchema() overload with properties argument - never used

Modified:
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
    directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoader.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java

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=808399&r1=808398&r2=808399&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
Thu Aug 27 12:30:20 2009
@@ -304,12 +304,6 @@
     }
 
 
-    public Schema getSchema( String schemaName, Properties schemaProperties ) throws Exception
-    {
-        return getSchema( schemaName );
-    }
-
-
     public final void loadWithDependencies( Collection<Schema> schemas, Registries
targetRegistries ) throws Exception
     {
         HashMap<String,Schema> notLoaded = new HashMap<String,Schema>();

Modified: directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoader.java?rev=808399&r1=808398&r2=808399&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoader.java
(original)
+++ directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoader.java
Thu Aug 27 12:30:20 2009
@@ -120,6 +120,11 @@
             LdifEntry entry = reader.next();
             Schema schema = ldifToSchema( entry );
             schemaMap.put( schema.getSchemaName(), schema );
+            
+            if ( IS_DEBUG )
+            {
+                LOG.debug( "Schema Initialized ... \n{}", schema );
+            }
         }
     }
 
@@ -153,13 +158,7 @@
 
     public Schema getSchema( String schemaName ) throws Exception
     {
-        return null;
-    }
-
-
-    public Schema getSchema( String schemaName, Properties schemaProperties ) throws Exception
-    {
-        return null;
+        return this.schemaMap.get( schemaName );
     }
 
 

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java?rev=808399&r1=808398&r2=808399&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java
Thu Aug 27 12:30:20 2009
@@ -49,16 +49,6 @@
     Schema getSchema( String schemaName ) throws Exception;
     
     /**
-     * Gets a schema object based on it's name and some properties.
-     * 
-     * @param schemaName the name of the schema to load
-     * @param schemaProperties the properties associated with that schema to facilitate locating/loading
it
-     * @return the Schema object associated with the name
-     * @throws Exception if any problems while trying to find the associated Schema
-     */
-    Schema getSchema( String schemaName, Properties schemaProperties ) throws Exception;
-    
-    /**
      * Loads a collection of schemas.  A best effort should be made to load the dependended

      * schemas that these schemas may rely on even if they are not included in the collection.
      * 
@@ -71,11 +61,11 @@
     /**
      * Loads a single schema at least and possibly it's dependencies.  
      * 
-     * @param schemas the schema to load
+     * @param schema the schema to load
      * @param registries the registries to populate with these schemas
      * @throws Exception if any kind of problems are encountered during the load
      */
-    void loadWithDependencies( Schema schemas, Registries registries ) throws Exception;
+    void loadWithDependencies( Schema schema, Registries registries ) throws Exception;
     
     /**
      * Loads a single schema.  Do not try to resolve dependencies while implementing this
method.



Mime
View raw message