directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r658889 - in /directory/apacheds/branches/bigbang: bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ core/src/main/java/org/apache/directory/server/core/ core/src/test/java/org/apache/directory/server/core/sc...
Date Wed, 21 May 2008 21:55:05 GMT
Author: akarasulu
Date: Wed May 21 14:55:04 2008
New Revision: 658889

URL: http://svn.apache.org/viewvc?rev=658889&view=rev
Log:
fixing compilation problems with NamingEnums and NamingExceptions

Modified:
    directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
    directory/apacheds/branches/bigbang/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
    directory/apacheds/branches/bigbang/schema-extras/src/test/java/org/apache/directory/server/schema/bootstrap/ExtraSchemaLoadTest.java

Modified: directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=658889&r1=658888&r2=658889&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
(original)
+++ directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
Wed May 21 14:55:04 2008
@@ -803,7 +803,7 @@
         {
             loader.loadWithDependencies( schemas.values(), registries );
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             e.printStackTrace();
             throw new MojoFailureException( "Failed to load bootstrap registries with schemas:
" + e.getMessage() );

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=658889&r1=658888&r2=658889&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
Wed May 21 14:55:04 2008
@@ -193,7 +193,7 @@
         {
             loader.loadWithDependencies( bootstrapSchemas, registries );
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             throw new IllegalStateException( ILLEGAL_STATE_MSG, e );
         }

Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=658889&r1=658888&r2=658889&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
Wed May 21 14:55:04 2008
@@ -71,13 +71,13 @@
     Registries registries = null;
 
 
-    public SchemaCheckerTest() throws NamingException
+    public SchemaCheckerTest() throws Exception
     {
         this( "SchemaCheckerTest" );
     }
 
 
-    public SchemaCheckerTest(String name) throws NamingException
+    public SchemaCheckerTest(String name) throws Exception
     {
         super( name );
 

Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java?rev=658889&r1=658888&r2=658889&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
Wed May 21 14:55:04 2008
@@ -26,8 +26,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.naming.NamingException;
-
 import junit.framework.TestCase;
 
 import org.apache.directory.server.schema.bootstrap.ApacheSchema;
@@ -66,7 +64,7 @@
     }
 
 
-    public void testLoadAll() throws NamingException
+    public void testLoadAll() throws Exception
     {
         Set<Schema> schemas = new HashSet<Schema>();
         schemas.add( new CoreSchema() );
@@ -90,7 +88,7 @@
     }
 
 
-    public void testSystemSchemaLoad() throws NamingException
+    public void testSystemSchemaLoad() throws Exception
     {
         SystemSchema systemSchema = new SystemSchema();
         loader.load( systemSchema, registries, false );
@@ -107,7 +105,7 @@
     }
 
 
-    public void testApacheSchemaLoad() throws NamingException
+    public void testApacheSchemaLoad() throws Exception
     {
         testSystemSchemaLoad();
         ApacheSchema apacheSchema = new ApacheSchema();
@@ -125,7 +123,7 @@
     }
 
 
-    public void testEveDepsSchemaLoad() throws NamingException
+    public void testEveDepsSchemaLoad() throws Exception
     {
         Set<Schema> schemas = new HashSet<Schema>();
         schemas.add( new ApacheSchema() );
@@ -144,7 +142,7 @@
     }
 
 
-    public void testCoreSchemaLoad() throws NamingException
+    public void testCoreSchemaLoad() throws Exception
     {
         testSystemSchemaLoad();
         CoreSchema coreSchema = new CoreSchema();
@@ -162,7 +160,7 @@
     }
 
 
-    public void testCoreDepsSchemaLoad() throws NamingException
+    public void testCoreDepsSchemaLoad() throws Exception
     {
         Set<Schema> schemas = new HashSet<Schema>();
         schemas.add( new CoreSchema() );
@@ -187,7 +185,7 @@
      *
      * @throws NamingException if there are problems.
      */
-    public void testReferentialIntegrity() throws NamingException
+    public void testReferentialIntegrity() throws Exception
     {
         if ( System.getProperties().containsKey( "ignore.ref.integ.test" ) )
         {

Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java?rev=658889&r1=658888&r2=658889&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
Wed May 21 14:55:04 2008
@@ -23,16 +23,11 @@
 
 import static org.junit.Assert.*;
 
-import java.io.FileInputStream;
 import java.security.KeyPair;
-import java.security.KeyStore;
 import java.security.cert.X509Certificate;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.schema.bootstrap.ApacheSchema;
 import org.apache.directory.server.schema.bootstrap.ApachemetaSchema;
@@ -72,7 +67,7 @@
      * Initialize the registries once for the whole test suite
      */
     @BeforeClass
-    public static void setup() throws NamingException
+    public static void setup() throws Exception
     {
         loader = new BootstrapSchemaLoader();
         oidRegistry = new DefaultOidRegistry();
@@ -95,7 +90,7 @@
      * Test method for all methods in one.
      */
     @Test
-    public void testAll() throws NamingException
+    public void testAll() throws Exception
     {
         DefaultServerEntry entry = new DefaultServerEntry( registries, new LdapDN() );
         TlsKeyGenerator.addKeyPair( entry );

Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=658889&r1=658888&r2=658889&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
Wed May 21 14:55:04 2008
@@ -23,8 +23,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.naming.NamingException;
-
 import junit.framework.TestCase;
 
 import org.apache.directory.server.core.entry.DefaultServerEntry;
@@ -56,7 +54,7 @@
     private SubtreeEvaluator evaluator;
 
 
-    private void init() throws NamingException
+    private void init() throws Exception
     {
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
         DefaultRegistries bsRegistries = new DefaultRegistries( "bootstrap", loader, new
DefaultOidRegistry() );

Modified: directory/apacheds/branches/bigbang/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java?rev=658889&r1=658888&r2=658889&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
(original)
+++ directory/apacheds/branches/bigbang/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
Wed May 21 14:55:04 2008
@@ -107,7 +107,7 @@
         this.cl = cl;
     }
 
-    public final void loadWithDependencies( Schema schema, Registries registries ) throws
NamingException
+    public final void loadWithDependencies( Schema schema, Registries registries ) throws
Exception
     {
         if ( ! ( schema instanceof BootstrapSchema ) )
         {
@@ -130,7 +130,7 @@
      * @param registries the registries to fill with producer created objects
      * @throws NamingException if there are any failures during this process
      */
-    public final void loadWithDependencies( Collection<Schema> bootstrapSchemas, Registries
registries ) throws NamingException
+    public final void loadWithDependencies( Collection<Schema> bootstrapSchemas, Registries
registries ) throws Exception
     {
         BootstrapSchema[] schemas = new BootstrapSchema[bootstrapSchemas.size()];
         schemas = bootstrapSchemas.toArray( schemas );

Modified: directory/apacheds/branches/bigbang/schema-extras/src/test/java/org/apache/directory/server/schema/bootstrap/ExtraSchemaLoadTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/schema-extras/src/test/java/org/apache/directory/server/schema/bootstrap/ExtraSchemaLoadTest.java?rev=658889&r1=658888&r2=658889&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/schema-extras/src/test/java/org/apache/directory/server/schema/bootstrap/ExtraSchemaLoadTest.java
(original)
+++ directory/apacheds/branches/bigbang/schema-extras/src/test/java/org/apache/directory/server/schema/bootstrap/ExtraSchemaLoadTest.java
Wed May 21 14:55:04 2008
@@ -64,7 +64,7 @@
     }
 
 
-    public void testLoadAll() throws NamingException
+    public void testLoadAll() throws Exception
     {
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
         Set<Schema> schemas = new HashSet<Schema>();
@@ -130,7 +130,7 @@
     }
 
 
-    public void testApacheSchemaLoad() throws NamingException
+    public void testApacheSchemaLoad() throws Exception
     {
         ApacheSchema apacheSchema = new ApacheSchema();
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
@@ -149,7 +149,7 @@
     }
 
 
-    public void testDepsSchemaLoad() throws NamingException
+    public void testDepsSchemaLoad() throws Exception
     {
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
 
@@ -189,7 +189,7 @@
     }
 
 
-    public void testJavaSchemaLoad() throws NamingException
+    public void testJavaSchemaLoad() throws Exception
     {
         testCoreSchemaLoad();
 
@@ -209,7 +209,7 @@
     }
 
 
-    public void testJavaDepsSchemaLoad() throws NamingException
+    public void testJavaDepsSchemaLoad() throws Exception
     {
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
 
@@ -231,7 +231,7 @@
     }
 
 
-    public void testApacheAndJavaDepsSchemaLoad() throws NamingException
+    public void testApacheAndJavaDepsSchemaLoad() throws Exception
     {
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
 
@@ -260,7 +260,7 @@
      *
      * @throws NamingException if there are problems.
      */
-    public void testReferentialIntegrity() throws NamingException
+    public void testReferentialIntegrity() throws Exception
     {
         if ( System.getProperties().containsKey( "ignore.ref.integ.test" ) )
         {



Mime
View raw message