You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/05/22 00:13:18 UTC
svn commit: r658901 - in /directory/apacheds/branches/bigbang:
interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/
protocol-ldap/src/main/java/org/apache/directory/server/ldap/
protocol-ldap/src/main/java/org/apache/directory/...
Author: akarasulu
Date: Wed May 21 15:13:17 2008
New Revision: 658901
URL: http://svn.apache.org/viewvc?rev=658901&view=rev
Log:
fixing compilation problems with NamingEnums and NamingExceptions
Modified:
directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java
directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
Modified: directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=658901&r1=658900&r2=658901&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Wed May 21 15:13:17 2008
@@ -128,7 +128,7 @@
* the special keyword 'randomKey', set random keys for the principal. Set the key version number (kvno)
* to '0'.
*/
- public void add( NextInterceptor next, AddOperationContext addContext ) throws NamingException
+ public void add( NextInterceptor next, AddOperationContext addContext ) throws Exception
{
LdapDN normName = addContext.getDn();
@@ -183,7 +183,7 @@
*
* If the 'userPassword' is the special keyword 'randomKey', set random keys for the principal.
*/
- public void modify( NextInterceptor next, ModifyOperationContext modContext ) throws NamingException
+ public void modify( NextInterceptor next, ModifyOperationContext modContext ) throws Exception
{
ModifySubContext subContext = new ModifySubContext();
Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=658901&r1=658900&r2=658901&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Wed May 21 15:13:17 2008
@@ -118,7 +118,6 @@
*/
public class LdapServer extends DirectoryBackedService
{
- @SuppressWarnings( { "UnusedDeclaration" } )
private static final long serialVersionUID = 3757127143811666817L;
/** logger for this class */
@@ -298,7 +297,7 @@
* @throws IOException if we cannot bind to the specified port
* @throws NamingException if the LDAP server cannot be started
*/
- public void start() throws NamingException, IOException
+ public void start() throws Exception
{
if ( ! isEnabled() )
{
@@ -400,7 +399,7 @@
private void startLDAP0( int port, IoFilterChainBuilder chainBuilder )
- throws NamingException
+ throws Exception
{
PartitionNexus nexus = getDirectoryService().getPartitionNexus();
@@ -475,7 +474,7 @@
* @param eoh an extended operation handler
* @throws NamingException on failure to add the handler
*/
- public void addExtendedOperationHandler( ExtendedOperationHandler eoh ) throws NamingException
+ public void addExtendedOperationHandler( ExtendedOperationHandler eoh ) throws Exception
{
if ( started )
{
Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java?rev=658901&r1=658900&r2=658901&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java (original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java Wed May 21 15:13:17 2008
@@ -28,7 +28,6 @@
import java.util.Iterator;
import java.util.Set;
-import javax.naming.NamingException;
import javax.naming.ldap.LdapContext;
import javax.swing.JFrame;
@@ -51,6 +50,7 @@
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.mina.common.IoSession;
+
/**
* @org.apache.xbean.XBean
*
@@ -77,7 +77,7 @@
public void handleExtendedOperation( IoSession requestor, SessionRegistry registry, ExtendedRequest req )
- throws NamingException
+ throws Exception
{
LdapContext ctx = registry.getLdapContext( requestor, null, false );
ctx = ( LdapContext ) ctx.lookup( "" );
Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java?rev=658901&r1=658900&r2=658901&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java Wed May 21 15:13:17 2008
@@ -30,7 +30,6 @@
import org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler;
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import javax.naming.NamingException;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -46,7 +45,7 @@
public class LdapServerSettingsTest
{
@Test
- public void testAddExtendedOperationHandler() throws NamingException
+ public void testAddExtendedOperationHandler() throws Exception
{
LdapServer server = new LdapServer();
StartTlsHandler handler = new StartTlsHandler();
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=658901&r1=658900&r2=658901&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 Wed May 21 15:13:17 2008
@@ -40,7 +40,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
@@ -119,7 +118,7 @@
* @throws NamingException If the server cannot be started
* @throws IOException If an IO error occured while reading some file
*/
- public void startup() throws NamingException, IOException
+ public void startup() throws Exception
{
LOG.debug( "Starting the server" );
@@ -163,7 +162,7 @@
}
- public void shutdown() throws NamingException
+ public void shutdown() throws Exception
{
if ( ldapServer != null && ldapServer.isStarted() )
{
@@ -271,7 +270,7 @@
root.createSubcontext( ServerDNConstants.LDIF_FILES_DN, entry );
LOG.info( "Creating " + ServerDNConstants.LDIF_FILES_DN );
}
- catch ( NamingException e )
+ catch ( Exception e )
{
LOG.info( ServerDNConstants.LDIF_FILES_DN + " exists" );
}
@@ -297,7 +296,7 @@
}
- private void addFileEntry( DirContext root, File ldif ) throws NamingException
+ private void addFileEntry( DirContext root, File ldif ) throws Exception
{
String rdnAttr = File.separatorChar == '\\' ?
ApacheSchemaConstants.WINDOWS_FILE_AT :
@@ -324,7 +323,7 @@
return root.getAttributes( buildProtectedFileEntry( ldif ), new String[]
{ SchemaConstants.CREATE_TIMESTAMP_AT } );
}
- catch ( NamingException e )
+ catch ( Exception e )
{
return null;
}
@@ -356,7 +355,7 @@
* @param ldifFile The ldif file to read
* @throws NamingException If something went wrong while loading the entries
*/
- private void loadLdif( DirContext root, File ldifFile ) throws NamingException
+ private void loadLdif( DirContext root, File ldifFile ) throws Exception
{
Attributes fileEntry = getLdifFileEntry( root, ldifFile );
@@ -379,7 +378,7 @@
/**
* Load the ldif files if there are some
*/
- public void loadLdifs() throws NamingException
+ public void loadLdifs() throws Exception
{
// LOG and bail if property not set
if ( ldifDirectory == null )
@@ -422,7 +421,7 @@
{
loadLdif( root, ldifDirectory );
}
- catch ( NamingException ne )
+ catch ( Exception ne )
{
// If the file can't be read, log the error, and stop
// loading LDIFs.
@@ -460,7 +459,7 @@
LOG.info( "Loading LDIF file '{}'", ldifFile.getName() );
loadLdif( root, ldifFile );
}
- catch ( NamingException ne )
+ catch ( Exception ne )
{
// If the file can't be read, log the error, and stop
// loading LDIFs.