directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379313 - in /directory/trunks: apacheds/core/src/main/java/org/apache/directory/server/core/configuration/ apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ apacheds/server-sar/src/main/java/org/apache/dir...
Date Tue, 21 Feb 2006 02:52:47 GMT
Author: akarasulu
Date: Mon Feb 20 18:52:45 2006
New Revision: 379313

URL: http://svn.apache.org/viewcvs?rev=379313&view=rev
Log:
slight changes with exceptions thrown

Modified:
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java
    directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
    directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java
    directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapConfigurationException.java

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java?rev=379313&r1=379312&r2=379313&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfiguration.java
Mon Feb 20 18:52:45 2006
@@ -32,6 +32,7 @@
 import org.apache.directory.server.core.partition.Oid;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmDirectoryPartition;
 import org.apache.directory.server.core.schema.MatchingRuleRegistry;
+import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.name.LdapName;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 
@@ -194,7 +195,7 @@
     /**
      * Sets the suffix of the {@link DirectoryPartition}.
      */
-    protected void setSuffix( String suffix )
+    protected void setSuffix( String suffix ) throws NamingException
     {
         suffix = suffix.trim();
         try
@@ -203,7 +204,7 @@
         }
         catch ( NamingException e )
         {
-            throw new ConfigurationException( "Failed to normalize the suffix: " + suffix
);
+            throw new LdapConfigurationException( "Failed to normalize the suffix: " + suffix,
e );
         }
         this.suffix = suffix;
     }

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java?rev=379313&r1=379312&r2=379313&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableDirectoryPartitionConfiguration.java
Mon Feb 20 18:52:45 2006
@@ -21,6 +21,7 @@
 
 import java.util.Set;
 
+import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
 import org.apache.directory.server.core.partition.DirectoryPartition;
@@ -66,7 +67,7 @@
     }
 
 
-    public void setSuffix( String suffix )
+    public void setSuffix( String suffix ) throws NamingException
     {
         super.setSuffix( suffix );
     }

Modified: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java?rev=379313&r1=379312&r2=379313&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
(original)
+++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
Mon Feb 20 18:52:45 2006
@@ -140,7 +140,7 @@
     }
 
 
-    protected Hashtable setUpPartition()
+    protected Hashtable setUpPartition() throws NamingException
     {
         config = new MutableStartupConfiguration();
 
@@ -164,7 +164,7 @@
     }
 
 
-    private DirectoryPartitionConfiguration getExamplePartition()
+    private DirectoryPartitionConfiguration getExamplePartition() throws NamingException
     {
         MutableDirectoryPartitionConfiguration partConfig = new MutableDirectoryPartitionConfiguration();
         partConfig.setName( "example" );
@@ -191,7 +191,7 @@
     }
 
 
-    private DirectoryPartitionConfiguration getApachePartition()
+    private DirectoryPartitionConfiguration getApachePartition() throws NamingException
     {
         MutableDirectoryPartitionConfiguration partConfig = new MutableDirectoryPartitionConfiguration();
         partConfig.setName( "apache" );

Modified: directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java?rev=379313&r1=379312&r2=379313&view=diff
==============================================================================
--- directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java
(original)
+++ directory/trunks/apacheds/server-sar/src/main/java/org/apache/directory/server/sar/DirectoryService.java
Mon Feb 20 18:52:45 2006
@@ -297,7 +297,7 @@
     }
 
 
-    private Set addCustomPartition()
+    private Set addCustomPartition() throws NamingException
     {
         BasicAttributes attrs;
         Set indexedAttrs;

Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java?rev=379313&r1=379312&r2=379313&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
(original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
Mon Feb 20 18:52:45 2006
@@ -30,9 +30,9 @@
 import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 
-import org.apache.directory.server.core.configuration.ConfigurationException;
 import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 
 
 /**
@@ -277,6 +277,7 @@
         assertTrue( attribute.contains( "domain" ) );
     }
 
+    
     public void testBadPartition() throws Exception
     {
         MutableDirectoryPartitionConfiguration pcfg;
@@ -289,7 +290,7 @@
         {
             pcfg.setSuffix( "ou=test=testing" );
         }
-        catch ( ConfigurationException ce )
+        catch ( LdapConfigurationException ce )
         {
             assertTrue( true );
             return;

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapConfigurationException.java
URL: http://svn.apache.org/viewcvs/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapConfigurationException.java?rev=379313&r1=379312&r2=379313&view=diff
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapConfigurationException.java
(original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapConfigurationException.java
Mon Feb 20 18:52:45 2006
@@ -49,11 +49,21 @@
 
 
     /**
-     * @see javax.naming.NoPermissionException#NoPermissionException(String)
+     * @see javax.naming.NoPermissionException#NoPermissionException( String )
      */
-    public LdapConfigurationException(String explanation)
+    public LdapConfigurationException( String explanation )
     {
         super( explanation );
+    }
+
+
+    /**
+     * @see javax.naming.NoPermissionException#NoPermissionException( String )
+     */
+    public LdapConfigurationException( String explanation, Throwable t )
+    {
+        super( explanation );
+        super.setRootCause( t );
     }
 
 



Mime
View raw message