Author: akarasulu
Date: Mon Jan 31 22:09:53 2005
New Revision: 149375
URL: http://svn.apache.org/viewcvs?view=rev&rev=149375
Log:
formatting
Modified:
incubator/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java
Modified:
incubator/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java
URL:
http://svn.apache.org/viewcvs/incubator/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java?view=diff&r1=149374&r2=149375
==============================================================================
---
incubator/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java
(original)
+++
incubator/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java
Mon Jan 31 22:09:53 2005
@@ -108,8 +108,11 @@
protected LdapContext setSysRoot( String user, String passwd ) throws
NamingException
{
Hashtable env = new Hashtable();
+
env.put( Context.SECURITY_PRINCIPAL, user );
+
env.put( Context.SECURITY_CREDENTIALS, passwd );
+
return setSysRoot( env );
}
@@ -126,16 +129,24 @@
protected LdapContext setSysRoot( Hashtable env ) throws NamingException
{
Hashtable envFinal = new Hashtable();
+
envFinal.putAll( extras );
+
envFinal.putAll( env );
+
envFinal.put( Context.PROVIDER_URL, "ou=system" );
+
envFinal.put( EnvKeys.WKDIR, "target" + File.separator + "apacheds" );
+
envFinal.put( Context.INITIAL_CONTEXT_FACTORY,
"org.apache.ldap.server.jndi.ServerContextFactory" );
+
envFinal.putAll( overrides );
+
return sysRoot = new InitialLdapContext( envFinal, null );
}
+
/**
* Sets the system context root to null.
*
@@ -144,13 +155,21 @@
protected void tearDown() throws Exception
{
super.tearDown();
+
Hashtable env = new Hashtable();
+
env.put( Context.PROVIDER_URL, "ou=system" );
+
env.put( Context.INITIAL_CONTEXT_FACTORY,
"org.apache.ldap.server.jndi.ServerContextFactory" );
+
env.put( EnvKeys.SHUTDOWN, "" );
+
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
+
env.put( Context.SECURITY_CREDENTIALS, "secret" );
+
try { new InitialContext( env ); } catch( Exception e ) {}
+
sysRoot = null;
}
}