Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 69947 invoked from network); 24 Jun 2005 02:20:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Jun 2005 02:20:05 -0000 Received: (qmail 28414 invoked by uid 500); 24 Jun 2005 02:20:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 28366 invoked by uid 500); 24 Jun 2005 02:20:03 -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 28353 invoked by uid 99); 24 Jun 2005 02:20:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jun 2005 19:20:03 -0700 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 23 Jun 2005 19:20:04 -0700 Received: (qmail 69872 invoked by uid 65534); 24 Jun 2005 02:20:00 -0000 Message-ID: <20050624022000.69870.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r201546 - in /directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server: ./ configuration/ jndi/ Date: Fri, 24 Jun 2005 02:19:59 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trustin Date: Thu Jun 23 19:19:58 2005 New Revision: 201546 URL: http://svn.apache.org/viewcvs?rev=201546&view=rev Log: Caught up the changes in trunk. Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java?rev=201546&r1=201545&r2=201546&view=diff ============================================================================== --- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java (original) +++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/AbstractTestCase.java Thu Jun 23 19:19:58 2005 @@ -22,9 +22,9 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.HashSet; +import java.util.ArrayList; import java.util.Hashtable; -import java.util.Set; +import java.util.List; import javax.naming.Context; import javax.naming.InitialContext; @@ -84,7 +84,7 @@ protected MutableStartupConfiguration configuration = new MutableStartupConfiguration(); /** A testEntries of entries as Attributes to add to the DIT for testing */ - protected Set testEntries = new HashSet(); + protected List testEntries = new ArrayList(); /** An optional LDIF file path if set and present is read to add more test entries */ private String ldifPath; Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java?rev=201546&r1=201545&r2=201546&view=diff ============================================================================== --- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java (original) +++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/ConfigurationUtil.java Thu Jun 23 19:19:58 2005 @@ -98,17 +98,17 @@ } /** - * Returns the deep clone of the specified {@link Attributes} set. + * Returns the deep clone of the specified {@link Attributes} list. */ - static Set getClonedAttributesSet( Set set ) + static List getClonedAttributesList( List list ) { - Set newSet = new HashSet(); - Iterator i = set.iterator(); + List newList = new ArrayList(); + Iterator i = list.iterator(); while( i.hasNext() ) { - newSet.add( ( ( Attributes ) i.next() ).clone() ); + newList.add( ( ( Attributes ) i.next() ).clone() ); } - return newSet; + return newList; } /** Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java?rev=201546&r1=201545&r2=201546&view=diff ============================================================================== --- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java (original) +++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java Thu Jun 23 19:19:58 2005 @@ -64,7 +64,7 @@ super.setInterceptorConfigurations( interceptorConfigurations ); } - public void setTestEntries( Set testEntries ) + public void setTestEntries( List testEntries ) { super.setTestEntries( testEntries ); } Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java?rev=201546&r1=201545&r2=201546&view=diff ============================================================================== --- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java (original) +++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java Thu Jun 23 19:19:58 2005 @@ -60,7 +60,7 @@ private Set bootstrapSchemas; // Set private Set contextPartitionConfigurations = new HashSet(); // Set - private Set testEntries = new HashSet(); // Set + private List testEntries = new ArrayList(); // Set protected StartupConfiguration() { @@ -287,19 +287,19 @@ * Returns test directory entries({@link Attributes}) to be loaded while * bootstrapping. */ - public Set getTestEntries() + public List getTestEntries() { - return ConfigurationUtil.getClonedAttributesSet( testEntries ); + return ConfigurationUtil.getClonedAttributesList( testEntries ); } /** * Sets test directory entries({@link Attributes}) to be loaded while * bootstrapping. */ - protected void setTestEntries( Set testEntries ) + protected void setTestEntries( List testEntries ) { - testEntries = ConfigurationUtil.getClonedAttributesSet( - ConfigurationUtil.getTypeSafeSet( testEntries, Attributes.class ) ); + testEntries = ConfigurationUtil.getClonedAttributesList( + ConfigurationUtil.getTypeSafeList( testEntries, Attributes.class ) ); Iterator i = testEntries.iterator(); while( i.hasNext() ) Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java?rev=201546&r1=201545&r2=201546&view=diff ============================================================================== --- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java (original) +++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryService.java Thu Jun 23 19:19:58 2005 @@ -456,7 +456,7 @@ entry.put( "creatorsName", ContextPartitionNexus.ADMIN_PRINCIPAL ); entry.put( "createTimestamp", DateUtils.getGeneralizedTime() ); - Attribute dn = entry.remove( "dn" ); + Attribute dn = ( Attribute ) entry.get( "dn" ).clone(); AttributeTypeRegistry registry = globalRegistries.getAttributeTypeRegistry(); NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( registry ); DnParser parser = new DnParser( ncn );