directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r951179 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ apacheds/trunk/core-api/src/main/java/org/apache/directory/se...
Date Thu, 03 Jun 2010 21:53:09 GMT
Author: elecharny
Date: Thu Jun  3 21:53:08 2010
New Revision: 951179

URL: http://svn.apache.org/viewvc?rev=951179&view=rev
Log:
o Removed some NamingException, replaced by LdapException
o Removed commented code

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableChangeLogStore.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java
    directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
    directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/OperationAbandonedException.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Thu Jun  3 21:53:08 2010
@@ -67,7 +67,7 @@ public interface DirectoryService extend
      * @throws UnsupportedOperationException if this feature is not supported by the
      * change log
      */
-    long revert( long revision ) throws Exception;
+    long revert( long revision ) throws LdapException;
 
 
     /**
@@ -84,7 +84,7 @@ public interface DirectoryService extend
      * @throws UnsupportedOperationException if this feature is not supported by the
      * change log
      */
-    long revert() throws Exception;
+    long revert() throws LdapException;
 
 
     PartitionNexus getPartitionNexus();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java Thu Jun  3 21:53:08 2010
@@ -72,7 +72,7 @@ public interface ChangeLog
      * @return the current revision
      * @throws Exception if there is a problem accessing this information
      */
-    long getCurrentRevision() throws Exception;
+    long getCurrentRevision() throws LdapException;
 
 
     /**
@@ -201,7 +201,7 @@ public interface ChangeLog
      * @return The latest tag
      * @throws Exception if there is a problem taking the latest tag
      */
-    Tag getLatest() throws Exception;
+    Tag getLatest() throws LdapException;
 
     /**
      * Initialize the ChangeLog system.

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java Thu Jun  3 21:53:08 2010
@@ -22,9 +22,10 @@ package org.apache.directory.server.core
 
 import java.util.List;
 
-import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 
 
@@ -151,7 +152,7 @@ public interface ChangeLogStore 
      * @throws IllegalArgumentException if the revision is out of range (less than 0
      * and greater than the current revision)
      */
-    Cursor<ChangeLogEvent> findAfter( long revision ) throws Exception;
+    Cursor<ChangeLogEvent> findAfter( long revision ) throws LdapException;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableChangeLogStore.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableChangeLogStore.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/TaggableChangeLogStore.java Thu Jun  3 21:53:08 2010
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.server.core.changelog;
 
+import org.apache.directory.shared.ldap.exception.LdapException;
+
 
 
 /**
@@ -67,7 +69,7 @@ public interface TaggableChangeLogStore 
      * tags have been created
      * @throws Exception on failures to access the tag store
      */
-    Tag getLatest() throws Exception;
+    Tag getLatest() throws LdapException;
     
     
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java Thu Jun  3 21:53:08 2010
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.schema.registries.synchronizers;
 
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
@@ -105,13 +103,13 @@ public class MatchingRuleUseSynchronizer
     }
 
 
-    public void add( MatchingRuleUse mru ) throws NamingException
+    public void add( MatchingRuleUse mru ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
 
 
-    public void delete( MatchingRuleUse mru, boolean cascade ) throws NamingException
+    public void delete( MatchingRuleUse mru, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java Thu Jun  3 21:53:08 2010
@@ -22,8 +22,6 @@ package org.apache.directory.server.core
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
@@ -52,7 +50,7 @@ public class MockCursor implements Curso
     }
 
 
-    public void close() throws NamingException
+    public void close() throws Exception
     {
         ii = count;
     }

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java Thu Jun  3 21:53:08 2010
@@ -25,7 +25,6 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Set;
 
-import javax.naming.NamingException;
 import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.server.core.changelog.ChangeLog;
@@ -66,13 +65,13 @@ public class MockDirectoryService implem
     }
 
 
-    public long revert( long revision ) throws NamingException
+    public long revert( long revision ) throws LdapException
     {
         return 0;
     }
 
 
