Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 85256 invoked from network); 20 Jan 2006 14:22:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Jan 2006 14:22:26 -0000 Received: (qmail 17473 invoked by uid 500); 20 Jan 2006 14:22:11 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 17439 invoked by uid 500); 20 Jan 2006 14:22:11 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 17428 invoked by uid 99); 20 Jan 2006 14:22:11 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jan 2006 06:22:11 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 20 Jan 2006 06:22:10 -0800 Received: (qmail 84800 invoked by uid 65534); 20 Jan 2006 14:21:35 -0000 Message-ID: <20060120142135.84776.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r370813 - in /directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina: common/IoServiceProvider.java transport/socket/nio/NioServiceProvider.java transport/vmpipe/VmPipeServiceProvider.java Date: Fri, 20 Jan 2006 14:21:26 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trustin Date: Fri Jan 20 06:21:21 2006 New Revision: 370813 URL: http://svn.apache.org/viewcvs?rev=370813&view=rev Log: Changed the interface of IoServiceProvider so the change can happen gradually. Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoServiceProvider.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/NioServiceProvider.java directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoServiceProvider.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoServiceProvider.java?rev=370813&r1=370812&r2=370813&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoServiceProvider.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/IoServiceProvider.java Fri Jan 20 06:21:21 2006 @@ -1,9 +1,31 @@ +/* + * @(#) $Id$ + * + * Copyright 2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.mina.common; - +/** + * + * @author The Apache Directory Project (dev@directory.apache.org) + * @version $Rev$, $Date$ + */ public interface IoServiceProvider { String getName(); - IoAcceptor getAcceptor( IoAddress address ); - IoConnector getConnector( IoAddress address ); + IoAcceptor newAcceptor( String transportType ); + IoConnector newConnector( String transportType ); } Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/NioServiceProvider.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/NioServiceProvider.java?rev=370813&r1=370812&r2=370813&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/NioServiceProvider.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/NioServiceProvider.java Fri Jan 20 06:21:21 2006 @@ -19,7 +19,6 @@ package org.apache.mina.transport.socket.nio; import org.apache.mina.common.IoAcceptor; -import org.apache.mina.common.IoAddress; import org.apache.mina.common.IoConnector; import org.apache.mina.common.IoServiceProvider; @@ -30,14 +29,31 @@ return "nio"; } - public IoAcceptor getAcceptor( IoAddress address ) + public IoAcceptor newAcceptor( String transportType ) { + if( "socket".equals( transportType ) ) + { + return new SocketAcceptor(); + } + else if ( "datagram".equals( transportType ) ) + { + return new DatagramAcceptor(); + } + return null; } - public IoConnector getConnector( IoAddress address ) + public IoConnector newConnector( String transportType ) { + if( "socket".equals( transportType ) ) + { + return new SocketConnector(); + } + else if ( "datagram".equals( transportType ) ) + { + return new DatagramConnector(); + } + return null; } - } Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java?rev=370813&r1=370812&r2=370813&view=diff ============================================================================== --- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java (original) +++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java Fri Jan 20 06:21:21 2006 @@ -19,7 +19,6 @@ package org.apache.mina.transport.vmpipe; import org.apache.mina.common.IoAcceptor; -import org.apache.mina.common.IoAddress; import org.apache.mina.common.IoConnector; import org.apache.mina.common.IoServiceProvider; @@ -31,13 +30,23 @@ return "vm"; } - public IoAcceptor getAcceptor( IoAddress address ) + public IoAcceptor newAcceptor( String transportType ) { + if( "pipe".equals( transportType ) ) + { + return new VmPipeAcceptor(); + } + return null; } - public IoConnector getConnector( IoAddress address ) + public IoConnector newConnector( String transportType ) { + if( "pipe".equals( transportType ) ) + { + return new VmPipeConnector(); + } + return null; }