Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@directory.apache.org
Message-ID: <20060220080852.32086.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r379049 -
 /directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
Date: Mon, 20 Feb 2006 08:08:51 -0000
To: commits@directory.apache.org
From: trustin@apache.org

Author: trustin
Date: Mon Feb 20 00:08:49 2006
New Revision: 379049

URL: http://svn.apache.org/viewcvs?rev=379049&view=rev
Log:
Fixed compilation errors in 'apacheds-protocol-changepw'

Modified:
    directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java?rev=379049&r1=379048&r2=379049&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java Mon Feb 20 00:08:49 2006
@@ -19,14 +19,13 @@
 
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.util.Dictionary;
 
 import org.apache.directory.server.changepw.protocol.ChangePasswordProtocolHandler;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
+import org.apache.mina.common.IoAcceptor;
 import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.TransportType;
-import org.apache.mina.registry.Service;
-import org.apache.mina.registry.ServiceRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,18 +43,15 @@
     private static final Logger log = LoggerFactory.getLogger( ChangePasswordServer.class );
 
     private ChangePasswordConfiguration config;
-    private ServiceRegistry registry;
+    private IoAcceptor acceptor;
     private PrincipalStore store;
 
     private IoHandler handler;
-    private Service tcpService;
-    private Service udpService;
 
-
-    public ChangePasswordServer(ChangePasswordConfiguration config, ServiceRegistry registry, PrincipalStore store)
+    public ChangePasswordServer(ChangePasswordConfiguration config, IoAcceptor acceptor, PrincipalStore store)
     {
         this.config = config;
-        this.registry = registry;
+        this.acceptor = acceptor;
         this.store = store;
 
         String name = config.getName();
@@ -65,11 +61,7 @@
         {
             handler = new ChangePasswordProtocolHandler( config, this.store );
 
-            udpService = new Service( name, TransportType.DATAGRAM, port );
-            tcpService = new Service( name, TransportType.SOCKET, port );
-
-            registry.bind( udpService, handler );
-            registry.bind( tcpService, handler );
+            acceptor.bind( new InetSocketAddress( port ), handler );
 
             log.debug( "{} listening on port {}", name, new Integer( port ) );
         }
@@ -88,13 +80,10 @@
 
     public void destroy()
     {
-        registry.unbind( udpService );
-        registry.unbind( tcpService );
+        acceptor.unbind( new InetSocketAddress( config.getPort() ) );
 
-        registry = null;
+        acceptor = null;
         handler = null;
-        udpService = null;
-        tcpService = null;
 
         log.debug( "{} has stopped listening on port {}", config.getName(), new Integer( config.getPort() ) );
     }