-    public long revert() throws NamingException
+    public long revert() throws LdapException
     {
         return 0;
     }
@@ -90,12 +89,12 @@ public class MockDirectoryService implem
     }
 
 
-    public void addPartition( Partition partition ) throws NamingException
+    public void addPartition( Partition partition ) throws LdapException
     {
     }
 
 
-    public void removePartition( Partition partition ) throws NamingException
+    public void removePartition( Partition partition ) throws LdapException
     {
     }
 
@@ -134,17 +133,17 @@ public class MockDirectoryService implem
     }
 
 
-    public void startup() throws NamingException
+    public void startup() throws LdapException
     {
     }
 
 
-    public void shutdown() throws NamingException
+    public void shutdown() throws LdapException
     {
     }
 
 
-    public void sync() throws NamingException
+    public void sync() throws LdapException
     {
     }
 
@@ -155,7 +154,7 @@ public class MockDirectoryService implem
     }
 
 
-    public LdapContext getJndiContext() throws NamingException
+    public LdapContext getJndiContext() throws LdapException
     {
         return null;
     }
@@ -357,13 +356,13 @@ public class MockDirectoryService implem
     }
 
 
-    public CoreSession getSession() throws Exception
+    public CoreSession getSession() throws LdapException
     {
         return null;
     }
 
 
-    public CoreSession getSession( LdapPrincipal principal ) throws Exception
+    public CoreSession getSession( LdapPrincipal principal ) throws LdapException
     {
         return null;
     }
