directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r658895 [1/3] - in /directory/apacheds/branches/bigbang/core-integ/src: main/java/org/apache/directory/server/core/integ/ main/java/org/apache/directory/server/core/integ/state/ test/java/org/apache/directory/server/core/authn/ test/java/or...
Date Wed, 21 May 2008 22:05:23 GMT
Author: elecharny
Date: Wed May 21 15:05:21 2008
New Revision: 658895

URL: http://svn.apache.org/viewvc?rev=658895&view=rev
Log:
fixing issues with Cursor verses NamingEnumeration usage in Interceptors

Modified:
    directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java
    directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
    directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedDirtyState.java
    directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedPristineState.java
    directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedRevertedState.java
    directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedDirtyState.java
    directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedPristineState.java
    directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceContext.java
    directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceState.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/trigger/TriggerInterceptorIT.java

Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java Wed May 21 15:05:21 2008
@@ -29,8 +29,6 @@
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.Suite;
 
-import javax.naming.NamingException;
-import java.io.IOException;
 import java.util.List;
 
 
@@ -122,11 +120,7 @@
                 cleanup();
                 destroy();
             }
-            catch ( NamingException e )
-            {
-                notifier.fireTestFailure( new Failure( getDescription(), e ) );
-            }
-            catch ( IOException e )
+            catch ( Exception e )
             {
                 notifier.fireTestFailure( new Failure( getDescription(), e ) );
             }

Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Wed May 21 15:05:21 2008
@@ -85,7 +85,7 @@
      * @param ldif the ldif containing entries to add to the server.
      * @throws NamingException if there is a problem adding the entries from the LDIF
      */
-    public static void injectEntries( DirectoryService service, String ldif ) throws NamingException
+    public static void injectEntries( DirectoryService service, String ldif ) throws Exception
     {
         LdapContext rootDSE = getRootContext( service );
         LdifReader reader = new LdifReader();
@@ -105,7 +105,7 @@
 
 
     public static LdapContext getContext( String principalDn, DirectoryService service, String dn )
-            throws NamingException
+            throws Exception
     {
         if ( principalDn == null )
         {
@@ -125,19 +125,19 @@
     }
 
 
-    public static LdapContext getSystemContext( DirectoryService service ) throws NamingException
+    public static LdapContext getSystemContext( DirectoryService service ) throws Exception
     {
         return getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, ServerDNConstants.SYSTEM_DN );
     }
 
 
-    public static LdapContext getSchemaContext( DirectoryService service ) throws NamingException
+    public static LdapContext getSchemaContext( DirectoryService service ) throws Exception
     {
         return getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, ServerDNConstants.OU_SCHEMA_DN );
     }
 
 
-    public static LdapContext getRootContext( DirectoryService service ) throws NamingException
+    public static LdapContext getRootContext( DirectoryService service ) throws Exception
     {
         return getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, "" );
     }

Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedDirtyState.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedDirtyState.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedDirtyState.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedDirtyState.java Wed May 21 15:05:21 2008
@@ -27,8 +27,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.naming.NamingException;
-
 
 /**
  * The state of a test service where it has been started and has been used for
@@ -81,7 +79,7 @@
     }
 
 
-    public void shutdown() throws NamingException
+    public void shutdown() throws Exception
     {
         LOG.debug( "calling shutdown() " );
         context.getService().shutdown();
@@ -199,7 +197,7 @@
     }
 
 
-    public void revert() throws NamingException
+    public void revert() throws Exception
     {
         LOG.debug( "calling revert()" );
         context.getService().revert();

Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedPristineState.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedPristineState.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedPristineState.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedPristineState.java Wed May 21 15:05:21 2008
@@ -74,7 +74,7 @@
     }
 
 
-    public void shutdown() throws NamingException
+    public void shutdown() throws Exception
     {
         LOG.debug( "calling shutdown()" );
         context.getService().shutdown();

Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedRevertedState.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedRevertedState.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedRevertedState.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StartedRevertedState.java Wed May 21 15:05:21 2008
@@ -77,7 +77,7 @@
     }
 
 
-    public void shutdown() throws NamingException
+    public void shutdown() throws Exception
     {
         LOG.debug( "calling shutdown()" );
         context.getService().shutdown();

Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedDirtyState.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedDirtyState.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedDirtyState.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedDirtyState.java Wed May 21 15:05:21 2008
@@ -75,7 +75,7 @@
     }
 
 
-    public void startup() throws NamingException
+    public void startup() throws Exception
     {
         LOG.debug( "calling startup" );
         context.getService().startup();

Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedPristineState.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedPristineState.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedPristineState.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/StoppedPristineState.java Wed May 21 15:05:21 2008
@@ -80,7 +80,7 @@
     }
 
 
-    public void startup() throws NamingException
+    public void startup() throws Exception
     {
         LOG.debug( "calling startup()" );
         context.getService().startup();

Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceContext.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceContext.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceContext.java Wed May 21 15:05:21 2008
@@ -138,7 +138,7 @@
      *
      * @throws NamingException on failures to start the core directory service
      */
-    public static void startup() throws NamingException
+    public static void startup() throws Exception
     {
         get().state.startup();
     }
@@ -149,7 +149,7 @@
      *
      * @throws NamingException on failures to stop the core directory service
      */
-    public static void shutdown() throws NamingException
+    public static void shutdown() throws Exception
     {
         get().state.shutdown();
     }
@@ -179,7 +179,7 @@
      * @throws NamingException on failures to revert the state of the core
      * directory service
      */
