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 2005/03/24 07:53:48 UTC
svn commit: r158889 [2/2] - in directory/apacheds/trunk: core/
core/src/main/aspects/org/apache/ldap/server/jndi/
core/src/main/java/org/apache/ldap/server/
core/src/main/java/org/apache/ldap/server/auth/
core/src/main/java/org/apache/ldap/server/db/
core/src/main/java/org/apache/ldap/server/db/gui/
core/src/main/java/org/apache/ldap/server/db/jdbm/
core/src/main/java/org/apache/ldap/server/exception/
core/src/main/java/org/apache/ldap/server/jndi/
core/src/main/java/org/apache/ldap/server/jndi/ibs/
core/src/main/java/org/apache/ldap/server/jndi/invocation/
core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/
core/src/test/org/apache/ldap/server/jndi/
core/src/test/org/apache/ldap/server/jndi/invocation/
core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/
shared/src/main/java/org/apache/ldap/server/schema/bootstrap/
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Validator.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Validator.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Validator.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Validator.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Validator.java&r2=158889
==============================================================================
(empty)
Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Validator.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/CreateContextTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/CreateContextTest.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/CreateContextTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/CreateContextTest.java Wed Mar 23 22:53:39 2005
@@ -179,7 +179,7 @@
try
{
ctx = sysRoot.createSubcontext( "ou=testing00", attributes );
- fail( "Attept to create exiting context should fail!" );
+ fail( "Attempt to create exiting context should fail!" );
}
catch ( NamingException e )
{
Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java Wed Mar 23 22:53:39 2005
@@ -30,6 +30,7 @@
import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
import org.apache.ldap.common.exception.LdapNoPermissionException;
+import org.apache.mina.util.AvailablePortFinder;
/**
@@ -88,6 +89,11 @@
env.put( EnvKeys.SHUTDOWN, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
+
+ int port = AvailablePortFinder.getNextAvailable( 1024 );
+
+ env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
try { new InitialContext( env ); } catch( Exception e ) {}
}
@@ -106,6 +112,11 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
+
+ int port = AvailablePortFinder.getNextAvailable( 1024 );
+
+ env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
}
@@ -125,6 +136,11 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
+
+ int port = AvailablePortFinder.getNextAvailable( 1024 );
+
+ env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -149,6 +165,11 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
+
+ int port = AvailablePortFinder.getNextAvailable( 1024 );
+
+ env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -173,6 +194,11 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
+
+ int port = AvailablePortFinder.getNextAvailable( 1024 );
+
+ env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -207,6 +233,11 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
+
+ int port = AvailablePortFinder.getNextAvailable( 1024 );
+
+ env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -241,6 +272,11 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
+
+ int port = AvailablePortFinder.getNextAvailable( 1024 );
+
+ env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -277,6 +313,11 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
+
+ int port = AvailablePortFinder.getNextAvailable( 1024 );
+
+ env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java Wed Mar 23 22:53:39 2005
@@ -18,6 +18,7 @@
import java.io.File;
+import java.io.IOException;
import java.util.Hashtable;
import javax.naming.ConfigurationException;
import javax.naming.Context;
@@ -33,6 +34,7 @@
import org.apache.ldap.common.exception.LdapNoPermissionException;
import org.apache.ldap.common.util.ArrayUtils;
import org.apache.ldap.server.AbstractServerTest;
+import org.apache.mina.util.AvailablePortFinder;
/**
@@ -46,8 +48,9 @@
{
/**
* Cleans up old database files on creation.
+ * @throws IOException
*/
- public SimpleAuthenticationTest()
+ public SimpleAuthenticationTest() throws IOException
{
doDelete( new File( "target" + File.separator + "eve" ) );
}
@@ -184,6 +187,10 @@
env.put( Context.SECURITY_AUTHENTICATION, "none" );
env.put( EnvKeys.DISABLE_ANONYMOUS, "true" );
+ int port = AvailablePortFinder.getNextAvailable( 1024 );
+
+ env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
try
{
setSysRoot( env );
@@ -195,6 +202,9 @@
// ok this should start up the system now as admin
Hashtable anonymous = new Hashtable();
+
+ anonymous.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
InitialLdapContext ctx = ( InitialLdapContext ) setSysRoot( anonymous );
assertNotNull( ctx );
Copied: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java&r1=158886&p2=directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java&r2=158889
==============================================================================
(empty)
Propchange: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Modified: directory/apacheds/trunk/shared/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerTypeEnum.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/shared/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerTypeEnum.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/shared/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerTypeEnum.java (original)
+++ directory/apacheds/trunk/shared/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerTypeEnum.java Wed Mar 23 22:53:39 2005
@@ -46,7 +46,9 @@
*/
public class ProducerTypeEnum extends ValuedEnum
{
- private static final String[] producers = {
+ private static final long serialVersionUID = 3257284725524475954L;
+
+ private static final String[] producers = {
"NormalizerProducer", "ComparatorProducer", "SyntaxCheckerProducer",
"SyntaxProducer", "MatchingRuleProducer", "AttributeTypeProducer",
"ObjectClassProducer", "MatchingRuleUseProducer", "DitContentRuleProducer",