@@ -376,7 +375,7 @@ public class MockDirectoryService implem
 
     
     public CoreSession getSession( DN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
-        throws Exception
+        throws LdapException
     {
         return null;
     }

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java Thu Jun  3 21:53:08 2010
@@ -22,8 +22,6 @@ package org.apache.directory.server.core
 import java.util.Collection;
 import java.util.List;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
@@ -52,13 +50,13 @@ public class MockOperation implements Op
 
 
     public EntryFilteringCursor search( SearchOperationContext opContext )
-        throws NamingException
+        throws LdapException
     {
         return new BaseEntryFilteringCursor( new MockCursor( count ), opContext );
     }
 
 
-    public EntryFilteringCursor search( SearchOperationContext opContext, Collection<String> bypass ) throws NamingException
+    public EntryFilteringCursor search( SearchOperationContext opContext, Collection<String> bypass ) throws LdapException
     {
         return new BaseEntryFilteringCursor( new MockCursor( count ), opContext );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Thu Jun  3 21:53:08 2010
@@ -86,6 +86,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.apache.directory.shared.ldap.exception.LdapOperationException;
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
@@ -694,7 +695,7 @@ public class DefaultDirectoryService imp
     }
 
 
-    public long revert() throws Exception
+    public long revert() throws LdapException
     {
         if ( changeLog == null || ! changeLog.isEnabled() )
         {
@@ -723,7 +724,7 @@ public class DefaultDirectoryService imp
     /**
      * We handle the ModDN/ModRDN operation for the revert here. 
      */
-    private void moddn( DN oldDn, DN newDn, boolean delOldRdn ) throws Exception
+    private void moddn( DN oldDn, DN newDn, boolean delOldRdn ) throws LdapException
     {
         if ( oldDn.size() == 0 )
         {
@@ -769,7 +770,7 @@ public class DefaultDirectoryService imp
     }
     
     
-    public long revert( long revision ) throws Exception
+    public long revert( long revision ) throws LdapException
     {
         if ( changeLog == null || ! changeLog.isEnabled() )
         {
@@ -856,6 +857,10 @@ public class DefaultDirectoryService imp
             LOG.error( message );
             throw new LdapException( message );
         }
+        catch ( Exception e )
+        {
+            throw new LdapOperationException( e.getMessage() );
+        }
 
         return changeLog.getCurrentRevision();
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java Thu Jun  3 21:53:08 2010
@@ -112,7 +112,7 @@ public class DefaultChangeLog implements
     /**
      * {@inheritDoc}
      */
-    public long getCurrentRevision() throws Exception
+    public long getCurrentRevision() throws LdapException
     {
         synchronized( store )
         {
@@ -292,7 +292,7 @@ public class DefaultChangeLog implements
     /**
      * {@inheritDoc}
      */
-    public Tag getLatest() throws Exception
+    public Tag getLatest() throws LdapException
     {
         if ( latest != null )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Thu Jun  3 21:53:08 2010
@@ -40,6 +40,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.ListCursor;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.util.DateUtils;
 
@@ -505,7 +506,7 @@ public class MemoryChangeLogStore implem
     }
 
 
-    public Cursor<ChangeLogEvent> findAfter( long revision ) throws Exception
+    public Cursor<ChangeLogEvent> findAfter( long revision ) throws LdapException
     {
         return new ListCursor<ChangeLogEvent>( ( int ) revision, events );
     }
@@ -517,7 +518,7 @@ public class MemoryChangeLogStore implem
     }
 
 
-    public Tag getLatest() throws Exception
+    public Tag getLatest() throws LdapException
     {
         return latest;
     }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Thu Jun  3 21:53:08 2010
@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import javax.naming.NamingException;
 import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.server.core.CoreSession;
@@ -494,13 +493,13 @@ public class MaxImmSubFilterTest
         }
 
 
-        public long revert( long revision ) throws NamingException
+        public long revert( long revision ) throws LdapException
         {
             return 0;
         }
 
 
-        public long revert() throws NamingException
+        public long revert() throws LdapException
         {
             return 0;
         }
@@ -518,12 +517,12 @@ public class MaxImmSubFilterTest
         }
 
 
-        public void addPartition( Partition partition ) throws NamingException
+        public void addPartition( Partition partition ) throws LdapException
         {
         }
 
 
-        public void removePartition( Partition partition ) throws NamingException
+        public void removePartition( Partition partition ) throws LdapException
         {
         }
 
@@ -562,17 +561,17 @@ public class MaxImmSubFilterTest
         }
 
 
-        public void startup() throws NamingException
+        public void startup() throws LdapException
         {
         }
 
 
-        public void shutdown() throws NamingException
+        public void shutdown() throws LdapException
         {
         }
 
 
-        public void sync() throws NamingException
+        public void sync() throws LdapException
         {
         }
 
@@ -583,7 +582,7 @@ public class MaxImmSubFilterTest
         }
 
 
-        public LdapContext getJndiContext() throws NamingException
+        public LdapContext getJndiContext() throws LdapException
         {
             return null;
         }
@@ -1027,7 +1026,7 @@ public class MaxImmSubFilterTest
         }
 
 
-        public void close() throws NamingException
+        public void close() throws LdapException
         {
             ii = count;
         }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Thu Jun  3 21:53:08 2010
@@ -30,7 +30,6 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Set;
 
-import javax.naming.NamingException;
 import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.server.core.CoreSession;
@@ -282,13 +281,13 @@ public class InterceptorChainTest
         }
 
 
-        public long revert( long revision ) throws NamingException
+        public long revert( long revision ) throws LdapException
         {
             return 0;
         }
 
 
-        public long revert() throws NamingException
+        public long revert() throws LdapException
         {
             return 0;
         }
@@ -306,12 +305,12 @@ public class InterceptorChainTest
         }
 
 
-        public void addPartition( Partition partition ) throws NamingException
+        public void addPartition( Partition partition ) throws LdapException
         {
         }
 
 
-        public void removePartition( Partition partition ) throws NamingException
+        public void removePartition( Partition partition ) throws LdapException
         {
         }
 
@@ -350,17 +349,17 @@ public class InterceptorChainTest
         }
 
 
-        public void startup() throws NamingException
+        public void startup() throws LdapException
         {
         }
 
 
-        public void shutdown() throws NamingException
+        public void shutdown() throws LdapException
         {
         }
 
 
-        public void sync() throws NamingException
+        public void sync() throws LdapException
         {
         }
 