-    public static void revert() throws NamingException
+    public static void revert() throws Exception
     {
         get().state.revert();
     }

Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceState.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceState.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceState.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/state/TestServiceState.java Wed May 21 15:05:21 2008
@@ -71,7 +71,7 @@
      *
      * @throws NamingException on failures to start the core directory service
      */
-    void startup() throws NamingException;
+    void startup() throws Exception;
 
 
     /**
@@ -79,7 +79,7 @@
      *
      * @throws NamingException on failures to stop the core directory service
      */
-    void shutdown() throws NamingException;
+    void shutdown() throws Exception;
 
 
     /**
@@ -105,5 +105,5 @@
      * @throws NamingException on failures to revert the state of the core
      * directory service
      */
-    void revert() throws NamingException;
+    void revert() throws Exception;
 }

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Wed May 21 15:05:21 2008
@@ -56,7 +56,7 @@
     public static DirectoryService service;
 
 
-    public static LdapContext getRootDSE() throws NamingException
+    public static LdapContext getRootDSE() throws Exception
     {
         if ( service.isStarted() )
         {
@@ -69,7 +69,7 @@
     }
 
 
-    public static LdapContext getRootDSE( String bindDn ) throws NamingException
+    public static LdapContext getRootDSE( String bindDn ) throws Exception
     {
         if ( service.isStarted() )
         {
@@ -82,7 +82,7 @@
     }
 
 
-    public static LdapContext getSystemRoot() throws NamingException
+    public static LdapContext getSystemRoot() throws Exception
     {
         if ( service.isStarted() )
         {
@@ -96,7 +96,7 @@
     }
 
 
-    public static LdapContext getSystemRoot( String bindDn ) throws NamingException
+    public static LdapContext getSystemRoot( String bindDn ) throws Exception
     {
         if ( service.isStarted() )
         {
@@ -131,7 +131,7 @@
      * @throws NamingException if there are failures
      */
     @Test
-    public void testAdminAccountCreation() throws NamingException
+    public void testAdminAccountCreation() throws Exception
     {
         String userDn = "uid=admin,ou=system";
         LdapContext ctx = service.getJndiContext( new LdapDN( userDn ), userDn,
@@ -154,7 +154,7 @@
 
 
     @Test
-    public void test3UseAkarasulu() throws NamingException
+    public void test3UseAkarasulu() throws Exception
     {
         apply( getRootDSE(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
@@ -213,7 +213,7 @@
 
 
     @Test
-    public void test11InvalidateCredentialCache() throws NamingException
+    public void test11InvalidateCredentialCache() throws Exception
     {
         apply( getRootDSE(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
@@ -284,7 +284,7 @@
 
 
     @Test
-    public void testSHA() throws NamingException
+    public void testSHA() throws Exception
     {
         apply( getRootDSE(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
@@ -337,7 +337,7 @@
 
 
     @Test
-    public void testSSHA() throws NamingException
+    public void testSSHA() throws Exception
     {
         apply( getRootDSE(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
@@ -389,7 +389,7 @@
 
 
     @Test
-    public void testMD5() throws NamingException
+    public void testMD5() throws Exception
     {
         apply( getRootDSE(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
@@ -441,7 +441,7 @@
 
 
     @Test
-    public void testSMD5() throws NamingException
+    public void testSMD5() throws Exception
     {
         apply( getRootDSE(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
@@ -493,7 +493,7 @@
 
 
     @Test
-    public void testCRYPT() throws NamingException
+    public void testCRYPT() throws Exception
     {
         apply( getRootDSE(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
@@ -545,7 +545,7 @@
 
 
     @Test
-    public void testInvalidateCredentialCacheForUpdatingAnotherUsersPassword() throws NamingException
+    public void testInvalidateCredentialCacheForUpdatingAnotherUsersPassword() throws Exception
     {
         apply( getRootDSE(), getUserAddLdif() );
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java Wed May 21 15:05:21 2008
@@ -70,7 +70,7 @@
      * @return true if the entry can be created by the user at the specified location, false otherwise
      * @throws NamingException if there are problems conducting the test
      */
-    public boolean checkCanAddEntryAs( String uid, String password, String entryRdn ) throws NamingException
+    public boolean checkCanAddEntryAs( String uid, String password, String entryRdn ) throws Exception
     {
         Attributes testEntry = new AttributesImpl( "ou", "testou", true );
         Attribute objectClass = new AttributeImpl( "objectClass" );
@@ -103,7 +103,7 @@
      * @throws NamingException if the test encounters an error
      */
     @Test
-    public void testGrantAddAdministrators() throws NamingException
+    public void testGrantAddAdministrators() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -137,7 +137,7 @@
      * @throws NamingException if the test encounters an error
      */
     @Test
-    public void testGrantAddByName() throws NamingException
+    public void testGrantAddByName() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -163,7 +163,7 @@
      * @throws NamingException if the test encounters an error
      */
     @Test
-    public void testGrantAddBySubtree() throws NamingException
+    public void testGrantAddBySubtree() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -189,7 +189,7 @@
      * @throws NamingException if the test encounters an error
      */
     @Test
-    public void testGrantAddAllUsers() throws NamingException
+    public void testGrantAddAllUsers() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Wed May 21 15:05:21 2008
@@ -65,7 +65,7 @@
      * @throws NamingException if there are problems
      */
     @Test
-    public void testNoDeleteOnAdminByAdmin() throws NamingException
+    public void testNoDeleteOnAdminByAdmin() throws Exception
     {
         try
         {
@@ -85,7 +85,7 @@
      * @throws NamingException if there are problems
      */
     @Test
-    public void testNoRdnChangesOnAdminByAdmin() throws NamingException
+    public void testNoRdnChangesOnAdminByAdmin() throws Exception
     {
         try
         {
@@ -105,7 +105,7 @@
      * @throws NamingException if there are problems
      */
     @Test
-    public void testModifyOnAdminByAdmin() throws NamingException
+    public void testModifyOnAdminByAdmin() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Attributes attributes = new AttributesImpl();
@@ -122,7 +122,7 @@
      * @throws NamingException if there are problems
      */
     @Test
-    public void testSearchSubtreeByAdmin() throws NamingException
+    public void testSearchSubtreeByAdmin() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         SearchControls controls = new SearchControls();

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Wed May 21 15:05:21 2008
@@ -64,7 +64,7 @@
      * @throws NamingException if there are problems
      */
     @Test
-    public void testNoDeleteOnAdminByNonAdmin() throws NamingException
+    public void testNoDeleteOnAdminByNonAdmin() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
@@ -87,7 +87,7 @@
      * @throws NamingException if there are problems
      */
     @Test
-    public void testNoRdnChangesOnAdminByNonAdmin() throws NamingException
+    public void testNoRdnChangesOnAdminByNonAdmin() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
@@ -111,7 +111,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testModifyOnAdminByNonAdmin() throws NamingException
+    public void testModifyOnAdminByNonAdmin() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
@@ -138,7 +138,7 @@
      * @throws NamingException if there are problems
      */
     @Test
-    public void testSearchSubtreeByNonAdmin() throws NamingException
+    public void testSearchSubtreeByNonAdmin() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java Wed May 21 15:05:21 2008
@@ -28,7 +28,6 @@
 import org.apache.directory.server.core.DirectoryService;
 import org.junit.runner.RunWith;
 
-import javax.naming.NamingException;
 import static org.junit.Assert.fail;
 import org.junit.Test;
 import static org.apache.directory.server.core.authz.AutzIntegUtils.createUser;
@@ -56,7 +55,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testAuthnWithRootDSE() throws NamingException
+    public void testAuthnWithRootDSE() throws Exception
     {
         createUser( "billyd", "billyd" );
 
@@ -80,7 +79,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testAuthnFailsWithSystemPartition() throws NamingException
+    public void testAuthnFailsWithSystemPartition() throws Exception
     {
         createUser( "billyd", "billyd" );
         
@@ -105,7 +104,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testAuthnPassesWithSystemPartition() throws NamingException
+    public void testAuthnPassesWithSystemPartition() throws Exception
     {
         createUser( "billyd", "billyd" );
         

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Wed May 21 15:05:21 2008
@@ -89,7 +89,7 @@
      * @return the admin context at ou=system
      * @throws NamingException if there are problems creating the context
      */
-    public static DirContext getContextAsAdmin() throws NamingException
+    public static DirContext getContextAsAdmin() throws Exception
     {
         return getSystemContext( service );
     }
@@ -105,7 +105,7 @@
      * @throws NamingException if is a problem initializing or getting the context
      */
     @SuppressWarnings("unchecked")
-    public static DirContext getContextAsAdmin( String dn ) throws NamingException
+    public static DirContext getContextAsAdmin( String dn ) throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Hashtable<String,Object> env = ( Hashtable<String,Object> ) sysRoot.getEnvironment().clone();
@@ -129,7 +129,7 @@
      * @throws NamingException if there are problems creating the new group like
      * it exists already
      */
-    public static Name createGroup( String cn, String firstMemberDn ) throws NamingException
+    public static Name createGroup( String cn, String firstMemberDn ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
         Attributes group = new AttributesImpl( "cn", cn, true );
@@ -150,7 +150,7 @@
      * @throws NamingException if there are problems removing the user
      * i.e. user does not exist
      */
-    public static void deleteUser( String uid ) throws NamingException
+    public static void deleteUser( String uid ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
         adminCtx.destroySubcontext( "uid=" + uid + ",ou=users" );
@@ -167,7 +167,7 @@
      * @return the dn of the newly created user entry
      * @throws NamingException if there are problems creating the user entry
      */
-    public static Name createUser( String uid, String password ) throws NamingException
+    public static Name createUser( String uid, String password ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
         Attributes user = new AttributesImpl( "uid", uid, true );
@@ -194,7 +194,7 @@
      * @return the DN of the group as a Name object
      * @throws NamingException if the group cannot be created
      */
-    public static Name createGroup( String groupName ) throws NamingException
+    public static Name createGroup( String groupName ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
         Attributes group = new AttributesImpl( true );
@@ -218,7 +218,7 @@
      * @param groupCn the cn of the group to add the user to
      * @throws NamingException if the group does not exist
      */
-    public static void addUserToGroup( String userUid, String groupCn ) throws NamingException
+    public static void addUserToGroup( String userUid, String groupCn ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
         Attributes changes = new AttributesImpl( "uniqueMember", "uid=" + userUid + ",ou=users,ou=system", true );
@@ -233,7 +233,7 @@
      * @param groupCn the RDN attribute value of the group to have user removed from
      * @throws NamingException if there are problems accessing the group
      */
-    public static void removeUserFromGroup( String userUid, String groupCn ) throws NamingException
+    public static void removeUserFromGroup( String userUid, String groupCn ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
         Attributes changes = new AttributesImpl( "uniqueMember", "uid=" + userUid + ",ou=users,ou=system", true );
@@ -249,7 +249,7 @@
      * @return the context as the user
      * @throws NamingException if the user does not exist or authx fails
      */
-    public static DirContext getContextAs( Name user, String password ) throws NamingException
+    public static DirContext getContextAs( Name user, String password ) throws Exception
     {
         return getContextAs( user, password, ServerDNConstants.SYSTEM_DN );
     }
@@ -265,7 +265,7 @@
      * @throws NamingException if the does not exist or authx fails
      */
     @SuppressWarnings("unchecked")
-    public static DirContext getContextAs( Name user, String password, String dn ) throws NamingException
+    public static DirContext getContextAs( Name user, String password, String dn ) throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Hashtable<String,Object> env = ( Hashtable<String,Object> ) sysRoot.getEnvironment().clone();
@@ -279,7 +279,7 @@
     }
 
 
-    public static void deleteAccessControlSubentry( String cn ) throws NamingException
+    public static void deleteAccessControlSubentry( String cn ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
         adminCtx.destroySubcontext( "cn=" + cn );
@@ -294,7 +294,7 @@
      * @param aciItem the prescriptive ACI attribute value
      * @throws NamingException if there is a problem creating the subentry
      */
-    public static void createAccessControlSubentry( String cn, String aciItem ) throws NamingException
+    public static void createAccessControlSubentry( String cn, String aciItem ) throws Exception
     {
         createAccessControlSubentry( cn, "{}", aciItem );
     }
@@ -309,7 +309,7 @@
      * @param aciItem the prescriptive ACI attribute value
      * @throws NamingException if there is a problem creating the subentry
      */
-    public static void createAccessControlSubentry( String cn, String subtree, String aciItem ) throws NamingException
+    public static void createAccessControlSubentry( String cn, String subtree, String aciItem ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
 
@@ -344,7 +344,7 @@
      * @param aciItem the entryACI attribute value
      * @throws NamingException if there is a problem adding the attribute
      */
-    public static void addEntryACI( Name rdn, String aciItem ) throws NamingException
+    public static void addEntryACI( Name rdn, String aciItem ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
 
@@ -360,7 +360,7 @@
      * @param aciItem the subentryACI attribute value
      * @throws NamingException if there is a problem adding the attribute
      */
-    public static void addSubentryACI( String aciItem ) throws NamingException
+    public static void addSubentryACI( String aciItem ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
 
@@ -378,7 +378,7 @@
      * @param aciItem the new value for the ACI item
      * @throws NamingException if the modify fails
      */
-    public static void changePresciptiveACI( String cn, String aciItem ) throws NamingException
+    public static void changePresciptiveACI( String cn, String aciItem ) throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
         Attributes changes = new AttributesImpl( "prescriptiveACI", aciItem );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java Wed May 21 15:05:21 2008
@@ -30,7 +30,6 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.junit.runner.RunWith;
 
-import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -77,7 +76,7 @@
      * @throws javax.naming.NamingException if there are problems conducting the test
      */
     public boolean checkCanCompareTelephoneNumberAs( String uid, String password, String entryRdn, String number )
-        throws NamingException
+        throws Exception
     {
         // create the entry with the telephoneNumber attribute to compare
         Attributes testEntry = new AttributesImpl( "ou", "testou", true );
@@ -121,7 +120,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantCompareAdministrators() throws NamingException
+    public void testGrantCompareAdministrators() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -168,7 +167,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantCompareByName() throws NamingException
+    public void testGrantCompareByName() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -215,7 +214,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantCompareBySubtree() throws NamingException
+    public void testGrantCompareBySubtree() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -241,7 +240,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantCompareAllUsers() throws NamingException
+    public void testGrantCompareAllUsers() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -262,7 +261,7 @@
 
 
     @Test
-    public void testPasswordCompare() throws NamingException
+    public void testPasswordCompare() throws Exception
     {
         DirContext adminCtx = getContextAsAdmin();
         Attributes user = new AttributesImpl( "uid", "bob", true );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java Wed May 21 15:05:21 2008
@@ -30,7 +30,6 @@
 import org.apache.directory.server.core.DirectoryService;
 import org.junit.runner.RunWith;
 
-import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -77,7 +76,7 @@
      * @return true if the entry can be created by the user at the specified location, false otherwise
      * @throws javax.naming.NamingException if there are problems conducting the test
      */
-    public boolean checkCanDeleteEntryAs( String uid, String password, String entryRdn ) throws NamingException
+    public boolean checkCanDeleteEntryAs( String uid, String password, String entryRdn ) throws Exception
     {
         Attributes testEntry = new AttributesImpl( "ou", "testou", true );
         Attribute objectClass = new AttributeImpl( "objectClass" );
@@ -112,7 +111,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantDeleteAdministrators() throws NamingException
+    public void testGrantDeleteAdministrators() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -145,7 +144,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantDeleteByName() throws NamingException
+    public void testGrantDeleteByName() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -170,7 +169,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantDeleteBySubtree() throws NamingException
+    public void testGrantDeleteBySubtree() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -195,7 +194,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantDeleteAllUsers() throws NamingException
+    public void testGrantDeleteAllUsers() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java Wed May 21 15:05:21 2008
@@ -54,7 +54,7 @@
      * @throws NamingException if the test encounters an error
      */
     @Test
-    public void testFailureToAddBadACI() throws NamingException
+    public void testFailureToAddBadACI() throws Exception
     {
         // add a subentry with malformed ACI
         try

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Wed May 21 15:05:21 2008
@@ -86,7 +86,7 @@
      * @throws javax.naming.NamingException if there are problems conducting the test
      */
     public boolean checkCanModifyAs( String uid, String password, String entryRdn, ModificationItemImpl[] mods )
-        throws NamingException
+        throws Exception
     {
         // create the entry with the telephoneNumber attribute to modify
         Attributes testEntry = new AttributesImpl( "ou", "testou", true );
@@ -144,7 +144,7 @@
      * @throws javax.naming.NamingException if there are problems conducting the test
      */
     public boolean checkCanModifyAs( String uid, String password, String entryRdn, int modOp, Attributes mods )
-        throws NamingException
+        throws Exception
     {
         // create the entry with the telephoneNumber attribute to modify
         Attributes testEntry = new AttributesImpl( "ou", "testou", true );
@@ -193,7 +193,7 @@
      * false otherwise.
      * @throws javax.naming.NamingException if there are problems conducting the test
      */
-    public boolean checkCanSelfModify( String uid, String password, int modOp, Attributes mods ) throws NamingException
+    public boolean checkCanSelfModify( String uid, String password, int modOp, Attributes mods ) throws Exception
     {
         try
         {
@@ -222,7 +222,7 @@
      * false otherwise.
      * @throws javax.naming.NamingException if there are problems conducting the test
      */
-    public boolean checkCanSelfModify( String uid, String password, ModificationItemImpl[] mods ) throws NamingException
+    public boolean checkCanSelfModify( String uid, String password, ModificationItemImpl[] mods ) throws Exception
     {
         try
         {
@@ -262,7 +262,7 @@
 
 
     @Test
-    public void testSelfModification() throws NamingException
+    public void testSelfModification() throws Exception
     {
         // ----------------------------------------------------------------------------------
         // Modify with Attribute Addition
@@ -299,7 +299,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantModifyByTestGroup() throws NamingException
+    public void testGrantModifyByTestGroup() throws Exception
     {
         // ----------------------------------------------------------------------------------
         // Modify with Attribute Addition
@@ -542,7 +542,7 @@
     
     
     @Test
-    public void testPresciptiveACIModification() throws NamingException
+    public void testPresciptiveACIModification() throws Exception
     {
         
         ModificationItemImpl[] mods = toItems( DirContext.ADD_ATTRIBUTE,
@@ -573,7 +573,7 @@
     
 
     @Test
-    public void testMaxValueCountProtectedItem() throws NamingException
+    public void testMaxValueCountProtectedItem() throws Exception
     {
         createUser( "billyd", "billyd" );
         createAccessControlSubentry( "mvcACI",

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java Wed May 21 15:05:21 2008
@@ -30,7 +30,6 @@
 import org.apache.directory.server.core.DirectoryService;
 import org.junit.runner.RunWith;
 
-import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -78,7 +77,7 @@
      * @throws javax.naming.NamingException if there are problems conducting the test
      */
     public boolean checkCanRenameAs( String uid, String password, String entryRdn, String newRdn )
-        throws NamingException
+        throws Exception
     {
         Attributes testEntry = new AttributesImpl( "ou", "testou", true );
         Attribute objectClass = new AttributeImpl( "objectClass" );
@@ -117,7 +116,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantByAdministrators() throws NamingException
+    public void testGrantByAdministrators() throws Exception
     {
         // ----------------------------------------------------------------------------
         // Test simple RDN change: NO SUBTREE MOVEMENT!
@@ -223,7 +222,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantByName() throws NamingException
+    public void testGrantByName() throws Exception
     {
         // ----------------------------------------------------------------------------
         // Test simple RDN change: NO SUBTREE MOVEMENT!
@@ -304,7 +303,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantBySubtree() throws NamingException
+    public void testGrantBySubtree() throws Exception
     {
         // ----------------------------------------------------------------------------
         // Test simple RDN change: NO SUBTREE MOVEMENT!
@@ -385,7 +384,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantByAnyuser() throws NamingException
+    public void testGrantByAnyuser() throws Exception
     {
         // ----------------------------------------------------------------------------
         // Test simple RDN change: NO SUBTREE MOVEMENT!
@@ -465,7 +464,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testExportAndImportSeperately() throws NamingException
+    public void testExportAndImportSeperately() throws Exception
     {
         // ----------------------------------------------------------------------------
         // Test move and RDN change at the same time.

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Wed May 21 15:05:21 2008
@@ -109,7 +109,7 @@
 
 
     private void recursivelyAddSearchData( Name parent, Attributes[] children, final int sizeLimit, int[] count )
-        throws NamingException
+        throws Exception
     {
         Name[] childRdns = new Name[children.length];
         for ( int ii = 0; ii < children.length && count[0] < sizeLimit; ii++ )
@@ -146,7 +146,7 @@
      * @return the immediate child node created under parent which contains the subtree
      * @throws NamingException on error
      */
-    private Name addSearchData( Name parent, int branchingFactor, int sizelimit ) throws NamingException
+    private Name addSearchData( Name parent, int branchingFactor, int sizelimit ) throws Exception
     {
         parent = ( Name ) parent.clone();
         parent.add( "ou=tests" );
@@ -163,7 +163,7 @@
      * @param rdn the relative dn from ou=system of the entry to delete recursively
      * @throws NamingException if there are problems deleting entries
      */
-    private void recursivelyDelete( Name rdn ) throws NamingException
+    private void recursivelyDelete( Name rdn ) throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         NamingEnumeration<SearchResult> results = sysRoot.search( rdn, "(objectClass=*)", new SearchControls() );
@@ -188,7 +188,7 @@
      * @return true if the search succeeds as expected, false otherwise
      * @throws NamingException if there are problems conducting the search
      */
-    private boolean checkCanSearchAs( String uid, String password ) throws NamingException
+    private boolean checkCanSearchAs( String uid, String password ) throws Exception
     {
         return checkCanSearchAs( uid, password, "(objectClass=*)", null, 3 );
     }
@@ -205,7 +205,7 @@
      * @return true if the search succeeds as expected, false otherwise
      * @throws NamingException if there are problems conducting the search
      */
-    private boolean checkCanSearchAs( String uid, String password, int resultSetSz ) throws NamingException
+    private boolean checkCanSearchAs( String uid, String password, int resultSetSz ) throws Exception
     {
         return checkCanSearchAs( uid, password, "(objectClass=*)", null, resultSetSz );
     }
@@ -224,7 +224,7 @@
      * @throws NamingException if there are problems conducting the search
      */
     private boolean checkCanSearchAs( String uid, String password, SearchControls cons, int resultSetSz )
-        throws NamingException
+        throws Exception
     {
         return checkCanSearchAs( uid, password, "(objectClass=*)", cons, resultSetSz );
     }
@@ -243,7 +243,7 @@
      * @throws NamingException if there are problems conducting the search
      */
     private boolean checkCanSearchAs( String uid, String password, String filter, SearchControls cons, int resultSetSz )
-        throws NamingException
+        throws Exception
     {
         if ( cons == null )
         {
@@ -292,7 +292,7 @@
      * @throws NamingException if there are problems conducting the search
      */
     private boolean checkSearchAsWithEntryACI( String uid, String password, SearchControls cons, Name rdn, String aci,
-        int resultSetSz ) throws NamingException
+        int resultSetSz ) throws Exception
     {
         if ( cons == null )
         {
@@ -336,7 +336,7 @@
      * these utility functions
      */
     @Test
-    public void testAddSearchData() throws NamingException
+    public void testAddSearchData() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Name base = addSearchData( new LdapDN(), 3, 10 );
@@ -375,7 +375,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantAdministrators() throws NamingException
+    public void testGrantAdministrators() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -409,7 +409,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantSearchByName() throws NamingException
+    public void testGrantSearchByName() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -436,7 +436,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantSearchByNameUserDnCase() throws NamingException
+    public void testGrantSearchByNameUserDnCase() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -462,7 +462,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantSearchBySubtree() throws NamingException
+    public void testGrantSearchBySubtree() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -488,7 +488,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testGrantSearchAllUsers() throws NamingException
+    public void testGrantSearchAllUsers() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -519,7 +519,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testSelectiveGrantsAllUsers() throws NamingException
+    public void testSelectiveGrantsAllUsers() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -550,7 +550,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testHidingAttributes() throws NamingException
+    public void testHidingAttributes() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -608,7 +608,7 @@
      * @throws javax.naming.NamingException if the test encounters an error
      */
     @Test
-    public void testHidingAttributeValues() throws NamingException
+    public void testHidingAttributeValues() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -672,7 +672,7 @@
      * @throws NamingException if the test is broken
      */
     @Test
-    public void testPerscriptiveGrantWithEntryDenial() throws NamingException
+    public void testPerscriptiveGrantWithEntryDenial() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -716,7 +716,7 @@
      * @throws NamingException if the test is broken
      */
     @Test
-    public void testPerscriptiveGrantWithEntryDenialWithPrecidence() throws NamingException
+    public void testPerscriptiveGrantWithEntryDenialWithPrecidence() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -773,7 +773,7 @@
      * @return the single search result if access is allowed or null
      * @throws NamingException if the search fails w/ exception other than no permission
      */
-    private SearchResult checkCanSearhSubentryAs( String uid, String password, Name rdn ) throws NamingException
+    private SearchResult checkCanSearhSubentryAs( String uid, String password, Name rdn ) throws Exception
     {
         DirContext userCtx = getContextAs( new LdapDN( "uid=" + uid + ",ou=users,ou=system" ), password );
         SearchControls cons = new SearchControls();
@@ -808,7 +808,7 @@
 
 
     @Test
-    public void testSubentryAccess() throws NamingException
+    public void testSubentryAccess() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );
@@ -834,7 +834,7 @@
 
 
     @Test
-    public void testGetMatchedName() throws NamingException
+    public void testGetMatchedName() throws Exception
     {
         // create the non-admin user
         createUser( "billyd", "billyd" );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Wed May 21 15:05:21 2008
@@ -65,7 +65,7 @@
 //    service.setShutdownHookEnabled( false );
 
     @Test
-    public void testManyTagsPersistenceAcrossRestarts() throws NamingException, InterruptedException
+    public void testManyTagsPersistenceAcrossRestarts() throws Exception, InterruptedException
     {
         LdapContext sysRoot = getSystemContext( service );
         long revision = service.getChangeLog().getCurrentRevision();
@@ -136,7 +136,7 @@
 
 
     @Test
-    public void testTagPersistenceAcrossRestarts() throws NamingException, InterruptedException
+    public void testTagPersistenceAcrossRestarts() throws Exception, InterruptedException
     {
         LdapContext sysRoot = getSystemContext( service );
         long revision = service.getChangeLog().getCurrentRevision();
@@ -165,7 +165,7 @@
 
 
     @Test
-    public void testRevertAddOperations() throws NamingException
+    public void testRevertAddOperations() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Tag t0 = service.getChangeLog().tag();
@@ -189,7 +189,7 @@
 
 
     @Test
-    public void testRevertAddAndDeleteOperations() throws NamingException
+    public void testRevertAddAndDeleteOperations() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Tag t0 = service.getChangeLog().tag();
@@ -213,7 +213,7 @@
 
 
     @Test
-    public void testRevertDeleteOperations() throws NamingException
+    public void testRevertDeleteOperations() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         AttributesImpl attrs = new AttributesImpl( "objectClass", "organizationalUnit", true );
@@ -235,7 +235,7 @@
 
 
     @Test
-    public void testRevertRenameOperations() throws NamingException
+    public void testRevertRenameOperations() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         AttributesImpl attrs = new AttributesImpl( "objectClass", "organizationalUnit", true );
@@ -259,7 +259,7 @@
 
 
     @Test
-    public void testRevertModifyOperations() throws NamingException
+    public void testRevertModifyOperations() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         AttributesImpl attrs = new AttributesImpl( "objectClass", "organizationalUnit", true );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Wed May 21 15:05:21 2008
@@ -119,7 +119,7 @@
     }
 
 
-    public void addAdministrativeRole( String role ) throws NamingException
+    public void addAdministrativeRole( String role ) throws Exception
     {
         Attribute attribute = new AttributeImpl( "administrativeRole" );
         attribute.add( role );
@@ -128,7 +128,7 @@
     }
 
 
-    public Map<String, Attributes> getAllEntries() throws NamingException
+    public Map<String, Attributes> getAllEntries() throws Exception
     {
         Map<String, Attributes> resultMap = new HashMap<String, Attributes>();
         SearchControls controls = new SearchControls();
@@ -146,7 +146,7 @@
     }
 
 
-    public SearchResult getEntry( String name ) throws NamingException
+    public SearchResult getEntry( String name ) throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
@@ -164,7 +164,7 @@
     }
 
 
-    public Map<String, Attributes> getAllEntriesRestrictAttributes() throws NamingException
+    public Map<String, Attributes> getAllEntriesRestrictAttributes() throws Exception
     {
         Map<String, Attributes> resultMap = new HashMap<String, Attributes>();
         SearchControls controls = new SearchControls();
@@ -181,7 +181,7 @@
     }
     
     
-    public Map<String, Attributes> getAllEntriesCollectiveAttributesOnly() throws NamingException
+    public Map<String, Attributes> getAllEntriesCollectiveAttributesOnly() throws Exception
     {
         Map<String, Attributes> resultMap = new HashMap<String, Attributes>();
         SearchControls controls = new SearchControls();
@@ -474,7 +474,7 @@
             getSystemContext( service ).createSubcontext( "cn=Ersin Er", entry );
             fail( "Entry addition with collective attribute should have failed." );
         }
-        catch ( NamingException e )
+        catch ( Exception e )
         {
             // Intended execution point
         }
@@ -482,7 +482,7 @@
     
     
     @Test
-    public void testModifyRegularEntryAddingCollectiveAttribute() throws NamingException
+    public void testModifyRegularEntryAddingCollectiveAttribute() throws Exception
     {
         Attributes entry = getTestEntry( "Ersin Er" );
         getSystemContext( service ).createSubcontext( "cn=Ersin Er", entry );
@@ -501,7 +501,7 @@
     
     
     @Test
-    public void testModifyRegularEntryAddingCollectiveAttribute2() throws NamingException
+    public void testModifyRegularEntryAddingCollectiveAttribute2() throws Exception
     {
         Attributes entry = getTestEntry( "Ersin Er" );
         getSystemContext( service ).createSubcontext( "cn=Ersin Er", entry );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java Wed May 21 15:05:21 2008
@@ -63,7 +63,7 @@
      * @throws NamingException on failures
      */
     @Test
-    public void testRemoveNamingListener() throws NamingException
+    public void testRemoveNamingListener() throws Exception
     {
         TestListener listener = new TestListener();
         EventDirContext ctx = ( EventDirContext ) getSystemContext( service ).lookup( "" );
@@ -103,7 +103,7 @@
      * @throws NamingException on failures
      */
     @Test
-    public void testContextClose() throws NamingException
+    public void testContextClose() throws Exception
     {
         TestListener listener = new TestListener();
         EventDirContext ctx = ( EventDirContext ) getSystemContext( service ).lookup( "" );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Wed May 21 15:05:21 2008
@@ -62,7 +62,7 @@
     public static DirectoryService service;
 
 
-    private DirContext createSubContext( String type, String value ) throws NamingException
+    private DirContext createSubContext( String type, String value ) throws Exception
     {
         return createSubContext( getSystemContext( service ), type, value );
     }
@@ -95,7 +95,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testFailSearchNoSuchObject() throws NamingException
+    public void testFailSearchNoSuchObject() throws Exception
     {
         SearchControls ctls = new SearchControls();
         try
@@ -118,7 +118,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testSearchControl() throws NamingException
+    public void testSearchControl() throws Exception
     {
         SearchControls ctls = new SearchControls();
         NamingEnumeration<SearchResult> list = getSystemContext( service ).search( "ou=users", "(objectClass=*)", ctls );
@@ -144,7 +144,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testFailMoveEntryAlreadyExists() throws NamingException
+    public void testFailMoveEntryAlreadyExists() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -194,7 +194,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testFailMoveNoSuchObject() throws NamingException
+    public void testFailMoveNoSuchObject() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -231,7 +231,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testMoveControl() throws NamingException
+    public void testMoveControl() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -262,7 +262,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testFailModifyRdnEntryAlreadyExists() throws NamingException
+    public void testFailModifyRdnEntryAlreadyExists() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -285,7 +285,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testFailModifyRdnNoSuchObject() throws NamingException
+    public void testFailModifyRdnNoSuchObject() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -306,10 +306,10 @@
      * Modify operation control to test if normal modify operations occur
      * correctly.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testModifyRdnControl() throws NamingException
+    public void testModifyRdnControl() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -337,10 +337,10 @@
     /**
      * Test modify operation failure when the object modified is non-existant.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testFailModifyNoSuchObject() throws NamingException
+    public void testFailModifyNoSuchObject() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -381,10 +381,10 @@
      * Modify operation control to test if normal modify operations occur
      * correctly.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testModifyControl() throws NamingException
+    public void testModifyControl() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -418,10 +418,10 @@
     /**
      * Test lookup operation failure when the object looked up is non-existant.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testFailLookupNoSuchObject() throws NamingException
+    public void testFailLookupNoSuchObject() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -442,10 +442,10 @@
      * Lookup operation control to test if normal lookup operations occur
      * correctly.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testLookupControl() throws NamingException
+    public void testLookupControl() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -463,10 +463,10 @@
     /**
      * Test list operation failure when the base searched is non-existant.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testFailListNoSuchObject() throws NamingException
+    public void testFailListNoSuchObject() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -486,10 +486,10 @@
     /**
      * List operation control to test if normal list operations occur correctly.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testListControl() throws NamingException
+    public void testListControl() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -515,10 +515,10 @@
      * Tests for add operation failure when the parent of the entry to add does
      * not exist.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testFailAddOnAlias() throws NamingException
+    public void testFailAddOnAlias() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -548,10 +548,10 @@
      * Tests for add operation failure when the parent of the entry to add does
      * not exist.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testFailAddNoSuchEntry() throws NamingException
+    public void testFailAddNoSuchEntry() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -570,10 +570,10 @@
     /**
      * Tests for add operation failure when the entry to add already exists.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testFailAddEntryAlreadyExists() throws NamingException
+    public void testFailAddEntryAlreadyExists() throws Exception
     {
         createSubContext( "ou", "blah");
 
@@ -593,10 +593,10 @@
     /**
      * Add operation control to test if normal add operations occur correctly.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testAddControl() throws NamingException
+    public void testAddControl() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -615,10 +615,10 @@
     /**
      * Tests for delete failure when the entry to be deleted has child entires.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testFailDeleteNotAllowedOnNonLeaf() throws NamingException
+    public void testFailDeleteNotAllowedOnNonLeaf() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -642,10 +642,10 @@
      * Tests delete to make sure it fails when we try to delete an entry that
      * does not exist.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testFailDeleteNoSuchObject() throws NamingException
+    public void testFailDeleteNoSuchObject() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -665,10 +665,10 @@
     /**
      * Delete operation control to test if normal delete operations occur.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testDeleteControl() throws NamingException
+    public void testDeleteControl() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java Wed May 21 15:05:21 2008
@@ -29,11 +29,9 @@
 import org.apache.directory.shared.ldap.message.AttributesImpl;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.naming.NamingEnumeration;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapContext;

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java Wed May 21 15:05:21 2008
@@ -81,7 +81,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testMultiValuedRdn() throws NamingException
+    public void testMultiValuedRdn() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -116,7 +116,7 @@
      * @throws javax.naming.NamingException if there are failures
      */
     @Test
-    public void testCreateContexts() throws NamingException
+    public void testCreateContexts() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -217,7 +217,7 @@
 
 
     @Test
-    public void testFailCreateExisting() throws NamingException
+    public void testFailCreateExisting() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -298,7 +298,7 @@
      * @throws javax.naming.NamingException if there are failures
      */
     @Test
-    public void testCreateContextWithBasicAttributesCaseSensitive() throws NamingException
+    public void testCreateContextWithBasicAttributesCaseSensitive() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java Wed May 21 15:05:21 2008
@@ -61,7 +61,7 @@
      *
      * @throws NamingException on error
      */
-    protected void createData() throws NamingException
+    protected void createData() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759IT.java Wed May 21 15:05:21 2008
@@ -59,7 +59,7 @@
      *
      * @throws NamingException on errors
      */
-    protected void createData() throws NamingException
+    protected void createData() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -163,7 +163,7 @@
 
 
     @Test
-    public void testSearchBadDN() throws NamingException
+    public void testSearchBadDN() throws Exception
     {
         createData();
         LdapContext sysRoot = getSystemContext( service );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java Wed May 21 15:05:21 2008
@@ -87,7 +87,7 @@
      *
      * @throws NamingException on error
      */
-    protected void createData() throws NamingException
+    protected void createData() throws Exception
     {
         Attributes entry = this.getTestEntryAttributes();
         getSystemContext( service ).createSubcontext("cn=test", entry);
@@ -101,7 +101,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testDefect1a() throws NamingException 
+    public void testDefect1a() throws Exception 
     {
         createData();
         Hashtable<String,Object> env = new Hashtable<String,Object>();
@@ -130,7 +130,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testDefect1b() throws NamingException
+    public void testDefect1b() throws Exception
     {
         createData();
         Hashtable<String,Object> env = new Hashtable<String,Object>();
@@ -161,7 +161,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testDefect2() throws NamingException
+    public void testDefect2() throws Exception
     {
         createData();
         Hashtable<String,Object> env = new Hashtable<String,Object>();
@@ -212,7 +212,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testDefect3() throws NamingException
+    public void testDefect3() throws Exception
     {
         createData();
         Hashtable<String,Object> env = new Hashtable<String,Object>();

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java Wed May 21 15:05:21 2008
@@ -57,7 +57,7 @@
      *
      * @throws NamingException on error
      */
-    public void createEntries() throws NamingException
+    public void createEntries() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -164,7 +164,7 @@
      * @throws NamingException if there are failures
      */
     @Test
-    public void testDestroyContext() throws NamingException
+    public void testDestroyContext() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 



Mime
View raw message