Return-Path: 
 <commits-return-4091-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 7201 invoked from network); 24 Mar 2005 06:53:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 24 Mar 2005 06:53:51 -0000
Received: (qmail 97407 invoked by uid 500); 24 Mar 2005 06:53:51 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 97359 invoked by uid 500); 24 Mar 2005 06:53:50 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 97345 invoked by uid 99); 24 Mar 2005 06:53:50 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 23 Mar 2005 22:53:50 -0800
Received: (qmail 7164 invoked by uid 65534); 24 Mar 2005 06:53:48 -0000
Message-ID: <20050324065348.7161.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Thu, 24 Mar 2005 06:53:48 -0000
Subject: 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/
To: commits@directory.apache.org
From: akarasulu@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/=
jndi/invocation/interceptor/Validator.java (from r158886, directory/apached=
s/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jnd=
i/invocation/interceptor/Validator.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/j=
ava/org/apache/ldap/server/jndi/invocation/interceptor/Validator.java?view=
=3Ddiff&rev=3D158889&p1=3Ddirectory/apacheds/branches/interceptor_revamp/co=
re/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Validat=
or.java&r1=3D158886&p2=3Ddirectory/apacheds/trunk/core/src/main/java/org/ap=
ache/ldap/server/jndi/invocation/interceptor/Validator.java&r2=3D158889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/ser=
ver/jndi/invocation/interceptor/Validator.java
---------------------------------------------------------------------------=
---
    svn:keywords =3D HeadURL Id LastChangedBy LastChangedDate LastChangedRe=
vision

Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jnd=
i/CreateContextTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/o=
rg/apache/ldap/server/jndi/CreateContextTest.java?view=3Ddiff&r1=3D158888&r=
2=3D158889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/Crea=
teContextTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/Crea=
teContextTest.java Wed Mar 23 22:53:39 2005
@@ -179,7 +179,7 @@
         try
         {
             ctx =3D sysRoot.createSubcontext( "ou=3Dtesting00", 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/jnd=
i/RootDSETest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/o=
rg/apache/ldap/server/jndi/RootDSETest.java?view=3Ddiff&r1=3D158888&r2=3D15=
8889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/Root=
DSETest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/Root=
DSETest.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;
=20
=20
 /**
@@ -88,6 +89,11 @@
         env.put( EnvKeys.SHUTDOWN, "" );
         env.put( Context.SECURITY_PRINCIPAL, "uid=3Dadmin,ou=3Dsystem" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
+
+        int port =3D AvailablePortFinder.getNextAvailable( 1024 );
+
+        env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         try { new InitialContext( env ); } catch( Exception e ) {}
     }
=20
@@ -106,6 +112,11 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=3Dadmin,ou=3Dsystem" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.cla=
ss.getName() );
+
+        int port =3D AvailablePortFinder.getNextAvailable( 1024 );
+
+        env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         InitialContext initCtx =3D new InitialContext( env );
         assertNotNull( initCtx );
     }
@@ -125,6 +136,11 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=3Dadmin,ou=3Dsystem" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.cla=
ss.getName() );
+
+        int port =3D AvailablePortFinder.getNextAvailable( 1024 );
+
+        env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         InitialContext initCtx =3D new InitialContext( env );
         assertNotNull( initCtx );
=20
@@ -149,6 +165,11 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=3Dadmin,ou=3Dsystem" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.cla=
ss.getName() );
+
+        int port =3D AvailablePortFinder.getNextAvailable( 1024 );
+
+        env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         InitialContext initCtx =3D new InitialContext( env );
         assertNotNull( initCtx );
=20
@@ -173,6 +194,11 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=3Dadmin,ou=3Dsystem" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.cla=
ss.getName() );
+
+        int port =3D AvailablePortFinder.getNextAvailable( 1024 );
+
+        env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         InitialContext initCtx =3D new InitialContext( env );
         assertNotNull( initCtx );
=20
@@ -207,6 +233,11 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=3Dadmin,ou=3Dsystem" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.cla=
ss.getName() );
+
+        int port =3D AvailablePortFinder.getNextAvailable( 1024 );
+
+        env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         InitialContext initCtx =3D new InitialContext( env );
         assertNotNull( initCtx );
=20
@@ -241,6 +272,11 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=3Dadmin,ou=3Dsystem" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.cla=
ss.getName() );
+
+        int port =3D AvailablePortFinder.getNextAvailable( 1024 );
+
+        env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         InitialContext initCtx =3D new InitialContext( env );
         assertNotNull( initCtx );
=20
@@ -277,6 +313,11 @@
         env.put( Context.SECURITY_PRINCIPAL, "uid=3Dadmin,ou=3Dsystem" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.cla=
ss.getName() );
+
+        int port =3D AvailablePortFinder.getNextAvailable( 1024 );
+
+        env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         InitialContext initCtx =3D new InitialContext( env );
         assertNotNull( initCtx );
=20

Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jnd=
i/SimpleAuthenticationTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/o=
rg/apache/ldap/server/jndi/SimpleAuthenticationTest.java?view=3Ddiff&r1=3D1=
58888&r2=3D158889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/Simp=
leAuthenticationTest.java (original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/Simp=
leAuthenticationTest.java Wed Mar 23 22:53:39 2005
@@ -18,6 +18,7 @@
=20
=20
 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;
=20
=20
 /**
@@ -46,8 +48,9 @@
 {
     /**
      * Cleans up old database files on creation.
+     * @throws IOException=20
      */
-    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" );
=20
+        int port =3D AvailablePortFinder.getNextAvailable( 1024 );
+
+        env.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         try
         {
             setSysRoot( env );
@@ -195,6 +202,9 @@
=20
         // ok this should start up the system now as admin
         Hashtable anonymous =3D new Hashtable();
+
+        anonymous.put( EnvKeys.LDAP_PORT, String.valueOf( port ) );
+
         InitialLdapContext ctx =3D ( InitialLdapContext ) setSysRoot( anon=
ymous );
         assertNotNull( ctx );
=20

Copied: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/=
invocation/interceptor/ConfigurationTest.java (from r158886, directory/apac=
heds/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/o=
rg/apache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java?vi=
ew=3Ddiff&rev=3D158889&p1=3Ddirectory/apacheds/branches/interceptor_revamp/=
core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/Configurat=
ionTest.java&r1=3D158886&p2=3Ddirectory/apacheds/trunk/core/src/test/org/ap=
ache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java&r2=3D15=
8889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
    (empty)

Propchange: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/j=
ndi/invocation/interceptor/ConfigurationTest.java
---------------------------------------------------------------------------=
---
    svn:keywords =3D HeadURL Id LastChangedBy LastChangedDate LastChangedRe=
vision

Modified: directory/apacheds/trunk/shared/src/main/java/org/apache/ldap/ser=
ver/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=3D=
diff&r1=3D158888&r2=3D158889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/apacheds/trunk/shared/src/main/java/org/apache/ldap/server/sc=
hema/bootstrap/ProducerTypeEnum.java (original)
+++ directory/apacheds/trunk/shared/src/main/java/org/apache/ldap/server/sc=
hema/bootstrap/ProducerTypeEnum.java Wed Mar 23 22:53:39 2005
@@ -46,7 +46,9 @@
  */
 public class ProducerTypeEnum extends ValuedEnum
 {
-    private static final String[] producers =3D {
+	private static final long serialVersionUID =3D 3257284725524475954L;
+
+	private static final String[] producers =3D {
         "NormalizerProducer", "ComparatorProducer", "SyntaxCheckerProducer=
",
         "SyntaxProducer", "MatchingRuleProducer", "AttributeTypeProducer",
         "ObjectClassProducer", "MatchingRuleUseProducer", "DitContentRuleP=
roducer",