You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2012/03/06 18:56:43 UTC
svn commit: r1297615 - in
/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel: ./
src/main/java/org/apache/jackrabbit/spi2microkernel/
src/test/java/org/apache/jackrabbit/spi2microkernel/
Author: mduerig
Date: Tue Mar 6 17:56:42 2012
New Revision: 1297615
URL: http://svn.apache.org/viewvc?rev=1297615&view=rev
Log:
upgrading dependency from microkernel in sandbox to oak
Modified:
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml?rev=1297615&r1=1297614&r2=1297615&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml Tue Mar 6 17:56:42 2012
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>microkernel</artifactId>
+ <artifactId>oak-core</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java?rev=1297615&r1=1297614&r2=1297615&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Tue Mar 6 17:56:42 2012
@@ -283,7 +283,7 @@ public class RepositoryServiceImpl exten
final List<String> workspaces = new ArrayList<String>();
try {
- String json = microKernel.getNodes("/", getRevision(sessionInfo), 0, 0, -1);
+ String json = microKernel.getNodes("/", getRevision(sessionInfo), 0, 0, -1, null);
new JsonParser(new JsonHandler(){
@Override
@@ -348,7 +348,7 @@ public class RepositoryServiceImpl exten
throw PNFE;
}
- String json = microKernel.getNodes(mkPath, rev, 1, 0, CHILD_NODE_CHUNK_SIZE);
+ String json = microKernel.getNodes(mkPath, rev, 1, 0, CHILD_NODE_CHUNK_SIZE, null);
return buildItemInfos(nodePath, itemPath, json, readFromDataStore);
}
catch (MicroKernelException e) {
@@ -410,7 +410,7 @@ public class RepositoryServiceImpl exten
// First chunk does not need child nodes. These are most probably
// in the cache already from a preceding call to getItemInfos
int depth = pos == 0 ? 0 : 1;
- String json = microKernel.getNodes(mkPath, rev, depth, pos, CHILD_NODE_CHUNK_SIZE);
+ String json = microKernel.getNodes(mkPath, rev, depth, pos, CHILD_NODE_CHUNK_SIZE, null);
pos += CHILD_NODE_CHUNK_SIZE;
Iterator<? extends ItemInfo> infos = buildItemInfos(path, path, json, readFromDataStore);
NodeInfo info = (NodeInfo) infos.next();
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java?rev=1297615&r1=1297614&r2=1297615&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java Tue Mar 6 17:56:42 2012
@@ -257,7 +257,7 @@ public class SubscriptionImpl implements
return Collections.emptyList();
}
- String journal = microKernel.getJournal(startRevision, endRevision);
+ String journal = microKernel.getJournal(startRevision, endRevision, null);
log.debug("getJournal(" + startRevision + ", " + endRevision + ") returned " + journal.length() + " chars");
final List<EventBundle> eventBundles = new ArrayList<EventBundle>();
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java?rev=1297615&r1=1297614&r2=1297615&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java Tue Mar 6 17:56:42 2012
@@ -57,7 +57,7 @@ public class MicrokernelTest {
public void setup() {
MicroKernel mk = getMicroKernel();
// clean all existing content
- String result = mk.getNodes("/", mk.getHeadRevision(), 0, 0, -1);
+ String result = mk.getNodes("/", mk.getHeadRevision(), 0, 0, -1, null);
final List<String> names = new ArrayList<String>();
new JsonParser(new JsonHandler() {
@@ -158,7 +158,7 @@ public class MicrokernelTest {
"-\"{}node\"",
head, "");
- mk.getJournal(init, head);
+ mk.getJournal(init, head, null);
}
@Test
@@ -170,7 +170,7 @@ public class MicrokernelTest {
"+\"node\" : {}",
init, "");
- String journal = mk.getJournal(head, head);
+ String journal = mk.getJournal(head, head, null);
JsonArray jsonArray = FullJsonParser.parseArray(new UnescapingJsonTokenizer(journal));
JsonObject jsonObject = jsonArray.get(0).asObject();
@@ -199,7 +199,7 @@ public class MicrokernelTest {
"^\"node/prop\":21",
head, "");
- String journal = mk.getJournal(head, head);
+ String journal = mk.getJournal(head, head, null);
JsonArray jsonArray = FullJsonParser.parseArray(new UnescapingJsonTokenizer(journal));
JsonObject jsonObject = jsonArray.get(0).asObject();
@@ -227,7 +227,7 @@ public class MicrokernelTest {
"^\"node/prop\":\"bar\"",
head, "");
- String journal = mk.getJournal(head, head);
+ String journal = mk.getJournal(head, head, null);
JsonArray jsonArray = FullJsonParser.parseArray(new UnescapingJsonTokenizer(journal));
JsonObject jsonObject = jsonArray.get(0).asObject();
@@ -255,7 +255,7 @@ public class MicrokernelTest {
"^\"node/prop\":[1,2,3,4]",
head, "");
- String journal = mk.getJournal(head, head);
+ String journal = mk.getJournal(head, head, null);
JsonArray jsonArray = FullJsonParser.parseArray(new UnescapingJsonTokenizer(journal));
JsonObject jsonObject = jsonArray.get(0).asObject();
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java?rev=1297615&r1=1297614&r2=1297615&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java Tue Mar 6 17:56:42 2012
@@ -119,7 +119,7 @@ public class RepositoryTest {
"\"7:" + NodeType.NT_UNSTRUCTURED + '\"';
// clean all existing content
- String result = mk.getNodes("/", mk.getHeadRevision(), 0, 0, -1);
+ String result = mk.getNodes("/", mk.getHeadRevision(), 0, 0, -1, null);
final List<String> names = new ArrayList<String>();
new JsonParser(new JsonHandler() {