Mailing-List: contact dev-help@directory.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Apache Directory Developers List" <dev@directory.apache.org>
Received-SPF: pass (athena.apache.org: domain of elecharny@gmail.com
 designates 74.125.83.50 as permitted sender)
Message-ID: <4FD3150F.1010006@gmail.com>
Date: Sat, 09 Jun 2012 11:19:11 +0200
From: =?UTF-8?B?RW1tYW51ZWwgTMOpY2hhcm55?= <elecharny@gmail.com>
Reply-To: elecharny@apache.org
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7;
 rv:12.0) Gecko/20120428 Thunderbird/12.0.1
MIME-Version: 1.0
To: Apache Directory Developers List <dev@directory.apache.org>
Subject: Re: Txn branch merge : headsup
References: <4FBBAD5D.5090806@gmail.com>
 <CALhXAG0EMCyqp3--P7V7Y2svKokLw7cxkndHz+=Z00aNxePsgg@mail.gmail.com>
 <4FCD2B91.2030305@gmail.com> <4FD21C3E.8020102@gmail.com>
 <CALhXAG0V_HzkT75VEAHpPUXLzX9abBKjJUeFKk3gUcoEAGM8gA@mail.gmail.com>
 <4FD23D53.6080908@gmail.com>
In-Reply-To: <4FD23D53.6080908@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit

So far, the remaining modules that I still have to resolve conflits in are :
* apacheds-core-shared (processing it atm)
! apacheds-core-avl
! apacheds-xdbm-partition
! apacheds-ldif-partition
! apacheds-jdbm-partition
! apacheds-core-annotations
! apacheds-server-config
! apacheds-server-jndi
! apacheds-server-replication
! apacheds-xdbm-tools
! apacheds-core-integ
! apacheds-server-integ
! ldap-client-test
! apacheds-service

I'm almost done with apacheds-core-shared, which is the key module, as 
all the other modules depend on it. I still have around 10 errors in the 
DefaultOperationExecutionManager class, and that's it. It's all about 
removing the OneLevel and SubLevel index.

Otherwise, tests are passing up to ApacheDS Core API, which is not far. 
I do expect that I can fix core-shared in the next couple of hours, then 
the next big step will be to get core-avl happy :)

Still looking for the best method to commit what I currently have 
without destroying tunk not losing anyhting.


-- 
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com