@@ -371,7 +370,7 @@ public class InterceptorChainTest
         }
 
 
-        public LdapContext getJndiContext() throws NamingException
+        public LdapContext getJndiContext() throws LdapException
         {
             return null;
         }
@@ -383,26 +382,26 @@ public class InterceptorChainTest
         }
 
 
-        public LdapContext getJndiContext( String baseName ) throws NamingException
+        public LdapContext getJndiContext( String baseName ) throws LdapException
         {
             return null;
         }
 
 
-        public LdapContext getJndiContext( LdapPrincipal principal ) throws NamingException
+        public LdapContext getJndiContext( LdapPrincipal principal ) throws LdapException
         {
             return null;
         }
 
 
-        public LdapContext getJndiContext( LdapPrincipal principal, String dn ) throws NamingException
+        public LdapContext getJndiContext( LdapPrincipal principal, String dn ) throws LdapException
         {
             return null;
         }
 
 
         public LdapContext getJndiContext( DN principalDn, String principal, byte[] credential,
-            String authentication, String baseName ) throws NamingException
+            String authentication, String baseName ) throws LdapException
         {
             return null;
         }
@@ -591,13 +590,13 @@ public class InterceptorChainTest
         }
 
 
-        public CoreSession getSession() throws Exception
+        public CoreSession getSession() throws LdapException
         {
             return null;
         }
 
 
-        public CoreSession getSession( LdapPrincipal principal ) throws Exception
+        public CoreSession getSession( LdapPrincipal principal ) throws LdapException
         {
             return null;
         }
@@ -610,7 +609,7 @@ public class InterceptorChainTest
 
 
         public CoreSession getSession( DN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
-            throws Exception
+            throws LdapException
         {
             return null;
         }

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Thu Jun  3 21:53:08 2010
@@ -30,8 +30,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.authn.AuthenticationInterceptor;
 import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
 import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
@@ -207,7 +205,7 @@ public class KeyDerivationInterceptor ex
      *
      * @param modContext
      * @param subContext
-     * @throws NamingException
+     * @throws LdapException
      */
     void detectPasswordModification( ModifyOperationContext modContext, ModifySubContext subContext )
         throws LdapException
@@ -281,7 +279,7 @@ public class KeyDerivationInterceptor ex
      *
      * @param modContext
      * @param subContext
-     * @throws NamingException
+     * @throws LdapException
      */
     void lookupPrincipalAttributes( ModifyOperationContext modContext, ModifySubContext subContext )
         throws LdapException

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java Thu Jun  3 21:53:08 2010
@@ -22,8 +22,6 @@ package org.apache.directory.server.core
 
 import java.util.Iterator;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.schema.LdapComparator;
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
@@ -61,7 +59,7 @@ class MockComparatorRegistry extends Def
     }
 
 
-    public void register( LdapComparatorDescription description, LdapComparator<?> comparator ) throws NamingException
+    public void register( LdapComparatorDescription description, LdapComparator<?> comparator ) throws LdapException
     {
     }
 

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java Thu Jun  3 21:53:08 2010
@@ -20,6 +20,7 @@
 package org.apache.directory.server.kerberos.shared.store;
 
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,9 +32,10 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime;
 import org.apache.directory.server.kerberos.shared.messages.value.SamType;
-import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.exception.LdapException;
 
 
 /**
@@ -275,10 +277,10 @@ public class PrincipalStoreEntryModifier
      *
      * @param krb5key
      * @return The map of encryption types to encryption keys.
-     * @throws NamingException
+     * @throws LdapException
      * @throws IOException
      */
-    public Map<EncryptionType, EncryptionKey> reconstituteKeyMap( EntryAttribute krb5key ) throws Exception
+    public Map<EncryptionType, EncryptionKey> reconstituteKeyMap( EntryAttribute krb5key ) throws IOException, LdapException
     {
         Map<EncryptionType, EncryptionKey> map = new HashMap<EncryptionType, EncryptionKey>();
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Thu Jun  3 21:53:08 2010
@@ -20,8 +20,6 @@
 package org.apache.directory.server.ldap.handlers;
 
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.event.DirectoryListener;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.ChangeOperationContext;
@@ -35,6 +33,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControl;
 import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchControl;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.AbandonListener;
 import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
 import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
@@ -74,7 +73,7 @@ public class PersistentSearchListener im
     }
 
 
