Author: bdelacretaz
Date: Mon Nov 11 13:51:11 2013
New Revision: 1540718
URL: http://svn.apache.org/r1540718
Log:
SLING-2788 - upgrade to Oak 0.10
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
sling/trunk/bundles/jcr/oak-server/pom.xml
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1540718&r1=1540717&r2=1540718&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Mon Nov 11 13:51:11 2013
@@ -27,7 +27,7 @@
<url.version>1.5.2</url.version>
<org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
<org.ops4j.pax.url.mvn.settings></org.ops4j.pax.url.mvn.settings>
- <oak.version>0.9</oak.version>
+ <oak.version>0.10</oak.version>
</properties>
<build>
Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1540718&r1=1540717&r2=1540718&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Mon Nov 11 13:51:11 2013
@@ -38,7 +38,7 @@
<properties>
<sling.java.version>6</sling.java.version>
- <oak.version>0.9</oak.version>
+ <oak.version>0.10</oak.version>
</properties>
<build>
Modified:
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java?rev=1540718&r1=1540717&r2=1540718&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
(original)
+++
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
Mon Nov 11 13:51:11 2013
@@ -28,7 +28,6 @@ import java.security.PrivilegedException
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -49,12 +48,10 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
import
org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.AuthInfo;
import org.apache.jackrabbit.oak.api.ContentRepository;
-import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.jcr.repository.RepositoryImpl;
import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider;
import org.apache.jackrabbit.oak.plugins.commit.JcrConflictHandler;
@@ -82,13 +79,11 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authentication.ConfigurationUtil;
import org.apache.jackrabbit.oak.spi.security.principal.AdminPrincipal;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
-import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
import org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.whiteboard.OsgiWhiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
@@ -272,9 +267,9 @@ public class OakSlingRepository extends
private static final class ExtraSlingContent implements
RepositoryInitializer {
+
@Override
- public NodeState initialize(NodeState state) {
- NodeBuilder root = state.builder();
+ public void initialize(NodeBuilder root) {
if (root.hasChildNode(INDEX_DEFINITIONS_NAME)) {
NodeBuilder index = root.child(INDEX_DEFINITIONS_NAME);
@@ -309,7 +304,6 @@ public class OakSlingRepository extends
}
}
- return root.getNodeState();
}
/**
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1540718&r1=1540717&r2=1540718&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Nov 11 13:51:11
2013
@@ -543,45 +543,45 @@
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
- <version>0.9</version>
+ <version>0.10</version>
<runModes>oak</runModes>
</bundle>
<!-- embedded in oak.server for now
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
- <version>0.9</version>
+ <version>0.10</version>
<runModes>oak</runModes>
</bundle>
-->
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
- <version>0.9</version>
+ <version>0.10</version>
<runModes>oak</runModes>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk</artifactId>
- <version>0.9</version>
+ <version>0.10</version>
<runModes>oak</runModes>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk-api</artifactId>
- <version>0.9</version>
+ <version>0.10</version>
<runModes>oak</runModes>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk-remote</artifactId>
- <version>0.9</version>
+ <version>0.10</version>
<runModes>oak</runModes>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-lucene</artifactId>
- <version>0.9</version>
+ <version>0.10</version>
<runModes>oak</runModes>
</bundle>
</startLevel>
