Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 593 invoked from network); 12 Oct 2007 02:40:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Oct 2007 02:40:14 -0000 Received: (qmail 36558 invoked by uid 500); 12 Oct 2007 02:40:01 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 36524 invoked by uid 500); 12 Oct 2007 02:40:01 -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 36513 invoked by uid 99); 12 Oct 2007 02:40:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Oct 2007 19:40:01 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Oct 2007 02:40:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED1F71A983A; Thu, 11 Oct 2007 19:39:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r584030 [2/2] - in /directory/apacheds/branches/bigbang: protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/ protocol-ldap/ protocol-ldap/src/main/java/org/apache/directory/server/ldap/ protocol-ldap/src/main/java/org/... Date: Fri, 12 Oct 2007 02:39:16 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071012023922.ED1F71A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java?rev=584030&r1=584029&r2=584030&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java (original) +++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java Thu Oct 11 19:39:14 2007 @@ -59,7 +59,7 @@ public void setUp() throws Exception { apacheDS.setAllowAnonymousAccess( false ); - apacheDS.getLdapConfiguration().setSaslHost( "localhost" ); + apacheDS.getLdapServer().setSaslHost( "localhost" ); Set partitions = new HashSet(); JdbmPartition partition = new JdbmPartition(); Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/StoredProcedureExecutionITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/StoredProcedureExecutionITest.java?rev=584030&r1=584029&r2=584030&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/StoredProcedureExecutionITest.java (original) +++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/StoredProcedureExecutionITest.java Thu Oct 11 19:39:14 2007 @@ -20,18 +20,8 @@ package org.apache.directory.server; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.Set; - -import javax.naming.NameNotFoundException; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.ldap.InitialLdapContext; -import javax.naming.ldap.LdapContext; - import org.apache.directory.server.ldap.ExtendedOperationHandler; -import org.apache.directory.server.ldap.LdapConfiguration; +import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.ldap.support.extended.StoredProcedureExtendedOperationHandler; import org.apache.directory.server.unit.AbstractServerTest; import org.apache.directory.shared.ldap.message.AttributesImpl; @@ -39,6 +29,15 @@ import org.apache.directory.shared.ldap.sp.JavaStoredProcUtils; import org.apache.directory.shared.ldap.sp.LdapContextParameter; +import javax.naming.NameNotFoundException; +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import javax.naming.ldap.InitialLdapContext; +import javax.naming.ldap.LdapContext; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.Set; + /** * @author Apache Directory Project @@ -55,7 +54,7 @@ ///////////////////////////////////////////////////////// // Enable the Stored Procedure Extended Operation Handler ///////////////////////////////////////////////////////// - LdapConfiguration ldapCfg = super.apacheDS.getLdapConfiguration(); + LdapServer ldapCfg = super.apacheDS.getLdapServer(); Set handlers = new HashSet( ldapCfg.getExtendedOperationHandlers() ); handlers.add( new StoredProcedureExtendedOperationHandler() ); ldapCfg.setExtendedOperationHandlers( handlers ); Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/LdapsITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/LdapsITest.java?rev=584030&r1=584029&r2=584030&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/LdapsITest.java (original) +++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/LdapsITest.java Thu Oct 11 19:39:14 2007 @@ -20,22 +20,21 @@ package org.apache.directory.server.ssl; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.util.Hashtable; +import org.apache.directory.server.ldap.LdapServer; +import org.apache.directory.server.ssl.support.SSLSocketFactory; +import org.apache.directory.server.unit.AbstractServerTest; +import org.apache.directory.shared.ldap.message.AttributeImpl; +import org.apache.directory.shared.ldap.message.AttributesImpl; +import org.apache.mina.util.AvailablePortFinder; import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; - -import org.apache.directory.server.ldap.LdapConfiguration; -import org.apache.directory.server.ssl.support.SSLSocketFactory; -import org.apache.directory.server.unit.AbstractServerTest; -import org.apache.directory.shared.ldap.message.AttributeImpl; -import org.apache.directory.shared.ldap.message.AttributesImpl; -import org.apache.mina.util.AvailablePortFinder; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.util.Hashtable; /** @@ -61,16 +60,16 @@ int ldapsPort = AvailablePortFinder.getNextAvailable( 8192 ); - LdapConfiguration ldapsCfg = apacheDS.getLdapsConfiguration(); - ldapsCfg.setEnableLdaps( true ); - ldapsCfg.setLdapsCertificatePassword( "boguspw" ); - ldapsCfg.setIpPort( ldapsPort ); + LdapServer ldapsServer = apacheDS.getLdapsServer(); + ldapsServer.setEnableLdaps( true ); + ldapsServer.setLdapsCertificatePassword( "boguspw" ); + ldapsServer.setIpPort( ldapsPort ); // Copy the bogus certificate to the certificates directory. InputStream in = getClass().getResourceAsStream( "/bogus.cert" ); - ldapsCfg.getLdapsCertificateFile().getParentFile().mkdirs(); + ldapsServer.getLdapsCertificateFile().getParentFile().mkdirs(); - FileOutputStream out = new FileOutputStream( ldapsCfg.getLdapsCertificateFile() ); + FileOutputStream out = new FileOutputStream( ldapsServer.getLdapsCertificateFile() ); for ( ;; ) {