directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r516636 - in /directory/apacheds/branches/apacheds-sasl-branch: protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ssl/ server-jndi/ server-jndi/src/main/java/org/apache/directory/server/jndi/ server-main/
Date Sat, 10 Mar 2007 01:38:24 GMT
Author: erodriguez
Date: Fri Mar  9 17:38:24 2007
New Revision: 516636

URL: http://svn.apache.org/viewvc?view=rev&rev=516636
Log:
o  Minor clean-up from the server-ssl module deletion.
o  Insertion of SaslFilter into LDAP filter chain in ServerContextFactory to enable SASL.

Modified:
    directory/apacheds/branches/apacheds-sasl-branch/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ssl/LdapsInitializer.java
    directory/apacheds/branches/apacheds-sasl-branch/server-jndi/pom.xml
    directory/apacheds/branches/apacheds-sasl-branch/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
    directory/apacheds/branches/apacheds-sasl-branch/server-main/pom.xml

Modified: directory/apacheds/branches/apacheds-sasl-branch/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ssl/LdapsInitializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ssl/LdapsInitializer.java?view=diff&rev=516636&r1=516635&r2=516636
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ssl/LdapsInitializer.java
(original)
+++ directory/apacheds/branches/apacheds-sasl-branch/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ssl/LdapsInitializer.java
Fri Mar  9 17:38:24 2007
@@ -34,7 +34,6 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
-import org.apache.directory.server.ssl.support.ServerX509TrustManager;
 import org.apache.mina.common.DefaultIoFilterChainBuilder;
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.filter.SSLFilter;

Modified: directory/apacheds/branches/apacheds-sasl-branch/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-jndi/pom.xml?view=diff&rev=516636&r1=516635&r2=516636
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/server-jndi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/server-jndi/pom.xml Fri Mar  9 17:38:24
2007
@@ -51,11 +51,6 @@
       <artifactId>apacheds-core</artifactId>
       <version>${pom.version}</version>
     </dependency>  
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-ssl</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
   </dependencies>
 </project>
 

Modified: directory/apacheds/branches/apacheds-sasl-branch/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?view=diff&rev=516636&r1=516635&r2=516636
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
(original)
+++ directory/apacheds/branches/apacheds-sasl-branch/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
Fri Mar  9 17:38:24 2007
@@ -47,11 +47,12 @@
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapProtocolProvider;
+import org.apache.directory.server.ldap.support.bind.SaslFilter;
+import org.apache.directory.server.ldap.support.ssl.LdapsInitializer;
 import org.apache.directory.server.ntp.NtpConfiguration;
 import org.apache.directory.server.ntp.NtpServer;
 import org.apache.directory.server.protocol.shared.LoadStrategy;
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
-import org.apache.directory.server.ssl.LdapsInitializer;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
@@ -67,7 +68,6 @@
 import org.apache.mina.transport.socket.nio.SocketAcceptor;
 import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
 import org.apache.mina.transport.socket.nio.SocketSessionConfig;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -398,7 +398,10 @@
             return;
         }
 
-        startLDAP0( cfg, env, port, new DefaultIoFilterChainBuilder() );
+        DefaultIoFilterChainBuilder chain = new DefaultIoFilterChainBuilder();
+        chain.addLast( "SASL", new SaslFilter() );
+
+        startLDAP0( cfg, env, port, chain );
     }
 
 
@@ -415,7 +418,10 @@
             return;
         }
 
-        IoFilterChainBuilder chain = LdapsInitializer.init( cfg );
+        char[] certPasswordChars = cfg.getLdapsCertificatePassword().toCharArray();
+        String storePath = cfg.getLdapsCertificateFile().getPath();
+
+        IoFilterChainBuilder chain = LdapsInitializer.init( certPasswordChars, storePath
);
         ldapsStarted = true;
 
         startLDAP0( cfg, env, cfg.getLdapsPort(), chain );

Modified: directory/apacheds/branches/apacheds-sasl-branch/server-main/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-main/pom.xml?view=diff&rev=516636&r1=516635&r2=516636
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/server-main/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/server-main/pom.xml Fri Mar  9 17:38:24
2007
@@ -12,9 +12,9 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-ssl</artifactId>
+      <artifactId>apacheds-server-jndi</artifactId>
       <version>${pom.version}</version>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>



Mime
View raw message