Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 59101 invoked from network); 4 Jan 2008 20:22:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jan 2008 20:22:13 -0000 Received: (qmail 61872 invoked by uid 500); 4 Jan 2008 20:22:02 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 61841 invoked by uid 500); 4 Jan 2008 20:22:02 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 61829 invoked by uid 99); 4 Jan 2008 20:22:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 12:22:01 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 20:21:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D551D1A9832; Fri, 4 Jan 2008 12:21:48 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608981 - in /directory/apacheds/branches/bigbang: core-integ/src/main/java/org/apache/directory/server/core/integ/ core-integ/src/test/java/org/apache/directory/server/core/authz/ core-integ/src/test/java/org/apache/directory/server/core/j... Date: Fri, 04 Jan 2008 20:21:47 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080104202148.D551D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Fri Jan 4 12:21:46 2008 New Revision: 608981 URL: http://svn.apache.org/viewvc?rev=608981&view=rev Log: Making DefaultDirectoryService throw unchecked IllegalStateException instead of a checked NamingException because of the following two reasons which have just been discussed on the mailing list: o The checked NamingException is a PITA to deal with in terms of the try/catch blocks the user has to deal with all over. o The NamingException never really happens unless something is severely broken with the build or the packaging is corrupted making the bootstrap schema not load. So there is no reason why we should not wrap this exception in an IllegalStateException. Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java?rev=608981&r1=608980&r2=608981&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java (original) +++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java Fri Jan 4 12:21:46 2008 @@ -42,7 +42,7 @@ */ DirectoryServiceFactory DEFAULT = new DirectoryServiceFactory() { - public DirectoryService newInstance() throws NamingException + public DirectoryService newInstance() { DirectoryService service = new DefaultDirectoryService(); service.getChangeLog().setEnabled( true ); Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=608981&r1=608980&r2=608981&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original) +++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Fri Jan 4 12:21:46 2008 @@ -55,7 +55,7 @@ public static class ServiceFactory implements DirectoryServiceFactory { - public DirectoryService newInstance() throws NamingException + public DirectoryService newInstance() { DefaultDirectoryService service = new DefaultDirectoryService(); service.setAccessControlEnabled( true ); @@ -68,7 +68,7 @@ public static class DefaultServiceFactory implements DirectoryServiceFactory { - public DirectoryService newInstance() throws NamingException + public DirectoryService newInstance() { DefaultDirectoryService service = new DefaultDirectoryService(); service.setAccessControlEnabled( false ); 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=608981&r1=608980&r2=608981&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 Fri Jan 4 12:21:46 2008 @@ -74,7 +74,7 @@ public static class MyFactory implements DirectoryServiceFactory { - public DirectoryService newInstance() throws NamingException + public DirectoryService newInstance() { DirectoryService service = new DefaultDirectoryService(); service.getChangeLog().setEnabled( true ); 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=608981&r1=608980&r2=608981&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 Fri Jan 4 12:21:46 2008 @@ -115,7 +115,7 @@ public static class MyFactory implements DirectoryServiceFactory { - public DirectoryService newInstance() throws NamingException + public DirectoryService newInstance() { DirectoryService service = new DefaultDirectoryService(); service.getChangeLog().setEnabled( true ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=608981&r1=608980&r2=608981&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Fri Jan 4 12:21:46 2008 @@ -120,6 +120,10 @@ { private static final Logger LOG = LoggerFactory.getLogger( DefaultDirectoryService.class ); + private static final String ILLEGAL_STATE_MSG = "Something has got to be severely " + + "wrong with the core packaging\nor the build to have " + + "resulted in this exception."; + private SchemaService schemaService; /** the registries for system schema objects */ @@ -157,7 +161,7 @@ /** * Creates a new instance. */ - public DefaultDirectoryService() throws NamingException + public DefaultDirectoryService() { setDefaultInterceptorConfigurations(); changeLog = new DefaultChangeLog(); @@ -177,7 +181,16 @@ bootstrapSchemas.add( new ApacheSchema() ); bootstrapSchemas.add( new CoreSchema() ); bootstrapSchemas.add( new SystemSchema() ); - loader.loadWithDependencies( bootstrapSchemas, registries ); + + + try + { + loader.loadWithDependencies( bootstrapSchemas, registries ); + } + catch ( NamingException e ) + { + throw new IllegalStateException( ILLEGAL_STATE_MSG, e ); + } // run referential integrity tests List errors = registries.checkRefInteg(); @@ -185,7 +198,7 @@ { NamingException e = new NamingException(); e.setRootCause( errors.get( 0 ) ); - throw e; + throw new IllegalStateException( ILLEGAL_STATE_MSG, e ); } SerializableComparator.setRegistry( registries.getComparatorRegistry() ); Modified: directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=608981&r1=608980&r2=608981&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original) +++ directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Fri Jan 4 12:21:46 2008 @@ -75,7 +75,6 @@ public ApacheDS( DirectoryService directoryService, LdapServer ldapServer, LdapServer ldapsServer ) - throws NamingException { this.directoryService = directoryService;