directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r658895 [2/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
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java Wed May 21 15:05:21 2008
@@ -35,7 +35,6 @@
 
 import javax.naming.NameClassPair;
 import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
 import javax.naming.ldap.LdapContext;
 import java.util.HashSet;
 
@@ -55,7 +54,7 @@
 
 
     @Test
-    public void testListSystemAsNonAdmin() throws NamingException
+    public void testListSystemAsNonAdmin() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
@@ -77,7 +76,7 @@
 
 
     @Test
-    public void testListUsersAsNonAdmin() throws NamingException
+    public void testListUsersAsNonAdmin() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
@@ -98,7 +97,7 @@
 
 
     @Test
-    public void testListSystemAsAdmin() throws NamingException
+    public void testListSystemAsAdmin() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         HashSet<String> set = new HashSet<String>();
@@ -117,7 +116,7 @@
 
 
     @Test
-    public void testListUsersAsAdmin() throws NamingException
+    public void testListUsersAsAdmin() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         HashSet<String> set = new HashSet<String>();

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Wed May 21 15:05:21 2008
@@ -87,7 +87,7 @@
             partition.setId( "apache" );
             partition.setSuffix( SUFFIX_DN );
 
-            HashSet<Index> indexedAttributes = new HashSet<Index>();
+            HashSet<Index<?, ServerEntry>> indexedAttributes = new HashSet<Index<?, ServerEntry>>();
             indexedAttributes.add( new JdbmIndex( "objectClass" ) );
             indexedAttributes.add( new JdbmIndex( "ou" ) );
             indexedAttributes.add( new JdbmIndex( "uid" ) );
@@ -109,7 +109,7 @@
 
     
     @Test
-    public void testSearch() throws NamingException
+    public void testSearch() throws Exception
     {
         LdapContext ctxRoot = getContext( "uid=admin,ou=system", service, SUFFIX_DN );
 
@@ -126,7 +126,7 @@
 
 
     @Test
-    public void testAdd() throws NamingException
+    public void testAdd() throws Exception
     {
         LdapContext ctxRoot = getContext( "uid=admin,ou=system", service, SUFFIX_DN );
 
@@ -155,7 +155,7 @@
 
 
     @Test
-    public void testModify() throws NamingException
+    public void testModify() throws Exception
     {
         LdapContext ctxRoot = getContext( "uid=admin,ou=system", service, SUFFIX_DN );
 
@@ -196,7 +196,7 @@
 
 
     @Test
-    public void testDelete() throws NamingException
+    public void testDelete() throws Exception
     {
         LdapContext ctxRoot = getContext( "uid=admin,ou=system", service, SUFFIX_DN );
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java Wed May 21 15:05:21 2008
@@ -63,7 +63,7 @@
      *
      * @throws NamingException on error
      */
-    protected void createData() throws NamingException
+    protected void createData() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
@@ -171,7 +171,7 @@
      * 
      * @throws NamingException on error
      */
-    public void testIllegalModifyAdd() throws NamingException
+    public void testIllegalModifyAdd() throws Exception
     {
         createData();
 
@@ -199,7 +199,7 @@
 
 
     @Test
-    public void testModifyOperation() throws NamingException
+    public void testModifyOperation() throws Exception
     {
         createData();
 
@@ -227,7 +227,7 @@
 
 
     @Test
-    public void testRemoveNonExistingValue() throws NamingException
+    public void testRemoveNonExistingValue() throws Exception
     {
         createData();
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java Wed May 21 15:05:21 2008
@@ -61,7 +61,7 @@
 
 
     @Test
-    public void testObjectFactory() throws NamingException
+    public void testObjectFactory() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
@@ -82,7 +82,7 @@
 
 
     @Test
-    public void testStateFactory() throws NamingException
+    public void testStateFactory() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Wed May 21 15:05:21 2008
@@ -92,7 +92,7 @@
     }
 
 
-    private void addReferralEntry() throws NamingException
+    private void addReferralEntry() throws Exception
     {
         String ref0 = "ldap://fermi:10389/ou=users,ou=system";
         String ref1 = "ldap://hertz:10389/ou=users,dc=example,dc=com";

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java Wed May 21 15:05:21 2008
@@ -73,7 +73,7 @@
      * @param sysRoot the system root to add entries to
      * @throws NamingException on errors
      */
-    protected void createData( LdapContext sysRoot ) throws NamingException
+    protected void createData( LdapContext sysRoot ) throws Exception
     {
         /*
          * create ou=testing00,ou=system
@@ -221,7 +221,7 @@
     }
 
 
-    private DirContext addNisPosixGroup( String name, int gid ) throws NamingException
+    private DirContext addNisPosixGroup( String name, int gid ) throws Exception
     {
         Attributes attrs = new AttributesImpl( "objectClass", "top", true );
         attrs.get( "objectClass" ).add( "posixGroup" );
@@ -232,7 +232,7 @@
 
 
     @Test
-    public void testSearchOneLevel() throws NamingException
+    public void testSearchOneLevel() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -260,7 +260,7 @@
 
 
     @Test
-    public void testSearchSubTreeLevel() throws NamingException
+    public void testSearchSubTreeLevel() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -290,7 +290,7 @@
 
 
     @Test
-    public void testSearchSubTreeLevelNoAttributes() throws NamingException
+    public void testSearchSubTreeLevelNoAttributes() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -321,7 +321,7 @@
 
 
     @Test
-    public void testSearchSubstringSubTreeLevel() throws NamingException
+    public void testSearchSubstringSubTreeLevel() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -360,7 +360,7 @@
 
 
     @Test
-    public void testSearchFilterArgs() throws NamingException
+    public void testSearchFilterArgs() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -388,7 +388,7 @@
 
 
     @Test
-    public void testSearchSizeLimit() throws NamingException
+    public void testSearchSizeLimit() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -421,7 +421,7 @@
 
 
     @Test
-    public void testSearchTimeLimit() throws NamingException, InterruptedException
+    public void testSearchTimeLimit() throws Exception, InterruptedException
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -692,7 +692,7 @@
 
 
     @Test
-    public void testBinaryAttributesInFilter() throws NamingException
+    public void testBinaryAttributesInFilter() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -728,7 +728,7 @@
 
 
     @Test
-    public void testSearchOperationalAttr() throws NamingException
+    public void testSearchOperationalAttr() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -761,7 +761,7 @@
 
 
     @Test
-    public void testSearchUserAttr() throws NamingException
+    public void testSearchUserAttr() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -794,7 +794,7 @@
 
 
     @Test
-    public void testSearchUserAttrAndOpAttr() throws NamingException
+    public void testSearchUserAttrAndOpAttr() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -827,7 +827,7 @@
 
 
     @Test
-    public void testSearchUserAttrAndNoAttr() throws NamingException
+    public void testSearchUserAttrAndNoAttr() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -860,7 +860,7 @@
 
 
     @Test
-    public void testSearchNoAttr() throws NamingException
+    public void testSearchNoAttr() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -893,7 +893,7 @@
 
 
     @Test
-    public void testSearchAllAttr() throws NamingException
+    public void testSearchAllAttr() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -931,7 +931,7 @@
      * @throws NamingException if there are errors
      */
     @Test
-    public void testSearchFetchNonExistingAttributeOption() throws NamingException
+    public void testSearchFetchNonExistingAttributeOption() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -969,7 +969,7 @@
      * @throws NamingException if there are errors
      */
     @Test
-    public void testSearchFetchTwiceSameAttribute() throws NamingException
+    public void testSearchFetchTwiceSameAttribute() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -1042,7 +1042,7 @@
      * @return the set of groups
      * @throws NamingException if there are problems conducting the search
      */
-    public Set<String> searchGroups( String filter, SearchControls controls ) throws NamingException
+    public Set<String> searchGroups( String filter, SearchControls controls ) throws Exception
     {
         if ( controls == null )
         {
@@ -1070,7 +1070,7 @@
      * @return the set of group names
      * @throws NamingException if there are problems conducting the search
      */
-    public Set<String> searchGroups( String filter ) throws NamingException
+    public Set<String> searchGroups( String filter ) throws Exception
     {
         return searchGroups( filter, null );
     }
@@ -1181,7 +1181,7 @@
 
 
     @Test
-    public void testNotOperator() throws NamingException
+    public void testNotOperator() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -1197,7 +1197,7 @@
 
 
     @Test
-    public void testNotOperatorSubtree() throws NamingException
+    public void testNotOperatorSubtree() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java Wed May 21 15:05:21 2008
@@ -71,7 +71,7 @@
 
 
 
-    private void createData() throws NamingException
+    private void createData() throws Exception
     {
         // -------------------------------------------------------------------
         // Enable the nis schema
@@ -107,7 +107,7 @@
     }
 
 
-    private DirContext addNisPosixGroup( String name, int gid ) throws NamingException
+    private DirContext addNisPosixGroup( String name, int gid ) throws Exception
     {
         Attributes attrs = new AttributesImpl( "objectClass", "top", true );
         attrs.get( "objectClass" ).add( "posixGroup" );
@@ -145,7 +145,7 @@
                 // Do nothing
             }
 
-            Set<Index> indices = new HashSet<Index>();
+            Set<Index<?, ServerEntry>> indices = new HashSet<Index<?, ServerEntry>>();
             indices.addAll( partition.getIndexedAttributes() );
             indices.add( new JdbmIndex( "gidNumber" ) );
             partition.setIndexedAttributes( indices );
@@ -165,7 +165,7 @@
      * @return the set of groups
      * @throws NamingException if there are problems conducting the search
      */
-    public Set<String> searchGroups( String filter, SearchControls controls ) throws NamingException
+    public Set<String> searchGroups( String filter, SearchControls controls ) throws Exception
     {
         if ( controls == null )
         {
@@ -193,7 +193,7 @@
      * @return the set of group names
      * @throws NamingException if there are problems conducting the search
      */
-    public Set<String> searchGroups( String filter ) throws NamingException
+    public Set<String> searchGroups( String filter ) throws Exception
     {
         return searchGroups( filter, null );
     }

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java Wed May 21 15:05:21 2008
@@ -273,7 +273,7 @@
     
 
     @Test
-    public void testSearchUniqueMemberFilter() throws NamingException
+    public void testSearchUniqueMemberFilter() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -325,7 +325,7 @@
 
 
     @Test
-    public void testSearchUniqueMemberFilterWithSpaces() throws NamingException
+    public void testSearchUniqueMemberFilterWithSpaces() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -377,7 +377,7 @@
 
 
     @Test
-    public void testSearchUniqueMemberFilterWithBadDN() throws NamingException
+    public void testSearchUniqueMemberFilterWithBadDN() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 
@@ -416,7 +416,7 @@
 
 
     @Test
-    public void testSearchUniqueMemberFilterWithUID() throws NamingException
+    public void testSearchUniqueMemberFilterWithUID() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java Wed May 21 15:05:21 2008
@@ -50,7 +50,7 @@
 
 
     @Test
-    public void testDireve308Example() throws NamingException
+    public void testDireve308Example() throws Exception
     {
         /*
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Wed May 21 15:05:21 2008
@@ -103,7 +103,7 @@
 
 
     @Test
-    public void testBinaryAttributeFilterExtension() throws NamingException
+    public void testBinaryAttributeFilterExtension() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -164,7 +164,7 @@
 
 
     @Test
-    public void testModifyOperationalOpAttrs() throws NamingException
+    public void testModifyOperationalOpAttrs() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -225,7 +225,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testSystemContextRoot() throws NamingException
+    public void testSystemContextRoot() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -267,7 +267,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testConfirmNonAdminUserDnIsCreatorsName() throws NamingException
+    public void testConfirmNonAdminUserDnIsCreatorsName() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
@@ -288,7 +288,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testModifyShouldLeadToModifiersAttributes() throws NamingException
+    public void testModifyShouldLeadToModifiersAttributes() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -320,7 +320,7 @@
      * @throws InterruptedException on error
      */
     @Test
-    public void testModifyShouldChangeModifyTimestamp() throws NamingException, InterruptedException
+    public void testModifyShouldChangeModifyTimestamp() throws Exception, InterruptedException
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -372,7 +372,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testModifyOperationalAttributeAdd() throws NamingException
+    public void testModifyOperationalAttributeAdd() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -403,7 +403,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testModifyOperationalAttributeRemove() throws NamingException
+    public void testModifyOperationalAttributeRemove() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -434,7 +434,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testModifyOperationalAttributeReplace() throws NamingException
+    public void testModifyOperationalAttributeReplace() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Wed May 21 15:05:21 2008
@@ -77,9 +77,9 @@
      *
      * @param schemaName the name of the schema
      * @return the dn of the a schema's attributeType entity container
-     * @throws NamingException on failure
+     * @throws Exception on failure
      */
-    private LdapDN getAttributeTypeContainer( String schemaName ) throws NamingException
+    private LdapDN getAttributeTypeContainer( String schemaName ) throws Exception
     {
         return new LdapDN( "ou=attributeTypes,cn=" + schemaName );
     }
@@ -97,7 +97,7 @@
 
     
     @Test
-    public void testAddAttributeType() throws NamingException
+    public void testAddAttributeType() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -121,7 +121,7 @@
     
     
     @Test
-    public void testDeleteAttributeType() throws NamingException
+    public void testDeleteAttributeType() throws Exception
     {
         LdapDN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -144,7 +144,7 @@
 
 
     @Test
-    public void testRenameAttributeType() throws NamingException
+    public void testRenameAttributeType() throws Exception
     {
         LdapContext schemaRoot = getSchemaContext( service );
         LdapDN dn = getAttributeTypeContainer( "apachemeta" );
@@ -172,7 +172,7 @@
 
 
     @Test
-    public void testMoveAttributeType() throws NamingException
+    public void testMoveAttributeType() throws Exception
     {
         testAddAttributeType();
         
@@ -193,7 +193,7 @@
 
 
     @Test
-    public void testMoveAttributeTypeAndChangeRdn() throws NamingException
+    public void testMoveAttributeTypeAndChangeRdn() throws Exception
     {
         testAddAttributeType();
         
@@ -217,7 +217,7 @@
 
     
     @Test
-    public void testModifyAttributeTypeWithModificationItems() throws NamingException
+    public void testModifyAttributeTypeWithModificationItems() throws Exception
     {
         testAddAttributeType();
         
@@ -248,7 +248,7 @@
 
     
     @Test
-    public void testModifyAttributeTypeWithAttributes() throws NamingException
+    public void testModifyAttributeTypeWithAttributes() throws Exception
     {
         testAddAttributeType();
         
@@ -281,7 +281,7 @@
     // ----------------------------------------------------------------------
 
     
-    private void addDependeeAttributeType() throws NamingException
+    private void addDependeeAttributeType() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -306,7 +306,7 @@
 
 
     @Test
-    public void testDeleteAttributeTypeWhenInUse() throws NamingException
+    public void testDeleteAttributeTypeWhenInUse() throws Exception
     {
         LdapDN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -329,7 +329,7 @@
     
     
     @Test
-    public void testMoveAttributeTypeWhenInUse() throws NamingException
+    public void testMoveAttributeTypeWhenInUse() throws Exception
     {
         testAddAttributeType();
         addDependeeAttributeType();
@@ -356,7 +356,7 @@
 
 
     @Test
-    public void testMoveAttributeTypeAndChangeRdnWhenInUse() throws NamingException
+    public void testMoveAttributeTypeAndChangeRdnWhenInUse() throws Exception
     {
         testAddAttributeType();
         addDependeeAttributeType();
@@ -383,7 +383,7 @@
 
     
     @Test
-    public void testRenameAttributeTypeWhenInUse() throws NamingException
+    public void testRenameAttributeTypeWhenInUse() throws Exception
     {
         LdapDN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -414,7 +414,7 @@
 
 
     @Test
-    public void testMoveAttributeTypeToTop() throws NamingException
+    public void testMoveAttributeTypeToTop() throws Exception
     {
         testAddAttributeType();
         
@@ -440,7 +440,7 @@
 
 
     @Test
-    public void testMoveAttributeTypeToComparatorContainer() throws NamingException
+    public void testMoveAttributeTypeToComparatorContainer() throws Exception
     {
         testAddAttributeType();
         
@@ -466,7 +466,7 @@
     
     
     @Test
-    public void testAddAttributeTypeToDisabledSchema() throws NamingException
+    public void testAddAttributeTypeToDisabledSchema() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -490,7 +490,7 @@
 
 
     @Test
-    public void testMoveAttributeTypeToDisabledSchema() throws NamingException
+    public void testMoveAttributeTypeToDisabledSchema() throws Exception
     {
         testAddAttributeType();
         
@@ -509,7 +509,7 @@
 
 
     @Test
-    public void testMoveMatchingRuleToEnabledSchema() throws NamingException
+    public void testMoveMatchingRuleToEnabledSchema() throws Exception
     {
         testAddAttributeTypeToDisabledSchema();
         

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Wed May 21 15:05:21 2008
@@ -78,9 +78,9 @@
      *
      * @param schemaName the name of the schema
      * @return the dn to the ou underwhich comparators are found for a schmea
-     * @throws NamingException if there are dn construction issues
+     * @throws Exception if there are dn construction issues
      */
-    private LdapDN getComparatorContainer( String schemaName ) throws NamingException
+    private LdapDN getComparatorContainer( String schemaName ) throws Exception
     {
         return new LdapDN( "ou=comparators,cn=" + schemaName );
     }
@@ -110,7 +110,7 @@
 
 
     @Test
-    public void testAddComparator() throws NamingException
+    public void testAddComparator() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -164,7 +164,7 @@
     
 
     @Test
-    public void testDeleteComparator() throws NamingException
+    public void testDeleteComparator() throws Exception
     {
         LdapDN dn = getComparatorContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -187,7 +187,7 @@
 
 
     @Test
-    public void testRenameComparator() throws NamingException
+    public void testRenameComparator() throws Exception
     {
         LdapDN dn = getComparatorContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -216,7 +216,7 @@
 
 
     @Test
-    public void testMoveComparator() throws NamingException
+    public void testMoveComparator() throws Exception
     {
         testAddComparator();
         
@@ -240,7 +240,7 @@
 
 
     @Test
-    public void testMoveComparatorAndChangeRdn() throws NamingException
+    public void testMoveComparatorAndChangeRdn() throws Exception
     {
         testAddComparator();
         
@@ -267,7 +267,7 @@
 
 
     @Test
-    public void testModifyComparatorWithModificationItems() throws NamingException
+    public void testModifyComparatorWithModificationItems() throws Exception
     {
         testAddComparator();
         
@@ -291,7 +291,7 @@
 
 
     @Test
-    public void testModifyComparatorWithAttributes() throws NamingException
+    public void testModifyComparatorWithAttributes() throws Exception
     {
         testAddComparator();
         
@@ -319,7 +319,7 @@
 
     
     @Test
-    public void testDeleteComparatorWhenInUse() throws NamingException
+    public void testDeleteComparatorWhenInUse() throws Exception
     {
         LdapDN dn = getComparatorContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -344,7 +344,7 @@
     
     
     @Test
-    public void testMoveComparatorWhenInUse() throws NamingException
+    public void testMoveComparatorWhenInUse() throws Exception
     {
         testAddComparator();
         getMatchingRuleRegistry().register( new DummyMR() );
@@ -373,7 +373,7 @@
 
 
     @Test
-    public void testMoveComparatorAndChangeRdnWhenInUse() throws NamingException
+    public void testMoveComparatorAndChangeRdnWhenInUse() throws Exception
     {
         testAddComparator();
         getMatchingRuleRegistry().register( new DummyMR() );
@@ -402,7 +402,7 @@
 
     
     @Test
-    public void testRenameComparatorWhenInUse() throws NamingException
+    public void testRenameComparatorWhenInUse() throws Exception
     {
         LdapDN dn = getComparatorContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -435,7 +435,7 @@
 
 
     @Test
-    public void testMoveComparatorToTop() throws NamingException
+    public void testMoveComparatorToTop() throws Exception
     {
         testAddComparator();
         
@@ -461,7 +461,7 @@
 
 
     @Test
-    public void testMoveComparatorToNormalizers() throws NamingException
+    public void testMoveComparatorToNormalizers() throws Exception
     {
         testAddComparator();
         
@@ -487,7 +487,7 @@
     
     
     @Test
-    public void testAddComparatorToDisabledSchema() throws NamingException
+    public void testAddComparatorToDisabledSchema() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -509,7 +509,7 @@
 
 
     @Test
-    public void testMoveComparatorToDisabledSchema() throws NamingException
+    public void testMoveComparatorToDisabledSchema() throws Exception
     {
         testAddComparator();
         
@@ -528,7 +528,7 @@
 
 
     @Test
-    public void testMoveComparatorToEnabledSchema() throws NamingException
+    public void testMoveComparatorToEnabledSchema() throws Exception
     {
         testAddComparatorToDisabledSchema();
         

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Wed May 21 15:05:21 2008
@@ -80,9 +80,9 @@
      * 
      * @param schemaName the name of the schema
      * @return  the dn of the container of matchingRules for a schema
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    private LdapDN getMatchingRuleContainer( String schemaName ) throws NamingException
+    private LdapDN getMatchingRuleContainer( String schemaName ) throws Exception
     {
         return new LdapDN( "ou=matchingRules,cn=" + schemaName );
     }
@@ -94,7 +94,7 @@
 
 
     @Test
-    public void testAddMatchingRule() throws NamingException
+    public void testAddMatchingRule() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -115,7 +115,7 @@
     
 
     @Test
-    public void testDeleteMatchingRule() throws NamingException
+    public void testDeleteMatchingRule() throws Exception
     {
         LdapDN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -138,7 +138,7 @@
 
 
     @Test
-    public void testRenameMatchingRule() throws NamingException
+    public void testRenameMatchingRule() throws Exception
     {
         LdapDN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -165,7 +165,7 @@
 
 
     @Test
-    public void testMoveMatchingRule() throws NamingException
+    public void testMoveMatchingRule() throws Exception
     {
         testAddMatchingRule();
         
@@ -186,7 +186,7 @@
 
 
     @Test
-    public void testMoveMatchingRuleAndChangeRdn() throws NamingException
+    public void testMoveMatchingRuleAndChangeRdn() throws Exception
     {
         testAddMatchingRule();
         
@@ -210,7 +210,7 @@
 
 
     @Test
-    public void testModifyMatchingRuleWithModificationItems() throws NamingException
+    public void testModifyMatchingRuleWithModificationItems() throws Exception
     {
         testAddMatchingRule();
         
@@ -241,7 +241,7 @@
 
     
     @Test
-    public void testModifyMatchingRuleWithAttributes() throws NamingException
+    public void testModifyMatchingRuleWithAttributes() throws Exception
     {
         testAddMatchingRule();
         
@@ -328,7 +328,7 @@
 //        addDependeeMatchingRule()
 //        
 //        LdapDN dn = getSyntaxContainer( "apachemeta" );
-//        dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
+//        dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );s
 //
 //        LdapDN newdn = getSyntaxContainer( "apache" );
 //        newdn.add( MetaSchemaConstants.M_OID_AT + "=" + NEW_OID );
@@ -388,7 +388,7 @@
 
 
     @Test
-    public void testMoveMatchingRuleToTop() throws NamingException
+    public void testMoveMatchingRuleToTop() throws Exception
     {
         testAddMatchingRule();
         
@@ -414,7 +414,7 @@
 
 
     @Test
-    public void testMoveMatchingRuleToComparatorContainer() throws NamingException
+    public void testMoveMatchingRuleToComparatorContainer() throws Exception
     {
         testAddMatchingRule();
         
@@ -440,7 +440,7 @@
     
     
     @Test
-    public void testAddMatchingRuleToDisabledSchema() throws NamingException
+    public void testAddMatchingRuleToDisabledSchema() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -461,7 +461,7 @@
 
 
     @Test
-    public void testMoveMatchingRuleToDisabledSchema() throws NamingException
+    public void testMoveMatchingRuleToDisabledSchema() throws Exception
     {
         testAddMatchingRule();
         
@@ -480,7 +480,7 @@
 
 
     @Test
-    public void testMoveMatchingRuleToEnabledSchema() throws NamingException
+    public void testMoveMatchingRuleToEnabledSchema() throws Exception
     {
         testAddMatchingRuleToDisabledSchema();
         

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Wed May 21 15:05:21 2008
@@ -79,9 +79,9 @@
      *
      * @param schemaName the name of the schema
      * @return  the name of the container with normalizer entries in it
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    private LdapDN getNormalizerContainer( String schemaName ) throws NamingException
+    private LdapDN getNormalizerContainer( String schemaName ) throws Exception
     {
         return new LdapDN( "ou=normalizers,cn=" + schemaName );
     }
@@ -111,7 +111,7 @@
 
 
     @Test
-    public void testAddNormalizer() throws NamingException
+    public void testAddNormalizer() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -165,7 +165,7 @@
     
     
     @Test
-    public void testDeleteNormalizer() throws NamingException
+    public void testDeleteNormalizer() throws Exception
     {
         LdapDN dn = getNormalizerContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -189,7 +189,7 @@
 
 
     @Test
-    public void testRenameNormalizer() throws NamingException
+    public void testRenameNormalizer() throws Exception
     {
         LdapDN dn = getNormalizerContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -219,7 +219,7 @@
 
 
     @Test
-    public void testMoveNormalizer() throws NamingException
+    public void testMoveNormalizer() throws Exception
     {
         testAddNormalizer();
         
@@ -243,7 +243,7 @@
 
 
     @Test
-    public void testMoveNormalizerAndChangeRdn() throws NamingException
+    public void testMoveNormalizerAndChangeRdn() throws Exception
     {
         testAddNormalizer();
         
@@ -270,7 +270,7 @@
 
     
     @Test
-    public void testModifyNormalizerWithModificationItems() throws NamingException
+    public void testModifyNormalizerWithModificationItems() throws Exception
     {
         testAddNormalizer();
         
@@ -294,7 +294,7 @@
 
     
     @Test
-    public void testModifyNormalizerWithAttributes() throws NamingException
+    public void testModifyNormalizerWithAttributes() throws Exception
     {
         testAddNormalizer();
         
@@ -322,7 +322,7 @@
 
     
     @Test
-    public void testDeleteNormalizerWhenInUse() throws NamingException
+    public void testDeleteNormalizerWhenInUse() throws Exception
     {
         LdapDN dn = getNormalizerContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -347,7 +347,7 @@
     
     
     @Test
-    public void testMoveNormalizerWhenInUse() throws NamingException
+    public void testMoveNormalizerWhenInUse() throws Exception
     {
         testAddNormalizer();
         getMatchingRuleRegistry().register( new DummyMR() );
@@ -376,7 +376,7 @@
 
 
     @Test
-    public void testMoveNormalizerAndChangeRdnWhenInUse() throws NamingException
+    public void testMoveNormalizerAndChangeRdnWhenInUse() throws Exception
     {
         testAddNormalizer();
         getMatchingRuleRegistry().register( new DummyMR() );
@@ -405,7 +405,7 @@
 
     
     @Test
-    public void testRenameNormalizerWhenInUse() throws NamingException
+    public void testRenameNormalizerWhenInUse() throws Exception
     {
         LdapDN dn = getNormalizerContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -438,7 +438,7 @@
 
 
     @Test
-    public void testMoveNormalizerToTop() throws NamingException
+    public void testMoveNormalizerToTop() throws Exception
     {
         testAddNormalizer();
         
@@ -464,7 +464,7 @@
 
 
     @Test
-    public void testMoveNormalizerToComparatorContainer() throws NamingException
+    public void testMoveNormalizerToComparatorContainer() throws Exception
     {
         testAddNormalizer();
         
@@ -490,7 +490,7 @@
     
     
     @Test
-    public void testAddNormalizerToDisabledSchema() throws NamingException
+    public void testAddNormalizerToDisabledSchema() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -512,7 +512,7 @@
 
 
     @Test
-    public void testMoveNormalizerToDisabledSchema() throws NamingException
+    public void testMoveNormalizerToDisabledSchema() throws Exception
     {
         testAddNormalizer();
         
@@ -531,7 +531,7 @@
 
 
     @Test
-    public void testMoveNormalizerToEnabledSchema() throws NamingException
+    public void testMoveNormalizerToEnabledSchema() throws Exception
     {
         testAddNormalizerToDisabledSchema();
         

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Wed May 21 15:05:21 2008
@@ -77,9 +77,9 @@
      *
      * @param schemaName the name of the schema
      * @return the dn of the container which contains objectClasses
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    private LdapDN getObjectClassContainer( String schemaName ) throws NamingException
+    private LdapDN getObjectClassContainer( String schemaName ) throws Exception
     {
         return new LdapDN( "ou=objectClasses,cn=" + schemaName );
     }
@@ -97,7 +97,7 @@
 
 
     @Test
-    public void testAddObjectClass() throws NamingException
+    public void testAddObjectClass() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -121,7 +121,7 @@
     
     
     @Test
-    public void testDeleteAttributeType() throws NamingException
+    public void testDeleteAttributeType() throws Exception
     {
         LdapDN dn = getObjectClassContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -145,7 +145,7 @@
 
 
     @Test
-    public void testRenameAttributeType() throws NamingException
+    public void testRenameAttributeType() throws Exception
     {
         LdapDN dn = getObjectClassContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -173,7 +173,7 @@
 
 
     @Test
-    public void testMoveAttributeType() throws NamingException
+    public void testMoveAttributeType() throws Exception
     {
         testAddObjectClass();
         
@@ -194,7 +194,7 @@
 
 
     @Test
-    public void testMoveObjectClassAndChangeRdn() throws NamingException
+    public void testMoveObjectClassAndChangeRdn() throws Exception
     {
         testAddObjectClass();
         
@@ -218,7 +218,7 @@
 
     
     @Test
-    public void testModifyAttributeTypeWithModificationItems() throws NamingException
+    public void testModifyAttributeTypeWithModificationItems() throws Exception
     {
         testAddObjectClass();
         
@@ -249,7 +249,7 @@
 
     
     @Test
-    public void testModifyAttributeTypeWithAttributes() throws NamingException
+    public void testModifyAttributeTypeWithAttributes() throws Exception
     {
         testAddObjectClass();
         
@@ -282,7 +282,7 @@
     // ----------------------------------------------------------------------
 
     
-    private void addDependeeObjectClass() throws NamingException
+    private void addDependeeObjectClass() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -307,7 +307,7 @@
 
     
     @Test
-    public void testDeleteObjectClassWhenInUse() throws NamingException
+    public void testDeleteObjectClassWhenInUse() throws Exception
     {
         LdapDN dn = getObjectClassContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -330,7 +330,7 @@
     
     
     @Test
-    public void testMoveObjectClassWhenInUse() throws NamingException
+    public void testMoveObjectClassWhenInUse() throws Exception
     {
         testAddObjectClass();
         addDependeeObjectClass();
@@ -357,7 +357,7 @@
 
 
     @Test
-    public void testMoveObjectClassAndChangeRdnWhenInUse() throws NamingException
+    public void testMoveObjectClassAndChangeRdnWhenInUse() throws Exception
     {
         testAddObjectClass();
         addDependeeObjectClass();
@@ -384,7 +384,7 @@
 
     
     @Test
-    public void testRenameObjectClassWhenInUse() throws NamingException
+    public void testRenameObjectClassWhenInUse() throws Exception
     {
         LdapDN dn = getObjectClassContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -415,7 +415,7 @@
 
 
     @Test
-    public void testMoveObjectClassToTop() throws NamingException
+    public void testMoveObjectClassToTop() throws Exception
     {
         testAddObjectClass();
         
@@ -441,7 +441,7 @@
 
 
     @Test
-    public void testMoveObjectClassToComparatorContainer() throws NamingException
+    public void testMoveObjectClassToComparatorContainer() throws Exception
     {
         testAddObjectClass();
         
@@ -467,7 +467,7 @@
     
     
     @Test
-    public void testAddObjectClassToDisabledSchema() throws NamingException
+    public void testAddObjectClassToDisabledSchema() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -491,7 +491,7 @@
 
 
     @Test
-    public void testMoveObjectClassToDisabledSchema() throws NamingException
+    public void testMoveObjectClassToDisabledSchema() throws Exception
     {
         testAddObjectClass();
         
@@ -510,7 +510,7 @@
 
 
     @Test
-    public void testMoveObjectClassToEnabledSchema() throws NamingException
+    public void testMoveObjectClassToEnabledSchema() throws Exception
     {
         testAddObjectClassToDisabledSchema();
         

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Wed May 21 15:05:21 2008
@@ -85,7 +85,7 @@
 
 
     @Before
-    public void checkSambaSchema() throws NamingException
+    public void checkSambaSchema() throws Exception
     {
         LdapContext schemaRoot = getSchemaContext( service );
 
@@ -352,7 +352,7 @@
     // -----------------------------------------------------------------------
 
     
-    private void enableSchema( String schemaName ) throws NamingException
+    private void enableSchema( String schemaName ) throws Exception
     {
         LdapContext schemaRoot = getSchemaContext( service );
 
@@ -364,7 +364,7 @@
     }
     
     
-    private void disableSchema( String schemaName ) throws NamingException
+    private void disableSchema( String schemaName ) throws Exception
     {
         LdapContext schemaRoot = getSchemaContext( service );
 

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Wed May 21 15:05:21 2008
@@ -93,9 +93,9 @@
      *
      * @param schemaName the name of the schema
      * @return the dn of the container holding syntax checkers for the schema
-     * @throws NamingException on dn parse errors
+     * @throws Exception on dn parse errors
      */
-    private LdapDN getSyntaxCheckerContainer( String schemaName ) throws NamingException
+    private LdapDN getSyntaxCheckerContainer( String schemaName ) throws Exception
     {
         return new LdapDN( "ou=syntaxCheckers,cn=" + schemaName );
     }
@@ -107,7 +107,7 @@
 
 
     @Test
-    public void testAddSyntaxChecker() throws NamingException
+    public void testAddSyntaxChecker() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -161,7 +161,7 @@
     
     
     @Test
-    public void testDeleteSyntaxChecker() throws NamingException
+    public void testDeleteSyntaxChecker() throws Exception
     {
         LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -185,7 +185,7 @@
 
 
     @Test
-    public void testRenameSyntaxChecker() throws NamingException
+    public void testRenameSyntaxChecker() throws Exception
     {
         LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -215,7 +215,7 @@
 
 
     @Test
-    public void testMoveSyntaxChecker() throws NamingException
+    public void testMoveSyntaxChecker() throws Exception
     {
         testAddSyntaxChecker();
         
@@ -239,7 +239,7 @@
 
 
     @Test
-    public void testMoveSyntaxCheckerAndChangeRdn() throws NamingException
+    public void testMoveSyntaxCheckerAndChangeRdn() throws Exception
     {
         testAddSyntaxChecker();
         
@@ -266,7 +266,7 @@
 
     
     @Test
-    public void testModifySyntaxCheckerWithModificationItems() throws NamingException
+    public void testModifySyntaxCheckerWithModificationItems() throws Exception
     {
         testAddSyntaxChecker();
         
@@ -290,7 +290,7 @@
 
     
     @Test
-    public void testModifySyntaxCheckerWithAttributes() throws NamingException
+    public void testModifySyntaxCheckerWithAttributes() throws Exception
     {
         testAddSyntaxChecker();
         
@@ -318,7 +318,7 @@
 
     
     @Test
-    public void testDeleteSyntaxCheckerWhenInUse() throws NamingException
+    public void testDeleteSyntaxCheckerWhenInUse() throws Exception
     {
         LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -343,7 +343,7 @@
     
     
     @Test
-    public void testMoveSyntaxCheckerWhenInUse() throws NamingException
+    public void testMoveSyntaxCheckerWhenInUse() throws Exception
     {
         testAddSyntaxChecker();
         getSyntaxRegistry().register( new DummySyntax() );
@@ -372,7 +372,7 @@
 
 
     @Test
-    public void testMoveSyntaxCheckerAndChangeRdnWhenInUse() throws NamingException
+    public void testMoveSyntaxCheckerAndChangeRdnWhenInUse() throws Exception
     {
         testAddSyntaxChecker();
         getSyntaxRegistry().register( new DummySyntax() );
@@ -401,7 +401,7 @@
 
     
     @Test
-    public void testRenameSyntaxCheckerWhenInUse() throws NamingException
+    public void testRenameSyntaxCheckerWhenInUse() throws Exception
     {
         LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -434,7 +434,7 @@
 
 
     @Test
-    public void testMoveSyntaxCheckerToTop() throws NamingException
+    public void testMoveSyntaxCheckerToTop() throws Exception
     {
         testAddSyntaxChecker();
         
@@ -460,7 +460,7 @@
 
 
     @Test
-    public void testMoveSyntaxCheckerToComparatorContainer() throws NamingException
+    public void testMoveSyntaxCheckerToComparatorContainer() throws Exception
     {
         testAddSyntaxChecker();
         
@@ -486,7 +486,7 @@
     
     
     @Test
-    public void testAddSyntaxCheckerToDisabledSchema() throws NamingException
+    public void testAddSyntaxCheckerToDisabledSchema() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -508,7 +508,7 @@
 
 
     @Test
-    public void testMoveSyntaxCheckerToDisabledSchema() throws NamingException
+    public void testMoveSyntaxCheckerToDisabledSchema() throws Exception
     {
         testAddSyntaxChecker();
         
@@ -527,7 +527,7 @@
 
 
     @Test
-    public void testMoveSyntaxCheckerToEnabledSchema() throws NamingException
+    public void testMoveSyntaxCheckerToEnabledSchema() throws Exception
     {
         testAddSyntaxCheckerToDisabledSchema();
         

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Wed May 21 15:05:21 2008
@@ -98,9 +98,9 @@
      *
      * @param schemaName the name of the schema
      * @return the dn of the container for the syntax entities
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    private LdapDN getSyntaxContainer( String schemaName ) throws NamingException
+    private LdapDN getSyntaxContainer( String schemaName ) throws Exception
     {
         return new LdapDN( "ou=syntaxes,cn=" + schemaName );
     }
@@ -112,7 +112,7 @@
 
     
     @Test
-    public void testAddSyntax() throws NamingException
+    public void testAddSyntax() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -133,7 +133,7 @@
     
     
     @Test
-    public void testDeleteSyntax() throws NamingException
+    public void testDeleteSyntax() throws Exception
     {
         LdapDN dn = getSyntaxContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -157,7 +157,7 @@
 
 
     @Test
-    public void testRenameSyntax() throws NamingException
+    public void testRenameSyntax() throws Exception
     {
         LdapDN dn = getSyntaxContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -185,7 +185,7 @@
 
 
     @Test
-    public void testMoveSyntax() throws NamingException
+    public void testMoveSyntax() throws Exception
     {
         testAddSyntax();
         
@@ -206,7 +206,7 @@
 
 
     @Test
-    public void testMoveSyntaxAndChangeRdn() throws NamingException
+    public void testMoveSyntaxAndChangeRdn() throws Exception
     {
         testAddSyntax();
         
@@ -230,7 +230,7 @@
 
     
     @Test
-    public void testModifySyntaxWithModificationItems() throws NamingException
+    public void testModifySyntaxWithModificationItems() throws Exception
     {
         testAddSyntax();
         
@@ -257,7 +257,7 @@
 
     
     @Test
-    public void testModifySyntaxWithAttributes() throws NamingException
+    public void testModifySyntaxWithAttributes() throws Exception
     {
         testAddSyntax();
         
@@ -288,7 +288,7 @@
 
     
     @Test
-    public void testDeleteSyntaxWhenInUse() throws NamingException
+    public void testDeleteSyntaxWhenInUse() throws Exception
     {
         LdapDN dn = getSyntaxContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -311,7 +311,7 @@
     
     
     @Test
-    public void testMoveSyntaxWhenInUse() throws NamingException
+    public void testMoveSyntaxWhenInUse() throws Exception
     {
         testAddSyntax();
         addDependeeMatchingRule( OID );
@@ -338,7 +338,7 @@
 
 
     @Test
-    public void testMoveSyntaxAndChangeRdnWhenInUse() throws NamingException
+    public void testMoveSyntaxAndChangeRdnWhenInUse() throws Exception
     {
         testAddSyntax();
         addDependeeMatchingRule( OID );
@@ -369,15 +369,15 @@
      *
      * @param schemaName the name of the schmea
      * @return the dn of the container entry holding matchingRules
-     * @throws NamingException on parse errors
+     * @throws Exception on parse errors
      */
-    private LdapDN getMatchingRuleContainer( String schemaName ) throws NamingException
+    private LdapDN getMatchingRuleContainer( String schemaName ) throws Exception
     {
         return new LdapDN( "ou=matchingRules,cn=" + schemaName );
     }
     
     
-    private void addDependeeMatchingRule( String oid ) throws NamingException
+    private void addDependeeMatchingRule( String oid ) throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -398,7 +398,7 @@
 
     
     @Test
-    public void testRenameNormalizerWhenInUse() throws NamingException
+    public void testRenameNormalizerWhenInUse() throws Exception
     {
         LdapDN dn = getSyntaxContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -429,7 +429,7 @@
 
 
     @Test
-    public void testMoveSyntaxToTop() throws NamingException
+    public void testMoveSyntaxToTop() throws Exception
     {
         testAddSyntax();
         
@@ -455,7 +455,7 @@
 
 
     @Test
-    public void testMoveSyntaxToComparatorContainer() throws NamingException
+    public void testMoveSyntaxToComparatorContainer() throws Exception
     {
         testAddSyntax();
         
@@ -481,7 +481,7 @@
     
     
     @Test
-    public void testAddSyntaxToDisabledSchema() throws NamingException
+    public void testAddSyntaxToDisabledSchema() throws Exception
     {
         Attributes attrs = new AttributesImpl();
         Attribute oc = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT, "top" );
@@ -503,7 +503,7 @@
 
 
     @Test
-    public void testMoveSyntaxToDisabledSchema() throws NamingException
+    public void testMoveSyntaxToDisabledSchema() throws Exception
     {
         testAddSyntax();
         
@@ -522,7 +522,7 @@
 
 
     @Test
-    public void testMoveSyntaxToEnabledSchema() throws NamingException
+    public void testMoveSyntaxToEnabledSchema() throws Exception
     {
         testAddSyntaxToDisabledSchema();
         
@@ -546,7 +546,7 @@
     }
 
 
-    private void createDummySyntaxChecker( String oid, String schema ) throws NamingException
+    private void createDummySyntaxChecker( String oid, String schema ) throws Exception
     {
         List<String> descriptions = new ArrayList<String>();
         descriptions.add( "( " + oid + " DESC 'bogus desc' FQCN " + AcceptAllSyntaxChecker.class.getName() 
@@ -555,7 +555,7 @@
     }
     
     
-    private void modify( int op, List<String> descriptions, String opAttr ) throws NamingException
+    private void modify( int op, List<String> descriptions, String opAttr ) throws Exception
     {
         LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
         Attribute attr = new AttributeImpl( opAttr );
@@ -575,9 +575,9 @@
      * Get's the subschemaSubentry attribute value from the rootDSE.
      * 
      * @return the subschemaSubentry distinguished name
-     * @throws NamingException if there are problems accessing the RootDSE
+     * @throws Exception if there are problems accessing the RootDSE
      */
-    private String getSubschemaSubentryDN() throws NamingException
+    private String getSubschemaSubentryDN() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java Wed May 21 15:05:21 2008
@@ -63,7 +63,7 @@
      * Test that I can create an ObjectClass entry with an invalid
      */
     @Test
-    public void testCreateObjectClassWithInvalidNameAttribute() throws NamingException
+    public void testCreateObjectClassWithInvalidNameAttribute() throws Exception
     {
         Attributes attributes = new BasicAttributes();
         Attribute  objectClassAttribute = new BasicAttribute( "objectClass" );
@@ -97,7 +97,7 @@
      * Test that I can create an ObjectClass entry with an invalid
      */
     @Test
-    public void testCreateObjectClassWithNoObjectClass() throws NamingException
+    public void testCreateObjectClassWithNoObjectClass() throws Exception
     {
         Attributes attributes = new BasicAttributes();
         Attribute  objectClassAttribute = new BasicAttribute( "objectClass" );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Wed May 21 15:05:21 2008
@@ -139,7 +139,7 @@
     }
 
 
-    private void enableSchema( String schemaName ) throws NamingException
+    private void enableSchema( String schemaName ) throws Exception
     {
         // now enable the test schema
         ModificationItemImpl[] mods = new ModificationItemImpl[1];
@@ -155,7 +155,7 @@
      * @return the subschemaSubentry distinguished name
      * @throws NamingException if there are problems accessing the RootDSE
      */
-    private String getSubschemaSubentryDN() throws NamingException
+    private String getSubschemaSubentryDN() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -176,7 +176,7 @@
      * @return all operational attributes of the subschemaSubentry 
      * @throws NamingException if there are problems accessing this entry
      */
-    private Attributes getSubschemaSubentryAttributes() throws NamingException
+    private Attributes getSubschemaSubentryAttributes() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java Wed May 21 15:05:21 2008
@@ -73,10 +73,10 @@
     /**
      * For <a href="https://issues.apache.org/jira/browse/DIRSERVER-925">DIRSERVER-925</a>.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
     @Test
-    public void testNoStructuralObjectClass() throws NamingException
+    public void testNoStructuralObjectClass() throws Exception
     {
         Attributes attrs = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC );
         attrs.get( SchemaConstants.OBJECT_CLASS_AT ).add( "uidObject" );
@@ -96,9 +96,9 @@
     /**
      * For <a href="https://issues.apache.org/jira/browse/DIRSERVER-925">DIRSERVER-925</a>.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    public void testMultipleStructuralObjectClasses() throws NamingException
+    public void testMultipleStructuralObjectClasses() throws Exception
     {
         Attributes attrs = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC );
         attrs.get( SchemaConstants.OBJECT_CLASS_AT ).add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
@@ -121,9 +121,9 @@
     /**
      * For <a href="https://issues.apache.org/jira/browse/DIRSERVER-904">DIRSERVER-904</a>.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    public void testAddingTwoDifferentEntitiesWithSameOid() throws NamingException
+    public void testAddingTwoDifferentEntitiesWithSameOid() throws Exception
     {
         String numberOfGunsAttrLdif = "dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.999,ou=attributeTypes,cn=other,ou=schema\n" +
             "m-usage: USER_APPLICATIONS\n" +
@@ -176,7 +176,7 @@
     }
     
     
-    public void testFillInObjectClasses() throws NamingException
+    public void testFillInObjectClasses() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Attribute ocs = sysRoot.getAttributes( "cn=person0" ).get( "objectClass" );
@@ -199,7 +199,7 @@
     }
 
 
-    public void testSearchForPerson() throws NamingException
+    public void testSearchForPerson() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         SearchControls controls = new SearchControls();
@@ -245,7 +245,7 @@
     }
 
 
-    public void testSearchForOrgPerson() throws NamingException
+    public void testSearchForOrgPerson() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         SearchControls controls = new SearchControls();
@@ -284,7 +284,7 @@
     }
 
 
-    public void testSearchForInetOrgPerson() throws NamingException
+    public void testSearchForInetOrgPerson() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         SearchControls controls = new SearchControls();
@@ -314,7 +314,7 @@
         assertTrue( ocs.contains( "inetOrgPerson" ) );
     }
     
-    public void testSearchForSubSchemaSubEntryUserAttrsOnly() throws NamingException
+    public void testSearchForSubSchemaSubEntryUserAttrsOnly() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -346,7 +346,7 @@
         assertNotNull( attrs.get( "objectClass" ) );
     }
 
-    public void testSearchForSubSchemaSubEntryAllAttrs() throws NamingException
+    public void testSearchForSubSchemaSubEntryAllAttrs() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -408,7 +408,7 @@
         assertNotNull( attrs.get( "subtreeSpecification" ) );
     }
 
-    public void testSearchForSubSchemaSubEntrySingleAttributeSelected() throws NamingException
+    public void testSearchForSubSchemaSubEntrySingleAttributeSelected() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -452,7 +452,7 @@
         assertNull( attrs.get( "objectClasses" ) );
     }
 
-    public void testSearchForSubSchemaSubEntryBadFilter() throws NamingException
+    public void testSearchForSubSchemaSubEntryBadFilter() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -472,7 +472,7 @@
         assertEquals( 0, subSchemaEntry.size() );
     }
 
-    public void testSearchForSubSchemaSubEntryFilterEqualTop() throws NamingException
+    public void testSearchForSubSchemaSubEntryFilterEqualTop() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -520,7 +520,7 @@
         assertNotNull( attrs.get( "objectClasses" ) );
     }
 
-    public void testSearchForSubSchemaSubEntryFilterEqualSubSchema() throws NamingException
+    public void testSearchForSubSchemaSubEntryFilterEqualSubSchema() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -568,7 +568,7 @@
         assertNotNull( attrs.get( "objectClasses" ) );
     }
 
-    public void testSearchForSubSchemaSubEntryNotObjectScope() throws NamingException
+    public void testSearchForSubSchemaSubEntryNotObjectScope() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -588,7 +588,7 @@
         assertEquals( 0, subSchemaEntry.size() );
     }
 
-    public void testSearchForSubSchemaSubEntryComposedFilters() throws NamingException
+    public void testSearchForSubSchemaSubEntryComposedFilters() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -611,9 +611,9 @@
     /**
      * Test for DIRSERVER-844: storing of base 64 encoded values into H-R attributes
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    public void testSearchSeeAlso() throws NamingException
+    public void testSearchSeeAlso() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -651,9 +651,9 @@
      * Doing a search with filtering attributes should work even if the attribute
      * is not valid 
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    public void testSearchForUnknownAttributes() throws NamingException
+    public void testSearchForUnknownAttributes() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -699,9 +699,9 @@
      * Check that if we request a Attribute which is not an AttributeType,
      * we still get a result
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    public void testSearchAttributesOIDObjectClass() throws NamingException
+    public void testSearchAttributesOIDObjectClass() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -747,9 +747,9 @@
     /**
      * Check that if we request a Attribute which is an ObjectClass.
      *
-     * @throws NamingException on error
+     * @throws Exception on error
      */
-    public void testSearchAttributesOIDObjectClassName() throws NamingException
+    public void testSearchAttributesOIDObjectClassName() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Wed May 21 15:05:21 2008
@@ -124,7 +124,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testRootDSEsSubschemaSubentry() throws NamingException
+    public void testRootDSEsSubschemaSubentry() throws Exception
     {
         assertEquals( GLOBAL_SUBSCHEMA_DN, getSubschemaSubentryDN() );
         Attributes subschemaSubentryAttrs = getSubschemaSubentryAttributes();
@@ -138,7 +138,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testSSSEDeleteRejection() throws NamingException
+    public void testSSSEDeleteRejection() throws Exception
     {
         try
         {
@@ -158,7 +158,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testSSSEAddRejection() throws NamingException
+    public void testSSSEAddRejection() throws Exception
     {
         try
         {
@@ -178,7 +178,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testSSSERenameRejection() throws NamingException
+    public void testSSSERenameRejection() throws Exception
     {
         try
         {
@@ -198,7 +198,7 @@
      * @throws NamingException on error
      */
     @Test
-    public void testSSSEMoveRejection() throws NamingException
+    public void testSSSEMoveRejection() throws Exception
     {
         try
         {
@@ -1847,7 +1847,7 @@
      */
     @Test
     @Ignore ( "Don't know why but this is causing intermittant failures in assertions" )
-    public void testTimestampAndModifierUpdates() throws NamingException, InterruptedException
+    public void testTimestampAndModifierUpdates() throws Exception, InterruptedException
     {
         TimeZone tz = TimeZone.getTimeZone( "GMT" );
         
@@ -1988,7 +1988,7 @@
     }
     
     
-    private void enableSchema( String schemaName ) throws NamingException
+    private void enableSchema( String schemaName ) throws Exception
     {
         // now enable the test schema
         ModificationItemImpl[] mods = new ModificationItemImpl[1];
@@ -1998,7 +1998,7 @@
     }
     
     
-    private void disableSchema( String schemaName ) throws NamingException
+    private void disableSchema( String schemaName ) throws Exception
     {
         // now enable the test schema
         ModificationItemImpl[] mods = new ModificationItemImpl[1];
@@ -2027,7 +2027,7 @@
      * @return the subschemaSubentry distinguished name
      * @throws NamingException if there are problems accessing the RootDSE
      */
-    private String getSubschemaSubentryDN() throws NamingException
+    private String getSubschemaSubentryDN() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -2048,7 +2048,7 @@
      * @return all operational attributes of the subschemaSubentry
      * @throws NamingException if there are problems accessing this entry
      */
-    private Attributes getSubschemaSubentryAttributes() throws NamingException
+    private Attributes getSubschemaSubentryAttributes() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java Wed May 21 15:05:21 2008
@@ -35,7 +35,6 @@
 import org.junit.runner.RunWith;
 
 import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -130,7 +129,7 @@
     }
 
 
-    public void addAdministrativeRoles() throws NamingException
+    public void addAdministrativeRoles() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Attribute attribute = new AttributeImpl( "administrativeRole" );
@@ -142,7 +141,7 @@
     }
 
 
-    public Map<String, Attributes> getAllEntries() throws NamingException
+    public Map<String, Attributes> getAllEntries() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Map<String, Attributes> resultMap = new HashMap<String, Attributes>();
@@ -165,7 +164,7 @@
      * FIXME: The test fails badly.
      */
     @Test
-    public void testTrackingOfSubentryOperationals() throws NamingException
+    public void testTrackingOfSubentryOperationals() throws Exception
     {
         
         LdapContext sysRoot = getSystemContext( service );

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java Wed May 21 15:05:21 2008
@@ -34,7 +34,6 @@
 import org.junit.runner.RunWith;
 
 import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -88,7 +87,7 @@
     }
 
 
-    public void addAdministrativeRoles() throws NamingException
+    public void addAdministrativeRoles() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Attribute attribute = new AttributeImpl( "administrativeRole" );
@@ -100,7 +99,7 @@
     }
 
 
-    public Map<String, Attributes> getAllEntries() throws NamingException
+    public Map<String, Attributes> getAllEntries() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Map<String, Attributes> resultMap = new HashMap<String, Attributes>();

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=658895&r1=658894&r2=658895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Wed May 21 15:05:21 2008
@@ -39,7 +39,6 @@
 import org.junit.runner.RunWith;
 
 import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -108,7 +107,7 @@
     }
 
 
-    public void addAdministrativeRole( String role ) throws NamingException
+    public void addAdministrativeRole( String role ) throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Attribute attribute = new AttributeImpl( "administrativeRole" );
@@ -119,7 +118,7 @@
     }
 
 
-    public Map<String, Attributes> getAllEntries() throws NamingException
+    public Map<String, Attributes> getAllEntries() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         Map<String, Attributes> resultMap = new HashMap<String, Attributes>();
@@ -140,7 +139,7 @@
 
 
     @Test
-    public void testEntryAdd() throws NamingException
+    public void testEntryAdd() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         addAdministrativeRole( "collectiveArributeSpecificArea" );
@@ -170,7 +169,7 @@
 
 
     @Test
-    public void testSubentryAdd() throws NamingException
+    public void testSubentryAdd() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         try
@@ -238,7 +237,7 @@
 
 
     @Test
-    public void testSubentryModify() throws NamingException
+    public void testSubentryModify() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         addAdministrativeRole( "collectiveArributeSpecificArea" );
@@ -356,7 +355,7 @@
 
 
     @Test
-    public void testSubentryModify2() throws NamingException
+    public void testSubentryModify2() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         addAdministrativeRole( "collectiveArributeSpecificArea" );
@@ -473,7 +472,7 @@
 
 
     @Test
-    public void testSubentryDelete() throws NamingException
+    public void testSubentryDelete() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         addAdministrativeRole( "collectiveArributeSpecificArea" );
@@ -532,7 +531,7 @@
 
 
     @Test
-    public void testSubentryModifyRdn() throws NamingException
+    public void testSubentryModifyRdn() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         addAdministrativeRole( "collectiveArributeSpecificArea" );
@@ -592,7 +591,7 @@
 
 
     @Test
-    public void testEntryModifyRdn() throws NamingException
+    public void testEntryModifyRdn() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         addAdministrativeRole( "collectiveArributeSpecificArea" );
@@ -689,7 +688,7 @@
 
 
     @Test
-    public void testEntryMoveWithRdnChange() throws NamingException
+    public void testEntryMoveWithRdnChange() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         addAdministrativeRole( "collectiveArributeSpecificArea" );
@@ -786,7 +785,7 @@
 
 
     @Test
-    public void testEntryMove() throws NamingException
+    public void testEntryMove() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         addAdministrativeRole( "collectiveArributeSpecificArea" );



Mime
View raw message