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/12/13 20:28:41 UTC
svn commit: r1213881 - in /jackrabbit/sandbox/jackrabbit-mk:
jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/
jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/
Author: mduerig
Date: Tue Dec 13 19:28:41 2011
New Revision: 1213881
URL: http://svn.apache.org/viewvc?rev=1213881&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
- adjust repository descriptors
- update comment
Modified:
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java?rev=1213881&r1=1213880&r2=1213881&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java Tue Dec 13 19:28:41 2011
@@ -31,8 +31,7 @@ import java.util.Iterator;
import java.util.Map;
/**
- * {@code ChildNodeEntries} represents a collection of {@code NodeEntry}s that
- * also maintains the index values of same-name siblings on insertion and removal.
+ * {@code ChildNodeEntries} represents a collection of {@code NodeEntry}s.
*/
final class ChildNodeEntries {
private static final Logger log = LoggerFactory.getLogger(ChildNodeEntries.class);
@@ -100,7 +99,6 @@ final class ChildNodeEntries {
*/
public synchronized void reload() throws RepositoryException {
if (isComplete()) {
- // nothing to do
return;
}
@@ -127,21 +125,20 @@ final class ChildNodeEntries {
* @see org.apache.jackrabbit.jcr2spi.operation.ReorderNodes
*/
synchronized void update(Iterator<ChildInfo> childNodeInfos) {
- // insert missing entries and reorder all if necessary.
while (childNodeInfos.hasNext()) {
ChildInfo info = childNodeInfos.next();
if (entries.get(info.getName()) == null) {
- // add missing at the correct position.
+ // add missing entry
NodeEntry entry = factory.createNodeEntry(parent, info.getName(), info.getUniqueID());
add(entry);
}
}
- // finally reset the status
+
complete = true;
}
/**
- * Returns an unmodifiable iterator over all NodeEntry objects present in
+ * Returns an iterator over all NodeEntry objects present in
* this ChildNodeEntries collection irrespective of their status.
*
* @return Iterator over all NodeEntry object
@@ -178,7 +175,7 @@ final class ChildNodeEntries {
}
/**
- * Adds a {@code NodeEntry} to the end of the list. Same as
+ * Adds a {@code NodeEntry}
*
* @param nodeEntry the {@code NodeEntry} to add.
*/
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=1213881&r1=1213880&r2=1213881&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 Dec 13 19:28:41 2011
@@ -164,12 +164,12 @@ public class RepositoryServiceImpl exten
put(NODE_TYPE_MANAGEMENT_UPDATE_IN_USE_SUPORTED, TRUE);
put(NODE_TYPE_MANAGEMENT_MULTIPLE_BINARY_PROPERTIES_SUPPORTED, TRUE);
put(NODE_TYPE_MANAGEMENT_VALUE_CONSTRAINTS_SUPPORTED, TRUE);
- put(NODE_TYPE_MANAGEMENT_ORDERABLE_CHILD_NODES_SUPPORTED, TRUE);
+ put(NODE_TYPE_MANAGEMENT_ORDERABLE_CHILD_NODES_SUPPORTED, FALSE);
put(NODE_TYPE_MANAGEMENT_OVERRIDES_SUPPORTED, TRUE);
put(NODE_TYPE_MANAGEMENT_INHERITANCE, TRUE);
put(OPTION_BASELINES_SUPPORTED, FALSE);
put(OPTION_ACTIVITIES_SUPPORTED, FALSE);
- put(OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED, TRUE);
+ put(OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED, FALSE);
put(QUERY_XPATH_DOC_ORDER, FALSE);
put(QUERY_XPATH_POS_INDEX, FALSE);
put(LEVEL_1_SUPPORTED, TRUE);