directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r810461 - in /directory/apacheds/branches/apacheds-schema: 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/serve...
Date Wed, 02 Sep 2009 11:40:08 GMT
Author: akarasulu
Date: Wed Sep  2 11:40:05 2009
New Revision: 810461

URL: http://svn.apache.org/viewvc?rev=810461&view=rev
Log:
added NullPartition and set up the DefaultDirectoryService to use default SchemaService, which
uses a default SchemaPartition, which uses a NullPartition for starters unless wired to do
otherwise

Added:
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
Modified:
    directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
    directory/apacheds/branches/apacheds-schema/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java
    directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
Wed Sep  2 11:40:05 2009
@@ -38,9 +38,9 @@
      * The default factory returns stock instances of a directory
      * service with smart defaults
      */
-    DirectoryServiceFactory DEFAULT = new DirectoryServiceFactory()
+    DirectoryServiceFactory DEFAULT = new DirectoryServiceFactory() 
     {
-        public DirectoryService newInstance()
+        public DirectoryService newInstance() throws Exception
         {
             DirectoryService service = new DefaultDirectoryService();
             service.getChangeLog().setEnabled( true );

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
Wed Sep  2 11:40:05 2009
@@ -55,7 +55,7 @@
 
     public static class ServiceFactory implements DirectoryServiceFactory
     {
-        public DirectoryService newInstance() 
+        public DirectoryService newInstance() throws Exception
         {
             DefaultDirectoryService service = new DefaultDirectoryService();
             service.setAccessControlEnabled( true );
@@ -68,7 +68,7 @@
 
     public static class DefaultServiceFactory implements DirectoryServiceFactory
     {
-        public DirectoryService newInstance() 
+        public DirectoryService newInstance() throws Exception
         {
             DefaultDirectoryService service = new DefaultDirectoryService();
             service.setAccessControlEnabled( false );

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
Wed Sep  2 11:40:05 2009
@@ -47,7 +47,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.BasicAttribute;
@@ -79,7 +78,7 @@
 
     public static class MyFactory implements DirectoryServiceFactory
     {
-        public DirectoryService newInstance() throws NamingException
+        public DirectoryService newInstance() throws Exception
         {
             DirectoryService service = new DefaultDirectoryService();
             service.getChangeLog().setEnabled( true );

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java
Wed Sep  2 11:40:05 2009
@@ -117,7 +117,7 @@
     
     public static class MyFactory implements DirectoryServiceFactory
     {
-        public DirectoryService newInstance() 
+        public DirectoryService newInstance() throws Exception
         {
             DirectoryService service = new DefaultDirectoryService();
             service.getChangeLog().setEnabled( true );

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
Wed Sep  2 11:40:05 2009
@@ -290,13 +290,14 @@
     /**
      * Creates a new instance of the directory service.
      */
-    public DefaultDirectoryService() 
+    public DefaultDirectoryService() throws Exception
     {
         setDefaultInterceptorConfigurations();
         changeLog = new DefaultChangeLog();
         journal = new DefaultJournal();
         syncPeriodMillis = DEFAULT_SYNC_PERIOD;
         csnFactory = new CsnFactory( replicaId );
+        schemaService = new SchemaService();
     }
 
 

Added: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/NullPartition.java?rev=810461&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
(added)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
Wed Sep  2 11:40:05 2009
@@ -0,0 +1,354 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.server.core.partition;
+
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.collections.iterators.EmptyIterator;
+import org.apache.directory.server.core.entry.ClonedServerEntry;
+import org.apache.directory.server.core.filtering.EntryFilter;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.BindOperationContext;
+import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.interceptor.context.ListOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
+import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
+import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
+import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
+import org.apache.directory.shared.ldap.name.LdapDN;
+
+
+/**
+ * A dummy do nothing partition that is useful for testing NullPartition.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class NullPartition extends AbstractPartition
+{
+    private String id;
+    private String suffix;
+    private LdapDN upSuffixDn;
+    private LdapDN normSuffixDn;
+    
+
+    /**
+     * Creates a new instance of NullPartition.
+     *
+     */
+    public NullPartition()
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#add(org.apache.directory.server.core.interceptor.context.AddOperationContext)
+     */
+    public void add( AddOperationContext opContext ) throws Exception
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#bind(org.apache.directory.server.core.interceptor.context.BindOperationContext)
+     */
+    public void bind( BindOperationContext opContext ) throws Exception
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#delete(org.apache.directory.server.core.interceptor.context.DeleteOperationContext)
+     */
+    public void delete( DeleteOperationContext opContext ) throws Exception
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#getCacheSize()
+     */
+    public int getCacheSize()
+    {
+        return 0;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#getId()
+     */
+    public String getId()
+    {
+        return id;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#getSuffix()
+     */
+    public String getSuffix()
+    {
+        return suffix;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#getSuffixDn()
+     */
+    public LdapDN getSuffixDn() throws Exception
+    {
+        return normSuffixDn;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#getUpSuffixDn()
+     */
+    public LdapDN getUpSuffixDn() throws Exception
+    {
+        return upSuffixDn;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#list(org.apache.directory.server.core.interceptor.context.ListOperationContext)
+     */
+    public EntryFilteringCursor list( ListOperationContext opContext ) throws Exception
+    {
+        return new EntryFilteringCursor()
+        {
+            
+            public Iterator<ClonedServerEntry> iterator()
+            {
+                return EmptyIterator.INSTANCE;
+            }
+            
+        
+            public void setClosureMonitor( ClosureMonitor monitor )
+            {
+            }
+            
+        
+            public boolean previous() throws Exception
+            {
+                return false;
+            }
+            
+        
+            public boolean next() throws Exception
+            {
+                return false;
+            }
+            
+        
+            public boolean last() throws Exception
+            {
+                return false;
+            }
+            
+        
+            public boolean isElementReused()
+            {
+                return false;
+            }
+            
+        
+            public boolean isClosed() throws Exception
+            {
+                return true;
+            }
+            
+        
+            public ClonedServerEntry get() throws Exception
+            {
+                return null;
+            }
+            
+        
+            public boolean first() throws Exception
+            {
+                return false;
+            }
+            
+        
+            public void close( Exception reason ) throws Exception
+            {
+            }
+            
+        
+            public void close() throws Exception
+            {
+            }
+            
+        
+            public void beforeFirst() throws Exception
+            {
+            }
+            
+        
+            public void before( ClonedServerEntry element ) throws Exception
+            {
+            }
+            
+        
+            public boolean available()
+            {
+                return false;
+            }
+            
+        
+            public void afterLast() throws Exception
+            {
+            }
+            
+        
+            public void after( ClonedServerEntry element ) throws Exception
+            {
+            }
+            
+        
+            public void setAbandoned( boolean abandoned )
+            {
+            }
+            
+        
+            public boolean removeEntryFilter( EntryFilter filter )
+            {
+                return false;
+            }
+            
+        
+            public boolean isAbandoned()
+            {
+                return true;
+            }
+            
+        
+            public SearchingOperationContext getOperationContext()
+            {
+                return null;
+            }
+            
+        
+            public List<EntryFilter> getEntryFilters()
+            {
+                return Collections.emptyList();
+            }
+            
+        
+            public boolean addEntryFilter( EntryFilter filter )
+            {
+                return false;
+            }
+        };
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#lookup(java.lang.Long)
+     */
+    public ClonedServerEntry lookup( Long id ) throws Exception
+    {
+        return null;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#modify(org.apache.directory.server.core.interceptor.context.ModifyOperationContext)
+     */
+    public void modify( ModifyOperationContext opContext ) throws Exception
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#move(org.apache.directory.server.core.interceptor.context.MoveOperationContext)
+     */
+    public void move( MoveOperationContext opContext ) throws Exception
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#moveAndRename(org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext)
+     */
+    public void moveAndRename( MoveAndRenameOperationContext opContext ) throws Exception
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#rename(org.apache.directory.server.core.interceptor.context.RenameOperationContext)
+     */
+    public void rename( RenameOperationContext opContext ) throws Exception
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#search(org.apache.directory.server.core.interceptor.context.SearchOperationContext)
+     */
+    public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
+    {
+        return null;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#setCacheSize(int)
+     */
+    public void setCacheSize( int cacheSize )
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#setId(java.lang.String)
+     */
+    public void setId( String id )
+    {
+        this.id = id;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#setSuffix(java.lang.String)
+     */
+    public void setSuffix( String suffix )
+    {
+        this.suffix = suffix;
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.core.partition.Partition#unbind(org.apache.directory.server.core.interceptor.context.UnbindOperationContext)
+     */
+    public void unbind( UnbindOperationContext opContext ) throws Exception
+    {
+    }
+}

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
Wed Sep  2 11:40:05 2009
@@ -43,6 +43,7 @@
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.core.partition.AbstractPartition;
 import org.apache.directory.server.core.partition.ByPassConstants;
+import org.apache.directory.server.core.partition.NullPartition;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
 import org.apache.directory.server.xdbm.Index;
@@ -110,7 +111,7 @@
     private static final String ID = "schema";
     
     /** the wrapped Partition */
-    private Partition wrapped;
+    private Partition wrapped = new NullPartition();
     
     /** the user provided suffix DN for this Partition */
     private LdapDN upSuffixDn = new LdapDN();

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Wed Sep  2 11:40:05 2009
@@ -72,6 +72,12 @@
      */
     private LdapDN schemaModificationAttributesDN;
 
+    
+    public SchemaService() throws Exception
+    {
+        schemaPartition = new SchemaPartition();
+    }
+    
 
     /**
      * Tells if the given DN is the schemaSubentry DN

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
Wed Sep  2 11:40:05 2009
@@ -118,7 +118,7 @@
     private static DirectoryService service;
 
     
-    @BeforeClass public static void setup() throws NamingException
+    @BeforeClass public static void setup() throws Exception
     {
         service = new DefaultDirectoryService();
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
Wed Sep  2 11:40:05 2009
@@ -79,7 +79,7 @@
     private static DirectoryService service;
 
     
-    @BeforeClass public static void init() throws NamingException
+    @BeforeClass public static void init() throws Exception
     {
         service = new DefaultDirectoryService();
     }

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
Wed Sep  2 11:40:05 2009
@@ -26,7 +26,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 
 import org.apache.directory.server.core.DefaultDirectoryService;
@@ -61,6 +60,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+
 /**
  * Tests {@link RelatedUserClassFilter}.
  *
@@ -95,7 +95,7 @@
     private static AttributeType SN_AT;
 
     
-    @BeforeClass public static void setup() throws NamingException
+    @BeforeClass public static void setup() throws Exception
     {
         service = new DefaultDirectoryService();
         OID_REGISTRY = service.getRegistries().getOidRegistry();

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
Wed Sep  2 11:40:05 2009
@@ -26,8 +26,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.authz.support.OperationScope;
@@ -77,7 +75,7 @@
     private static DirectoryService service;
 
     
-    @BeforeClass public static void setup() throws NamingException
+    @BeforeClass public static void setup() throws Exception
     {
         service = new DefaultDirectoryService();
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
Wed Sep  2 11:40:05 2009
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.subtree;
 
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
@@ -74,7 +72,7 @@
      * Initializes the global registries.
      * @throws javax.naming.NamingException if there is a failure loading the schema
      */
-    @BeforeClass public static void init() throws NamingException
+    @BeforeClass public static void init() throws Exception
     {
         service = new DefaultDirectoryService();
         registries = service.getRegistries();

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
Wed Sep  2 11:40:05 2009
@@ -67,7 +67,7 @@
      * Initializes the global registries.
      * @throws javax.naming.NamingException if there is a failure loading the schema
      */
-    @BeforeClass public static void init() throws NamingException
+    @BeforeClass public static void init() throws Exception
     {
         service = new DefaultDirectoryService();
         registries = service.getRegistries();

Modified: directory/apacheds/branches/apacheds-schema/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java
(original)
+++ directory/apacheds/branches/apacheds-schema/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java
Wed Sep  2 11:40:05 2009
@@ -20,10 +20,6 @@
 package org.apache.directory.server.dns;
 
 
-import java.io.IOException;
-
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
@@ -58,7 +54,7 @@
     /**
      * Start an instance of the DNS server.
      */
-    public void go() throws IOException, NamingException
+    public void go() throws Exception
     {
         LOG.debug( "Starting the DNS server" );
         

Modified: directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=810461&r1=810460&r2=810461&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
Wed Sep  2 11:40:05 2009
@@ -80,7 +80,7 @@
      * @param directoryService 
      * @param ldapServer
      */
-    public ApacheDS( LdapServer ldapServer )
+    public ApacheDS( LdapServer ldapServer ) throws Exception
     {
         LOG.info( "Starting the Apache Directory Server" );
 



Mime
View raw message