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 2011/07/29 18:55:23 UTC
svn commit: r1152301 - in
/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel:
RepositoryServiceImpl.java SubscriptionImpl.java
Author: mduerig
Date: Fri Jul 29 16:55:23 2011
New Revision: 1152301
URL: http://svn.apache.org/viewvc?rev=1152301&view=rev
Log:
spi2microkernel (WIP)
- log
Modified:
jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java
Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java?rev=1152301&r1=1152300&r2=1152301&view=diff
==============================================================================
--- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java (original)
+++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Fri Jul 29 16:55:23 2011
@@ -127,7 +127,7 @@ public class RepositoryServiceImpl exten
super(DESCRIPTORS, Collections.<String, String>emptyMap(), new QNodeTypeDefinition[0]);
try {
- this.microKernel = microKernel; // fixme who disposes the micro kernel?
+ this.microKernel = microKernel; // todo who disposes the micro kernel?
defaultWorkspace = getWorkspaceName(parameters,
Spi2MicrokernelRepositoryServiceFactory.PARAM_DEFAULT_WORKSPACE, DEFAULT_DEFAULT_WORKSPACE);
Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java?rev=1152301&r1=1152300&r2=1152301&view=diff
==============================================================================
--- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java (original)
+++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java Fri Jul 29 16:55:23 2011
@@ -82,7 +82,7 @@ public class SubscriptionImpl implements
String baseRevision;
synchronized (eventSources) {
- baseRevision = eventSources.isEmpty()
+ baseRevision = eventSources.isEmpty()
? microKernel.getHeadRevision()
: eventSources.element().startRevision;
}
@@ -254,8 +254,9 @@ public class SubscriptionImpl implements
public Collection<? extends EventBundle> getEventsBundles(String endRevision) throws RepositoryException {
String journal = microKernel.getJournal(startRevision, endRevision);
- List<EventBundle> eventBundles = new ArrayList<EventBundle>();
+ log.debug("getJournal(" + startRevision + ", " + endRevision + ") returned " + journal.length() + " chars");
+ List<EventBundle> eventBundles = new ArrayList<EventBundle>();
try {
List<?> jsonArray = jsonArray(new JSONParser().parse(journal));
Iterator<?> it = jsonArray.iterator();