Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 90678 invoked from network); 5 Sep 2006 16:40:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Sep 2006 16:40:55 -0000 Received: (qmail 55792 invoked by uid 500); 5 Sep 2006 16:40:53 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 55741 invoked by uid 500); 5 Sep 2006 16:40:52 -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 55708 invoked by uid 99); 5 Sep 2006 16:40:52 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Sep 2006 09:40:52 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Sep 2006 09:40:51 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 652811A981A; Tue, 5 Sep 2006 09:40:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r440393 - in /directory/branches/apacheds/1.0: kerberos-shared/ protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ protocol-dhcp/ protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/ protocol-dn... Date: Tue, 05 Sep 2006 16:40:30 -0000 To: commits@directory.apache.org From: ersiner@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060905164031.652811A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ersiner Date: Tue Sep 5 09:40:29 2006 New Revision: 440393 URL: http://svn.apache.org/viewvc?view=rev&rev=440393 Log: Fixed codes incompatible with new MINA (0.9.5) APIs. Fixed dependency versions on some poms. Upgraded MANIFEST.MF to reflect latest MINA release. Modified: directory/branches/apacheds/1.0/kerberos-shared/pom.xml directory/branches/apacheds/1.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java directory/branches/apacheds/1.0/protocol-dhcp/pom.xml directory/branches/apacheds/1.0/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java directory/branches/apacheds/1.0/protocol-dns/pom.xml directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsDecoder.java directory/branches/apacheds/1.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java directory/branches/apacheds/1.0/protocol-ldap/pom.xml directory/branches/apacheds/1.0/protocol-ntp/pom.xml directory/branches/apacheds/1.0/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java directory/branches/apacheds/1.0/server-sar/pom.xml directory/branches/apacheds/1.0/server-ssl/pom.xml directory/branches/apacheds/1.0/server-tools/pom.xml directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF Modified: directory/branches/apacheds/1.0/kerberos-shared/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/kerberos-shared/pom.xml?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/kerberos-shared/pom.xml (original) +++ directory/branches/apacheds/1.0/kerberos-shared/pom.xml Tue Sep 5 09:40:29 2006 @@ -21,7 +21,7 @@ org.apache.directory.mina mina-core - 0.9.4 + 0.9.5 org.apache.directory.server Modified: directory/branches/apacheds/1.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java (original) +++ directory/branches/apacheds/1.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java Tue Sep 5 09:40:29 2006 @@ -42,4 +42,10 @@ public void dispose( IoSession session ) throws Exception { } + + + public void finishDecode( IoSession session, ProtocolDecoderOutput out ) throws Exception + { + // TODO Auto-generated method stub + } } Modified: directory/branches/apacheds/1.0/protocol-dhcp/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-dhcp/pom.xml?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/protocol-dhcp/pom.xml (original) +++ directory/branches/apacheds/1.0/protocol-dhcp/pom.xml Tue Sep 5 09:40:29 2006 @@ -28,7 +28,7 @@ org.apache.directory.mina mina-core - 0.9.4 + 0.9.5 org.apache.directory.server Modified: directory/branches/apacheds/1.0/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java (original) +++ directory/branches/apacheds/1.0/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java Tue Sep 5 09:40:29 2006 @@ -41,4 +41,10 @@ public void dispose( IoSession arg0 ) throws Exception { } + + + public void finishDecode( IoSession session, ProtocolDecoderOutput out ) throws Exception + { + // TODO Auto-generated method stub + } } Modified: directory/branches/apacheds/1.0/protocol-dns/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-dns/pom.xml?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/protocol-dns/pom.xml (original) +++ directory/branches/apacheds/1.0/protocol-dns/pom.xml Tue Sep 5 09:40:29 2006 @@ -22,7 +22,7 @@ org.apache.directory.mina mina-core - 0.9.4 + 0.9.5 org.apache.directory.server Modified: directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsDecoder.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsDecoder.java?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsDecoder.java (original) +++ directory/branches/apacheds/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsDecoder.java Tue Sep 5 09:40:29 2006 @@ -264,4 +264,10 @@ public void dispose( IoSession arg0 ) throws Exception { } + + + public void finishDecode( IoSession session, ProtocolDecoderOutput out ) throws Exception + { + // TODO Auto-generated method stub + } } Modified: directory/branches/apacheds/1.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java (original) +++ directory/branches/apacheds/1.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java Tue Sep 5 09:40:29 2006 @@ -43,4 +43,10 @@ public void dispose( IoSession session ) throws Exception { } + + + public void finishDecode( IoSession session, ProtocolDecoderOutput out ) throws Exception + { + // TODO Auto-generated method stub + } } Modified: directory/branches/apacheds/1.0/protocol-ldap/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-ldap/pom.xml?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/protocol-ldap/pom.xml (original) +++ directory/branches/apacheds/1.0/protocol-ldap/pom.xml Tue Sep 5 09:40:29 2006 @@ -22,12 +22,12 @@ org.apache.directory.mina mina-filter-codec-asn1 - 0.9.4 + 0.9.5 org.apache.directory.mina mina-filter-ssl - 0.9.4 + 0.9.5 org.apache.directory.server Modified: directory/branches/apacheds/1.0/protocol-ntp/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-ntp/pom.xml?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/protocol-ntp/pom.xml (original) +++ directory/branches/apacheds/1.0/protocol-ntp/pom.xml Tue Sep 5 09:40:29 2006 @@ -22,7 +22,7 @@ org.apache.directory.mina mina-core - 0.9.4 + 0.9.5 org.apache.directory.server Modified: directory/branches/apacheds/1.0/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java (original) +++ directory/branches/apacheds/1.0/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java Tue Sep 5 09:40:29 2006 @@ -40,4 +40,10 @@ public void dispose( IoSession arg0 ) throws Exception { } + + + public void finishDecode( IoSession session, ProtocolDecoderOutput out ) throws Exception + { + // TODO Auto-generated method stub + } } Modified: directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java (original) +++ directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java Tue Sep 5 09:40:29 2006 @@ -61,7 +61,7 @@ import org.apache.mina.common.IoFilterChainBuilder; import org.apache.mina.common.IoSession; import org.apache.mina.common.WriteFuture; -import org.apache.mina.filter.ThreadPoolFilter; +import org.apache.mina.filter.thread.ThreadPoolFilter; import org.apache.mina.transport.socket.nio.DatagramAcceptor; import org.apache.mina.transport.socket.nio.SocketAcceptor; import org.apache.mina.transport.socket.nio.SocketAcceptorConfig; @@ -108,7 +108,7 @@ public void beforeStartup( DirectoryService service ) { - threadPool.setMaximumPoolSize( service.getConfiguration().getStartupConfiguration().getMaxThreads() ); + threadPool.getThreadPool().setMaximumPoolSize( service.getConfiguration().getStartupConfiguration().getMaxThreads() ); this.directoryService = service; } Modified: directory/branches/apacheds/1.0/server-sar/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-sar/pom.xml?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/server-sar/pom.xml (original) +++ directory/branches/apacheds/1.0/server-sar/pom.xml Tue Sep 5 09:40:29 2006 @@ -21,7 +21,7 @@ org.apache.directory.daemon daemon-bootstrappers - 1.0-RC2 + 1.0-RC3 jboss Modified: directory/branches/apacheds/1.0/server-ssl/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-ssl/pom.xml?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/server-ssl/pom.xml (original) +++ directory/branches/apacheds/1.0/server-ssl/pom.xml Tue Sep 5 09:40:29 2006 @@ -33,7 +33,7 @@ org.apache.directory.mina mina-filter-ssl - 0.9.4 + 0.9.5 Modified: directory/branches/apacheds/1.0/server-tools/pom.xml URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-tools/pom.xml?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/server-tools/pom.xml (original) +++ directory/branches/apacheds/1.0/server-tools/pom.xml Tue Sep 5 09:40:29 2006 @@ -22,7 +22,7 @@ org.apache.directory.daemon daemon-bootstrappers - 1.0-RC2 + 1.0-RC3 commons-cli Modified: directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF?view=diff&rev=440393&r1=440392&r2=440393 ============================================================================== --- directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF (original) +++ directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF Tue Sep 5 09:40:29 2006 @@ -18,9 +18,9 @@ ../lib/commons-cli-1.0.jar ../lib/jdbm-1.0.jar ../lib/lcrypto-jdk14-131.jar - ../lib/mina-core-0.9.4.jar - ../lib/mina-filter-codec-asn1-0.9.4.jar - ../lib/mina-filter-ssl-0.9.4.jar + ../lib/mina-core-0.9.5.jar + ../lib/mina-filter-codec-asn1-0.9.5.jar + ../lib/mina-filter-ssl-0.9.5.jar ../lib/oro-2.0.8.jar ../lib/shared-asn1-0.9.5.2.jar ../lib/shared-ldap-0.9.5.2.jar