Author: mduerig
Date: Wed Jun 13 14:30:59 2012
New Revision: 1349875
URL: http://svn.apache.org/viewvc?rev=1349875view=rev
Log:
missing license header
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ConflictHandler.java
Author: mduerig
Date: Wed Jun 13 14:34:11 2012
New Revision: 1349877
URL: http://svn.apache.org/viewvc?rev=1349877view=rev
Log:
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation
test case
Added:
Author: mduerig
Date: Wed Jun 13 14:41:05 2012
New Revision: 1349880
URL: http://svn.apache.org/viewvc?rev=1349880view=rev
Log:
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation
rename test case to better match classes under test
Added:
Author: thomasm
Date: Wed Jun 13 14:42:22 2012
New Revision: 1349882
URL: http://svn.apache.org/viewvc?rev=1349882view=rev
Log:
OAK-137 Query: content index (simplify the API a bit)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
Author: thomasm
Date: Wed Jun 13 14:43:56 2012
New Revision: 1349886
URL: http://svn.apache.org/viewvc?rev=1349886view=rev
Log:
OAK-34 Define query API (simplify the Cursor interface; use the oak-core Tree
implementation)
Modified:
Author: mduerig
Date: Wed Jun 13 14:57:50 2012
New Revision: 1349895
URL: http://svn.apache.org/viewvc?rev=1349895view=rev
Log:
remove/replace constructor only used from tests
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java