directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r658888 - in /directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries: AbstractSchemaLoader.java DefaultRegistries.java Registries.java
Date Wed, 21 May 2008 21:44:06 GMT
Author: akarasulu
Date: Wed May 21 14:44:05 2008
New Revision: 658888

URL: http://svn.apache.org/viewvc?rev=658888&view=rev
Log:
fixing schema registries

Modified:
    directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AbstractSchemaLoader.java
    directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
    directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java

Modified: directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AbstractSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AbstractSchemaLoader.java?rev=658888&r1=658887&r2=658888&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AbstractSchemaLoader.java
(original)
+++ directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AbstractSchemaLoader.java
Wed May 21 14:44:05 2008
@@ -84,7 +84,7 @@
      * failure results while loading, producing and or registering schema objects
      */
     protected final void loadDepsFirst( Schema rootAncestor, Stack<String> beenthere,
Map<String,Schema> notLoaded, Schema schema,
-        Registries registries, Properties props ) throws NamingException
+        Registries registries, Properties props ) throws Exception
     {
         if ( registries.getLoadedSchemas().containsKey( schema.getSchemaName() ) )
         {

Modified: directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java?rev=658888&r1=658887&r2=658888&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
(original)
+++ directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
Wed May 21 14:44:05 2008
@@ -27,8 +27,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.schema.bootstrap.Schema;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -231,7 +229,7 @@
             syntax.getSyntaxChecker();
             return true;
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             errors.add( e );
             return false;
@@ -258,7 +256,7 @@
                 isSuccess = false;
             }
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             errors.add( e );
             isSuccess = false;
@@ -274,7 +272,7 @@
                 isSuccess = false;
             }
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             errors.add( e );
             isSuccess = false;
@@ -292,7 +290,7 @@
                 isSuccess = false;
             }
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             errors.add( e );
             isSuccess = false;
@@ -317,10 +315,9 @@
         {
             isSuccess &= resolve( at.getSuperior(), errors );
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             errors.add( e );
-
             isSuccess = false;
         }
 
@@ -333,10 +330,9 @@
                 hasMatchingRule |= true;
             }
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             errors.add( e );
-
             isSuccess = false;
         }
 
@@ -349,10 +345,9 @@
                 hasMatchingRule |= true;
             }
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             errors.add( e );
-
             isSuccess = false;
         }
 
@@ -365,10 +360,9 @@
                 hasMatchingRule |= true;
             }
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             errors.add( e );
-
             isSuccess = false;
         }
 
@@ -386,10 +380,9 @@
                 isSuccess = false;
             }
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             errors.add( e );
-
             isSuccess = false;
         }
 
@@ -429,7 +422,7 @@
         {
             superiors = oc.getSuperClasses();
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             superiors = new ObjectClass[0];
             isSuccess = false;
@@ -447,7 +440,7 @@
         {
             mayList = oc.getMayList();
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             mayList = new AttributeType[0];
             isSuccess = false;
@@ -465,7 +458,7 @@
         {
             mustList = oc.getMustList();
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             mustList = new AttributeType[0];
             isSuccess = false;
@@ -491,19 +484,19 @@
     }
 
 
-    public void load( String schemaName ) throws NamingException
+    public void load( String schemaName ) throws Exception
     {
         load( schemaName, new Properties() );
     }
 
 
-    public void load( String schemaName, Properties schemaProperties ) throws NamingException
+    public void load( String schemaName, Properties schemaProperties ) throws Exception
     {
         Schema schema = schemaLoader.getSchema( schemaName, schemaProperties );
         
         if ( schema.isDisabled() )
         {
-            throw new NamingException( "Disabled schemas cannot be loaded into registries."
);
+            throw new Exception( "Disabled schemas cannot be loaded into registries." );
         }
         
         loadedByName.put( schema.getSchemaName(), schema );
@@ -511,7 +504,7 @@
     }
     
     
-    public void unload( String schemaName ) throws NamingException
+    public void unload( String schemaName ) throws Exception
     {
         disableSchema( ditStructureRuleRegistry, schemaName );
         disableSchema( ditContentRuleRegistry, schemaName );
@@ -529,7 +522,7 @@
     }
 
 
-    private void disableSchema( SchemaObjectRegistry registry, String schemaName ) throws
NamingException
+    private void disableSchema( SchemaObjectRegistry registry, String schemaName ) throws
Exception
     {
         Iterator<? extends SchemaObject> objects = registry.iterator();
         List<String> unregistered = new ArrayList<String>();

Modified: directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java?rev=658888&r1=658887&r2=658888&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java
(original)
+++ directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java
Wed May 21 14:44:05 2008
@@ -24,8 +24,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.schema.bootstrap.Schema;
 
 
@@ -41,11 +39,11 @@
     
     Map<String,Schema> getLoadedSchemas();
     
-    void load( String schemaName ) throws NamingException;
+    void load( String schemaName ) throws Exception;
     
-    void load( String schemaName, Properties props ) throws NamingException;
+    void load( String schemaName, Properties props ) throws Exception;
 
-    void unload( String schemaName ) throws NamingException;
+    void unload( String schemaName ) throws Exception;
     
     SchemaLoader setSchemaLoader();
     



Mime
View raw message