Re: Conflict handling through rebasing branches

2013-01-17 Thread Jukka Zitting
Hi, On Thu, Jan 17, 2013 at 7:15 PM, Michael Dürig wrote: > The core idea is to try to resolve all conflicts in a branch through > rebasing it on top of the current trunk. After successfully rebasing a > branch, merging it to trunk is as simple as fast forwarding the head of the > trunk to the he

Conflict handling through rebasing branches

2013-01-17 Thread Michael Dürig
Hi, There are various places in Oak where conflicting updates to the content tree can occur: committing changes against a non root revision, merging changes from a branch into trunk and synchronisation of cluster nodes. The Microkernel API currently doesn't specify a contract for merging co

Re: svn commit: r1434364 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr: NodeImpl.java SessionDelegate.java SessionImpl.java WorkspaceImpl.java query/QueryImpl.java ver

2013-01-17 Thread Michael Dürig
On 17.1.13 5:33, Jukka Zitting wrote: Hi, On Wed, Jan 16, 2013 at 11:04 PM, Jukka Zitting wrote: If yes, please revert, as these methods were intentionally added to satisfy the need for different exceptions in different cases. Hmm, on second thought that's a bit harsh and not too construct

Re: MongoMicroKernel concurrency issue

2013-01-17 Thread Damien Obrist
I don't know why the attachment didn't get through, maybe a problem with my email client… sorry about that! I have opened a new JIRA issue [0] and attached the file there. Damien [0] https://issues.apache.org/jira/browse/OAK-566 On Jan 17, 2013, at 2:09 PM, Mete Atamel mailto:mata...@adobe.co

Re: MongoMicroKernel concurrency issue

2013-01-17 Thread Bertrand Delacretaz
On Thu, Jan 17, 2013 at 11:57 AM, Damien Obrist wrote: > ...I didn't forget to attach it but somehow it got lost on the way. Here is > my second try... Many @apache.org lists are configured to strip attachments, that's probably the case here - better create a jira issue and attach your patch the

Re: MongoMicroKernel concurrency issue

2013-01-17 Thread Mete Atamel
I still didn't get the unit test. Do you mind sending it to me off list or better open a new OAK issue and attach it there? -Mete On 1/17/13 11:57 AM, "Damien Obrist" wrote: >Hi Mete, > >No I didn't forget to attach it but somehow it got lost on the way. Here >is my second try. > >I had looked

Oak 0.6 release plan

2013-01-17 Thread Jukka Zitting
Hi, As you may have noticed from dev@jackrabbit, I'm planning to cut Jackrabbit 2.6 shortly. That should also be a good time for cutting Oak 0.6. Unless anything unexpected comes up, I'll be cutting the 0.6 release candidate on Monday, Jan 28th. After that release I'd like to start the road towar

Re: MongoMicroKernel concurrency issue

2013-01-17 Thread Damien Obrist
Hi Mete, No I didn't forget to attach it but somehow it got lost on the way. Here is my second try. I had looked at this bug report but I am not sure if the two are related as I am seeing a different exception and I'm not using branch and merge. Damien On Jan 17, 2013, at 11:37 AM, Mete Ata

Re: MongoMicroKernel concurrency issue

2013-01-17 Thread Mete Atamel
Hi Damien, I think you forgot to attach the Junit test? Also, there's an open bug [0] on something similar. Maybe the two are related? If so, please add comments/Junit test to OAK-560. Thanks. -Mete [0] https://issues.apache.org/jira/browse/OAK-560 On 1/17/13 11:27 AM, "Damien Obrist" wrote:

MongoMicroKernel concurrency issue

2013-01-17 Thread Damien Obrist
Hi, I am working on my master thesis at Adobe and within the context of my project I am currently looking into implementing parts of a MicroKernel using Apache HBase and some scalability / performance tests. Doing so I have encountered a concurrency-related issue with the MongoMicroKernel. It s

RE: strange restart behavior

2013-01-17 Thread Marcel Reutegger
OK, thanks for the pointer. Regards Marcel > -Original Message- > From: Alex Parvulescu [mailto:alex.parvule...@gmail.com] > Sent: Mittwoch, 16. Januar 2013 17:36 > To: oak-dev@jackrabbit.apache.org > Subject: Re: strange restart behavior > > Hi Marcel, > > You are right, there is a pr