You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2007/05/29 04:35:45 UTC
svn commit: r542385 - in /directory/apacheds/trunk/protocol-ldap: pom.xml
src/main/java/org/apache/directory/server/ldap/LdapConfiguration.java
src/main/java/org/apache/directory/server/ldap/support/bind/ConfigureChain.java
Author: erodriguez
Date: Mon May 28 19:35:44 2007
New Revision: 542385
URL: http://svn.apache.org/viewvc?view=rev&rev=542385
Log:
Collateral updates to protocol-ldap to reflect changes in protocol-shared.
Modified:
directory/apacheds/trunk/protocol-ldap/pom.xml
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapConfiguration.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/ConfigureChain.java
Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?view=diff&rev=542385&r1=542384&r2=542385
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Mon May 28 19:35:44 2007
@@ -38,6 +38,18 @@
<artifactId>apacheds-kerberos-shared</artifactId>
<version>${pom.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-shared</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapConfiguration.java?view=diff&rev=542385&r1=542384&r2=542385
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapConfiguration.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapConfiguration.java Mon May 28 19:35:44 2007
@@ -26,8 +26,8 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.server.core.configuration.ConfigurationException;
import org.apache.directory.server.protocol.shared.ServiceConfiguration;
+import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
/**
@@ -155,7 +155,7 @@
{
if ( ldapsCertificateFile == null )
{
- throw new ConfigurationException( "LdapsCertificateFile cannot be null." );
+ throw new ServiceConfigurationException( "LdapsCertificateFile cannot be null." );
}
this.ldapsCertificateFile = ldapsCertificateFile;
}
@@ -185,7 +185,7 @@
{
if ( ldapsCertificatePassword == null )
{
- throw new ConfigurationException( "LdapsCertificatePassword cannot be null." );
+ throw new ServiceConfigurationException( "LdapsCertificatePassword cannot be null." );
}
this.ldapsCertificatePassword = ldapsCertificatePassword;
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/ConfigureChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/ConfigureChain.java?view=diff&rev=542385&r1=542384&r2=542385
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/ConfigureChain.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/ConfigureChain.java Mon May 28 19:35:44 2007
@@ -38,12 +38,12 @@
import javax.security.auth.kerberos.KerberosPrincipal;
import javax.security.sasl.Sasl;
-import org.apache.directory.server.core.configuration.ConfigurationException;
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
import org.apache.directory.server.ldap.LdapConfiguration;
import org.apache.directory.server.ldap.constants.SupportedSASLMechanisms;
+import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
import org.apache.directory.server.protocol.shared.store.ContextOperation;
import org.apache.mina.common.IoSession;
import org.apache.mina.handler.chain.IoHandlerCommand;
@@ -83,10 +83,10 @@
Subject saslSubject = getSubject( config );
session.setAttribute( "saslSubject", saslSubject );
}
- catch ( ConfigurationException ce )
+ catch ( ServiceConfigurationException sce )
{
activeMechanisms.remove( "GSSAPI" );
- log.warn( ce.getMessage(), ce );
+ log.warn( sce.getMessage(), sce );
}
}
@@ -170,7 +170,7 @@
}
- private Subject getSubject( LdapConfiguration config ) throws ConfigurationException
+ private Subject getSubject( LdapConfiguration config ) throws ServiceConfigurationException
{
String servicePrincipalName = config.getSaslPrincipal();
@@ -187,14 +187,14 @@
{
String message = "Service principal " + servicePrincipalName + " not found at search base DN "
+ config.getSearchBaseDn() + ".";
- throw new ConfigurationException( message, e );
+ throw new ServiceConfigurationException( message, e );
}
if ( entry == null )
{
String message = "Service principal " + servicePrincipalName + " not found at search base DN "
+ config.getSearchBaseDn() + ".";
- throw new ConfigurationException( message );
+ throw new ServiceConfigurationException( message );
}
EncryptionKey key = entry.getKeyMap().get( EncryptionType.DES_CBC_MD5 );
@@ -223,7 +223,7 @@
catch ( NamingException ne )
{
String message = "Failed to get initial context " + ( String ) env.get( Context.PROVIDER_URL );
- throw new ConfigurationException( message, ne );
+ throw new ServiceConfigurationException( message, ne );
}
}
@@ -233,7 +233,7 @@
private Hashtable<String, Object> getEnvironment( LdapConfiguration config )
{
- Hashtable<String, Object> env = new Hashtable<String, Object>( config.toJndiEnvironment() );
+ Hashtable<String, Object> env = new Hashtable<String, Object>();
env.put( Context.INITIAL_CONTEXT_FACTORY, config.getInitialContextFactory() );
env.put( Context.PROVIDER_URL, config.getSearchBaseDn() );
env.put( Context.SECURITY_AUTHENTICATION, config.getSecurityAuthentication() );