You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2010/03/16 15:34:00 UTC
svn commit: r923757 - in /directory/apacheds/trunk:
jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
protocol-changepw/src/main/java/org/apache/directory/server/changepw/
protocol-kerberos/src/main/java/org/apache/directory...
Author: kayyagari
Date: Tue Mar 16 14:33:59 2010
New Revision: 923757
URL: http://svn.apache.org/viewvc?rev=923757&view=rev
Log:
few more exceptions were replaced
Modified:
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java?rev=923757&r1=923756&r2=923757&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java Tue Mar 16 14:33:59 2010
@@ -20,21 +20,20 @@
package org.apache.directory.server.core.partition.tree;
-import javax.naming.NamingException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.tree.DnBranchNode;
import org.apache.directory.shared.ldap.util.tree.DnLeafNode;
import org.apache.directory.shared.ldap.util.tree.DnNode;
import org.junit.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
/**
* Test the partition tree manipulations.
@@ -47,7 +46,7 @@ public class PartitionTreeTest
/**
* Test the addition of a single partition
*/
- @Test public void testNewPartitionTree() throws NamingException
+ @Test public void testNewPartitionTree() throws LdapException
{
/** A structure to hold all the partitions */
DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
@@ -74,7 +73,7 @@ public class PartitionTreeTest
/**
* Test the addition of a two disjointed partition
*/
- @Test public void testNewPartitionTree2Nodes() throws NamingException
+ @Test public void testNewPartitionTree2Nodes() throws LdapException
{
/** A structure to hold all the partitions */
DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
@@ -113,7 +112,7 @@ public class PartitionTreeTest
/**
* Test the addition of a two overlapping partitions
*/
- @Test public void testNewPartitionTree2OverlapingNodes() throws NamingException
+ @Test public void testNewPartitionTree2OverlapingNodes() throws LdapException
{
/** A structure to hold all the partitions */
DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
@@ -133,7 +132,7 @@ public class PartitionTreeTest
partitionLookupTree.add( suffix2, partition2 );
fail();
}
- catch ( NamingException ne )
+ catch ( LdapException ne )
{
assertTrue( true );
}
@@ -143,7 +142,7 @@ public class PartitionTreeTest
/**
* Test the addition of a two partitions with the same root
*/
- @Test public void testNewPartitionTree2NodesWithSameRoot() throws NamingException
+ @Test public void testNewPartitionTree2NodesWithSameRoot() throws LdapException
{
/** A structure to hold all the partitions */
DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
Modified: directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java?rev=923757&r1=923756&r2=923757&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java (original)
+++ directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java Tue Mar 16 14:33:59 2010
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.naming.InvalidNameException;
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.directory.server.changepw.protocol.ChangePasswordProtocolHandler;
@@ -36,6 +35,7 @@ import org.apache.directory.server.proto
import org.apache.directory.server.protocol.shared.transport.TcpTransport;
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.directory.server.protocol.shared.transport.UdpTransport;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.transport.socket.DatagramAcceptor;
@@ -269,7 +269,7 @@ public class ChangePasswordServer extend
/**
* @throws IOException if we cannot bind to the specified ports
*/
- public void start() throws IOException, InvalidNameException
+ public void start() throws IOException, LdapInvalidDnException
{
PrincipalStore store = new DirectoryPrincipalStore( getDirectoryService(), new DN(this.getSearchBaseDn()) );
Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java?rev=923757&r1=923756&r2=923757&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java Tue Mar 16 14:33:59 2010
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-import javax.naming.InvalidNameException;
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.directory.server.constants.ServerDNConstants;
@@ -38,6 +37,7 @@ import org.apache.directory.server.proto
import org.apache.directory.server.protocol.shared.transport.TcpTransport;
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.directory.server.protocol.shared.transport.UdpTransport;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.filterchain.IoFilterChainBuilder;
@@ -435,7 +435,7 @@ public class KdcServer extends Directory
/**
* @throws IOException if we cannot bind to the sockets
*/
- public void start() throws IOException, InvalidNameException
+ public void start() throws IOException, LdapInvalidDnException
{
PrincipalStore store;