directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r704004 - in /directory/installers/trunk: apacheds-noarch/src/main/java/org/apache/directory/server/Service.java pom.xml
Date Mon, 13 Oct 2008 10:14:18 GMT
Author: pamarcelot
Date: Mon Oct 13 03:14:18 2008
New Revision: 704004

URL: http://svn.apache.org/viewvc?rev=704004&view=rev
Log:
Rollback of Emmanuel's commit (#703486 'First version with MINA 2.0.0-M3').

Modified:
    directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
    directory/installers/trunk/pom.xml

Modified: directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java?rev=704004&r1=704003&r2=704004&view=diff
==============================================================================
--- directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
(original)
+++ directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
Mon Oct 13 03:14:18 2008
@@ -28,7 +28,7 @@
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.ldap.LdapService;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.apache.directory.server.protocol.shared.SocketAcceptor;
 import org.apache.xbean.spring.context.FileSystemXmlApplicationContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,7 +65,7 @@
             LOG.info( "server: using default settings ..." );
             DirectoryService directoryService = new DefaultDirectoryService();
             directoryService.startup();
-            NioSocketAcceptor socketAcceptor = new NioSocketAcceptor( null );
+            SocketAcceptor socketAcceptor = new SocketAcceptor( null );
             LdapService ldapService = new LdapService();
             ldapService.setSocketAcceptor( socketAcceptor );
             ldapService.setDirectoryService( directoryService );

Modified: directory/installers/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/trunk/pom.xml?rev=704004&r1=704003&r2=704004&view=diff
==============================================================================
--- directory/installers/trunk/pom.xml (original)
+++ directory/installers/trunk/pom.xml Mon Oct 13 03:14:18 2008
@@ -154,7 +154,13 @@
       <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-core</artifactId>
-        <version>2.0.0-M4-SNAPSHOT</version>
+        <version>1.1.7</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-filter-ssl</artifactId>
+        <version>1.1.7</version>
       </dependency>
 
       <dependency>



Mime
View raw message