Return-Path: Delivered-To: apmail-directory-dev-archive@www.apache.org Received: (qmail 13021 invoked from network); 24 May 2007 02:39:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 May 2007 02:39:15 -0000 Received: (qmail 22099 invoked by uid 500); 24 May 2007 02:39:20 -0000 Delivered-To: apmail-directory-dev-archive@directory.apache.org Received: (qmail 22050 invoked by uid 500); 24 May 2007 02:39:20 -0000 Mailing-List: contact dev-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Apache Directory Developers List" Delivered-To: mailing list dev@directory.apache.org Received: (qmail 22039 invoked by uid 99); 24 May 2007 02:39:20 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 May 2007 19:39:20 -0700 X-ASF-Spam-Status: No, hits=2.0 required=10.0 tests=HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of akarasulu@gmail.com designates 64.233.184.230 as permitted sender) Received: from [64.233.184.230] (HELO wr-out-0506.google.com) (64.233.184.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 May 2007 19:39:13 -0700 Received: by wr-out-0506.google.com with SMTP id 76so39975wra for ; Wed, 23 May 2007 19:38:51 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:references:x-google-sender-auth; b=AMkacEvaXlRwcA99P+9D3un+ZeCCxU1h9ZX3jucsW5gZZefR9flVl3M3e/PA1EMfRUILWeZTJD/aVggyvdkbFlw6aUDprY3tgIxFyZbSkmTGKiuUbR5BRYouxedKRhcqe9Czn3cCaHo5vskgI0FYmFDr0BrmibeDI5MMGcwbXTE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:references:x-google-sender-auth; b=IcoUFJr4KG8V/C0srj144HR6HMWN71ARbHKglUADqJ3cwDuKVEEJO9G84uhlr68GT6pXISSQM3LKJLTlqQAf+nvxrX/dP6aIa8AtwxPA5XndiI/Aa2PO20UwiJTFRFPeTt0Bp/PXs1sOfHNj6EnKnvj2feG7nB365/b562jKQ9E= Received: by 10.142.102.5 with SMTP id z5mr23848wfb.1179974330079; Wed, 23 May 2007 19:38:50 -0700 (PDT) Received: by 10.142.77.21 with HTTP; Wed, 23 May 2007 19:38:50 -0700 (PDT) Message-ID: Date: Wed, 23 May 2007 22:38:50 -0400 From: "Alex Karasulu" Sender: akarasulu@gmail.com To: "Apache Directory Developers List" , erodriguez@apache.org Subject: Re: [ApacheDS] [SASL] SASL branch merge plan In-Reply-To: <568753d90705231854h2e4e700bq8abd9e416a3a07ae@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_9183_30748704.1179974330050" References: <568753d90705231621v2ba30185j61a2c484ec5c24b8@mail.gmail.com> <568753d90705231854h2e4e700bq8abd9e416a3a07ae@mail.gmail.com> X-Google-Sender-Auth: bb7b6181a2d43c8e X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_9183_30748704.1179974330050 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline You want to replace the present trunk with the SASL branch? On 5/23/07, Enrique Rodriguez wrote: > > On 5/23/07, Enrique Rodriguez wrote: > > ... > > 1) Commit the feature branch maintenance merge to > > 'apacheds-sasl-branch' once the integration tests complete (~8pm EST). > > I'd like you guys to look over ServerContextFactory in particular. > > There were some changes (by Emm, I believe) and the new configuration > > so SCF was a bit of a hot-spot for conflicts. > > I completed the maintenance merge to the SASL branch, did fresh > check-outs, and ran all the tests again. The SASL branch can now be > considered the proposed new trunk. > > Maybe you could review at least ServerContextFactory. There were some > changes to set the available processors, fix a bug in LDIF loading, > and then the new config that came with SASL, causing the most > conflicts. > > > http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?limit_changes=0&view=markup&pathrev=541123 > > Enrique > > > 2) Merge one last time so 'apacheds-sasl-branch' is identical to > > trunk. There were some minor updates in the last day or so. > > > > 3) Perform the final merge of everything back to trunk tonight. > > > > Enrique > > > ------=_Part_9183_30748704.1179974330050 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline You want to replace the present trunk with the SASL branch? 

On 5/23/07, Enrique Rodriguez <enriquer9@gmail.com > wrote:
On 5/23/07, Enrique Rodriguez < enriquer9@gmail.com> wrote:
> ...
> 1)  Commit the feature branch maintenance merge to
> 'apacheds-sasl-branch' once the integration tests complete (~8pm EST).
>  I'd like you guys to look over ServerContextFactory in particular.
> There were some changes (by Emm, I believe) and the new configuration
> so SCF was a bit of a hot-spot for conflicts.

I completed the maintenance merge to the SASL branch, did fresh
check-outs, and ran all the tests again.  The SASL branch can now be
considered the proposed new trunk.

Maybe you could review at least ServerContextFactory.  There were some
changes to set the available processors, fix a bug in LDIF loading,
and then the new config that came with SASL, causing the most
conflicts.

http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?limit_changes=0&view=markup&pathrev=541123

Enrique

> 2)  Merge one last time so 'apacheds-sasl-branch' is identical to
> trunk.  There were some minor updates in the last day or so.
>
> 3)  Perform the final merge of everything back to trunk tonight.
>
> Enrique
>

------=_Part_9183_30748704.1179974330050--