From commits-return-7481-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Dec 29 16:55:41 2005 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 41511 invoked from network); 29 Dec 2005 16:55:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Dec 2005 16:55:40 -0000 Received: (qmail 55431 invoked by uid 500); 29 Dec 2005 16:55:39 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 55380 invoked by uid 500); 29 Dec 2005 16:55:39 -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 55369 invoked by uid 99); 29 Dec 2005 16:55:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Dec 2005 08:55:39 -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; Thu, 29 Dec 2005 08:55:38 -0800 Received: (qmail 41368 invoked by uid 65534); 29 Dec 2005 16:55:18 -0000 Message-ID: <20051229165518.41365.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r359844 - in /directory/standalone/trunk/osgi: ldap/src/main/java/org/apache/ldap/LdapServer.java network/project.xml ntp/project.xml project.xml Date: Thu, 29 Dec 2005 16:55:17 -0000 To: commits@directory.apache.org From: erodriguez@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: erodriguez Date: Thu Dec 29 08:55:13 2005 New Revision: 359844 URL: http://svn.apache.org/viewcvs?rev=359844&view=rev Log: Updates to use MINA 0.9. Modified: directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java directory/standalone/trunk/osgi/network/project.xml directory/standalone/trunk/osgi/ntp/project.xml directory/standalone/trunk/osgi/project.xml Modified: directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java?rev=359844&r1=359843&r2=359844&view=diff ============================================================================== --- directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java (original) +++ directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapServer.java Thu Dec 29 08:55:13 2005 @@ -24,7 +24,6 @@ import org.apache.ldap.common.exception.LdapNamingException; import org.apache.ldap.server.protocol.LdapProtocolProvider; import org.apache.mina.common.TransportType; -import org.apache.mina.protocol.ProtocolProvider; import org.apache.mina.registry.Service; import org.apache.mina.registry.ServiceRegistry; import org.slf4j.Logger; @@ -36,7 +35,7 @@ private static final Logger log = LoggerFactory.getLogger( LdapServer.class ); private ServiceRegistry registry; - private ProtocolProvider provider; + private LdapProtocolProvider provider; private Service tcpService; private LdapConfig config; @@ -60,7 +59,7 @@ tcpService = new Service( name, TransportType.SOCKET, port ); - registry.bind( tcpService, provider ); + registry.bind( tcpService, provider.getHandler() ); log.debug( name + " listening on port " + port ); } Modified: directory/standalone/trunk/osgi/network/project.xml URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/network/project.xml?rev=359844&r1=359843&r2=359844&view=diff ============================================================================== --- directory/standalone/trunk/osgi/network/project.xml (original) +++ directory/standalone/trunk/osgi/network/project.xml Thu Dec 29 08:55:13 2005 @@ -6,7 +6,7 @@ 0.1.1 org.osgi.framework - org.apache.mina.protocol.handler,org.apache.mina,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.protocol.codec,org.apache.mina.common + org.apache.mina.protocol.handler,org.apache.mina,org.apache.mina.registry,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.common org.apache.mina Apache MINA Network Service Registry @@ -15,11 +15,10 @@ directory-network mina - 0.7.3-SNAPSHOT + 0.9.0-SNAPSHOT true - Modified: directory/standalone/trunk/osgi/ntp/project.xml URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/ntp/project.xml?rev=359844&r1=359843&r2=359844&view=diff ============================================================================== --- directory/standalone/trunk/osgi/ntp/project.xml (original) +++ directory/standalone/trunk/osgi/ntp/project.xml Thu Dec 29 08:55:13 2005 @@ -7,7 +7,7 @@ Network Service org.apache.ntp.Activator - org.apache.ldap.server.configuration,org.ungoverned.gravity.servicebinder,org.osgi.framework,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.common,org.osgi.service.cm + org.apache.ldap.server.configuration,org.ungoverned.gravity.servicebinder,org.osgi.framework,org.apache.mina.registry,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.common,org.osgi.service.cm org.apache.ntp Apache NTP Network Service @@ -16,7 +16,7 @@ directory-protocols ntp-protocol - 0.1-SNAPSHOT + 0.5-SNAPSHOT true Modified: directory/standalone/trunk/osgi/project.xml URL: http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/project.xml?rev=359844&r1=359843&r2=359844&view=diff ============================================================================== --- directory/standalone/trunk/osgi/project.xml (original) +++ directory/standalone/trunk/osgi/project.xml Thu Dec 29 08:55:13 2005 @@ -84,7 +84,7 @@ directory apacheds-core - 0.9.3-SNAPSHOT + 0.9.4-SNAPSHOT directory-shared @@ -126,7 +126,7 @@ directory-network mina - 0.8.0 + 0.9.0-SNAPSHOT maven