-    public void abandon() throws NamingException
+    public void abandon() throws LdapException
     {
         // must abandon the operation 
         session.getCoreSession().getDirectoryService().getEventService().removeListener( this );
@@ -100,7 +99,7 @@ public class PersistentSearchListener im
         {
             abandon();
         }
-        catch ( NamingException e )
+        catch ( LdapException e )
         {
             LOG.error( I18n.err( I18n.ERR_164 ), e );
         }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java Thu Jun  3 21:53:08 2010
@@ -24,12 +24,12 @@ import java.security.KeyStore;
 import java.security.SecureRandom;
 import java.security.Security;
 
-import javax.naming.NamingException;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
 import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
 import org.apache.mina.core.filterchain.IoFilterChainBuilder;
@@ -46,7 +46,7 @@ import org.apache.mina.filter.ssl.SslFil
  */
 public class LdapsInitializer
 {
-    public static IoFilterChainBuilder init( KeyStore ks, String certificatePassord ) throws NamingException
+    public static IoFilterChainBuilder init( KeyStore ks, String certificatePassord ) throws LdapException
     {
         SSLContext sslCtx;
         try
@@ -77,7 +77,7 @@ public class LdapsInitializer
         }
         catch ( Exception e )
         {
-            throw ( NamingException ) new NamingException( I18n.err( I18n.ERR_683 ) ).initCause( e );
+            throw new LdapException( I18n.err( I18n.ERR_683 ), e );
         }
 
         DefaultIoFilterChainBuilder chain = new DefaultIoFilterChainBuilder();

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java Thu Jun  3 21:53:08 2010
@@ -27,8 +27,6 @@ import java.io.InputStream;
 import java.util.Collections;
 import java.util.List;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
@@ -149,7 +147,7 @@ public class LdifFileLoader
             {
                 accept &= ( filters.get( ii ) ).filter( ldif, dn, entry, coreSession );
             }
-            catch ( NamingException e )
+            catch ( LdapException e )
             {
                 log.warn( "filter " + filters.get( ii ) + " was bypassed due to failures", e );
             }

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java Thu Jun  3 21:53:08 2010
@@ -20,14 +20,13 @@
 package org.apache.directory.server.protocol.shared.store;
 
 
-import javax.naming.NamingException;
+import java.io.File;
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 
-import java.io.File;
-
 
 /**
  * A filter interface for the LDIF loader.
@@ -45,7 +44,7 @@ public interface LdifLoadFilter
      * @param entry the entry attributes within the LDIF file
      * @param coreSession session to be used for loading the entry into the DIT
      * @return true if the entry will be created in the DIT, false if it is to be skipped
-     * @throws NamingException
+     * @throws LdapException
      */
-    boolean filter( File file, DN dn, Entry entry, CoreSession coreSession ) throws NamingException;
+    boolean filter( File file, DN dn, Entry entry, CoreSession coreSession ) throws LdapException;
 }

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java Thu Jun  3 21:53:08 2010
@@ -23,7 +23,6 @@ package org.apache.directory.server.oper
 import static org.junit.Assert.assertEquals;
 
 import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
@@ -34,6 +33,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.integ.ServerIntegrationUtils;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -84,7 +84,7 @@ public class MatchingRuleCompareIT exten
     /**
      * Compare with caseIgnoreMatch matching rule.
      * 
-     * @throws NamingException
+     * @throws LdapException
      */
     @Test
     public void testCaseIgnoreMatch() throws Exception
@@ -120,78 +120,9 @@ public class MatchingRuleCompareIT exten
     //
 
     /**
-     * Compare with telephoneNumberMatch matching rule.
-     * 
-     * @throws NamingException
-     */
-
-    // Comment this out until we have the telephone number match working.
-    //    public void testTelephoneNumberMatch() throws NamingException
-    //    {
-    //        // Setting up search controls for compare op
-    //        SearchControls ctls = new SearchControls();
-    //        ctls.setReturningAttributes(new String[] {}); // no attributes
-    //        ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
-    //
-    //        String[] values = { "", "1234567890abc", "   1234567890 A B C", "123 456 7890 abc", "123-456-7890 abC",
-    //                "123456-7890 A bc" };
-    //        boolean[] expected = { false, true, true, true, true, true };
-    //
-    //        for (int i = 0; i < values.length; i++) {
-    //            String value = values[i];
-    //
-    //            NamingEnumeration enumeration = ctx.search(PERSON_RDN, "telephoneNumber={0}", new String[] { value }, ctls);
-    //            boolean result = enumeration.hasMore();
-    //
-    //            assertEquals("compare '" + PERSON_TELEPHONE + "' with '" + value + "'", expected[i], result);
-    //
-    //            enumeration.close();
-    //        }
-    //    }
-    /**
-     * Compare with octetStringMatch matching rule.
-     * 
-     * @throws NamingException
-     */
-
-// Cannot search the directory using binary attributes.  I don't know if this 
-// is valid according to specifications but this is the case with respect to apacheds
-// and userPassword is a binary attribute type.  This is why we get class cast 
-// exceptions for this search which fails.  To make this succeed some simple changes
-// are needed.
-    
-//    public void testOctetStringMatch() throws NamingException
-//    {
-//        // Setting up search controls for compare op
-//        SearchControls ctls = new SearchControls();
-//        ctls.setReturningAttributes( new String[]
-//            {} ); // no attributes
-//        ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
-//
-//        String[] values =
-//            { "", PERSON_PWD, PERSON_PWD.toUpperCase(), PERSON_PWD.toLowerCase(), PERSON_PWD + "X" };
-//        boolean[] expected =
-//            { false, true, false, false, false };
-//
-//        for ( int i = 0; i < values.length; i++ )
-//        {
-//            String value = values[i];
-//
-//            NamingEnumeration enumeration = ctx.search( PERSON_RDN, "userPassword={0}", new String[]
-//                { value }, ctls );
-//            boolean result = enumeration.hasMore();
-//
-//            assertEquals( "compare '" + PERSON_PWD + "' with '" + value + "'", expected[i], result );
-//
-//            enumeration.close();
-//        }
-//    }
-
-
-    /**
      * Compare with distinguishedNameMatch matching rule.
      * 
-     * @throws NamingException
+     * @throws LdapException
      */
     @Test
     public void testDistinguishedNameMatch() throws Exception

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java Thu Jun  3 21:53:08 2010
@@ -19,11 +19,10 @@
  */
 package org.apache.directory.server.operations.extended;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
@@ -45,7 +44,7 @@ public class DITUtilitiesSP
      * @param ctx an LDAP context to perform operations on
      * @param rdn ctx relative name of the entry which is root of
      *        the subtree to be deleted
-     * @throws NamingException
+     * @throws LdapException
      */
     public static void deleteSubtree( CoreSession session, DN rdn ) throws Exception
     {

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java Thu Jun  3 21:53:08 2010
@@ -29,7 +29,6 @@ import static org.junit.Assert.fail;
 
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
 import javax.naming.NoPermissionException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
@@ -43,6 +42,7 @@ import org.apache.directory.server.annot
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -722,7 +722,7 @@ public class ModifyRdnIT extends Abstrac
      * - Keep old Rdn
      * - Attributes: cn, sn, description, telephoneNumber must exist 
      * 
-     * @throws NamingException
+     * @throws LdapException
      */
     @Test
     public void testModifyMultiValuedRdnVariant5() throws Exception
@@ -768,7 +768,7 @@ public class ModifyRdnIT extends Abstrac
      * - Delete old Rdn
      * - Must fail with schema violation, cn cannot be deleted
      * 
-     * @throws NamingException
+     * @throws LdapException
      */
     @Test
     public void testModifyMultiValuedRdnVariant6() throws Exception
@@ -828,7 +828,7 @@ public class ModifyRdnIT extends Abstrac
      * - Keep old Rdn
      * - Attributes: cn, sn, description must exist 
      * 
-     * @throws NamingException
+     * @throws LdapException
      */
     @Test
     public void testModifyMultiValuedRdnVariant7() throws Exception
@@ -870,7 +870,7 @@ public class ModifyRdnIT extends Abstrac
      * - Delete old Rdn
      * - Must fail with schema violation, cn cannot be deleted
      * 
-     * @throws NamingException
+     * @throws LdapException
      */
     @Test
     public void testModifyMultiValuedRdnVariant8() throws Exception
@@ -927,7 +927,7 @@ public class ModifyRdnIT extends Abstrac
      * in its RDN. Must fail because an operational attribute can not be
      * deleted.
      * 
-     * @throws NamingException
+     * @throws LdapException
      */
     @Test
     public void testModifyRdnOperationalAttribute() throws Exception
@@ -972,7 +972,7 @@ public class ModifyRdnIT extends Abstrac
      * person in its RDN (objectClass=person,ou=system). Must fail because the 
      * structural object class can not be deleted.
      * 
-     * @throws NamingException
+     * @throws LdapException
      */
     @Test
     public void testModifyRdnObjectClassAttribute() throws Exception

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Thu Jun  3 21:53:08 2010
@@ -391,43 +391,6 @@ public class SearchIT extends AbstractLd
     /**
      * Search operation with a base DN which contains a BER encoded value.
      */
-    //@Test
-    /*public void testSearchBEREncodedBase() throws NamingException
-    {
-        // create additional entry
-        Attributes attributes = this.getPersonAttributes( "Ferry", "Bryan Ferry" );
-        ctx.createSubcontext( "sn=Ferry", attributes );
-
-        SearchControls sctls = new SearchControls();
-        sctls.setSearchScope( SearchControls.OBJECT_SCOPE );
-        String FILTER = "(cn=Bryan Ferry)";
-
-        // sn=Ferry with BEROctetString values
-        String base = "2.5.4.4=#4665727279";
-
-        try
-        {
-            // Check entry
-            NamingEnumeration enm = ctx.search( base, FILTER, sctls );
-            assertTrue( enm.hasMore() );
-            while ( enm.hasMore() )
-            {
-                SearchResult sr = ( SearchResult ) enm.next();
-                Attributes attrs = sr.getObject();
-                Attribute sn = attrs.get( "sn" );
-                assertNotNull( sn );
-                assertTrue( sn.contains( "Ferry" ) );
-            }
-        }
-        catch ( Exception e )
-        {
-            fail( e.getMessage() );
-        }
-    }*/
-
-    /**
-     * Search operation with a base DN which contains a BER encoded value.
-     */
     @Test
     public void testSearchWithBackslashEscapedBase() throws Exception
     {
@@ -468,7 +431,7 @@ public class SearchIT extends AbstractLd
     /**
      * Add a new attribute to a person entry.
      * 
-     * @throws NamingException
+     * @throws LdapException
      */
     @Test
     public void testSearchValue() throws Exception

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/OperationAbandonedException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/OperationAbandonedException.java?rev=951179&r1=951178&r2=951179&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/OperationAbandonedException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/exception/OperationAbandonedException.java Thu Jun  3 21:53:08 2010
@@ -20,7 +20,6 @@
 package org.apache.directory.shared.ldap.exception;
 
 
-import javax.naming.NamingException;
 
 
 /**
@@ -29,7 +28,7 @@ import javax.naming.NamingException;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class OperationAbandonedException extends NamingException
+public class OperationAbandonedException extends LdapException
 {
     /** The serial version UUID */
     static final long serialVersionUID = 1L;



Mime
View raw message