You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/10/12 04:39:16 UTC
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/...
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<Partition> partitions = new HashSet<Partition>();
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 <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -55,7 +54,7 @@
/////////////////////////////////////////////////////////
// Enable the Stored Procedure Extended Operation Handler
/////////////////////////////////////////////////////////
- LdapConfiguration ldapCfg = super.apacheDS.getLdapConfiguration();
+ LdapServer ldapCfg = super.apacheDS.getLdapServer();
Set<ExtendedOperationHandler> handlers = new HashSet<ExtendedOperationHandler>( 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 ( ;; )
{