svn commit: r1522886 - in /sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server: Activator.java OakSlingRepository.java

[bdelacretaz]

Author: bdelacretaz
Date: Fri Sep 13 11:59:44 2013
New Revision: 1522886

URL: http://svn.apache.org/r1522886
Log:
SLING-2788 - adapt to latest Oak snapshot

Modified:
    
sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/Activator.java
    
sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java

Modified: 
sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/Activator.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/Activator.java?rev=1522886&r1=1522885&r2=1522886&view=diff
==============================================================================
--- 
sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/Activator.java
 (original)
+++ 
sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/Activator.java
 Fri Sep 13 11:59:44 2013
@@ -67,7 +67,7 @@ public class Activator implements Bundle
         // Else create a default NodeStore config
         final Hashtable<String, String> props = new Hashtable<String, 
String>();
         props.put("name", "Default NodeStore config from the oak-server 
bundle");
-        props.put("directory", "oak-server-default-NodeStore");
+        props.put("repository.home", "oak-server-default-NodeStore");
         Configuration config = ca.getConfiguration(nodeStoreServicePid);
         config.setBundleLocation(null);
         config.update(props);

Modified: 
sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java?rev=1522886&r1=1522885&r2=1522886&view=diff
==============================================================================
--- 
sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
 (original)
+++ 
sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
 Fri Sep 13 11:59:44 2013
@@ -288,8 +288,8 @@ public class OakSlingRepository extends 
         userConfig.put(UserConstants.PARAM_GROUP_PATH, "/home/groups");
         userConfig.put(UserConstants.PARAM_USER_PATH, "/home/users");
         userConfig.put(UserConstants.PARAM_DEFAULT_DEPTH, 1);
-        userConfig.put(AccessControlAction.USER_PRIVILEGE_NAMES, 
PrivilegeConstants.JCR_ALL);
-        userConfig.put(AccessControlAction.GROUP_PRIVILEGE_NAMES, 
PrivilegeConstants.JCR_READ);
+        userConfig.put(AccessControlAction.USER_PRIVILEGE_NAMES, new String[] 
{ PrivilegeConstants.JCR_ALL });
+        userConfig.put(AccessControlAction.GROUP_PRIVILEGE_NAMES, new String[] 
{ PrivilegeConstants.JCR_READ });
         userConfig.put(ProtectedItemImporter.PARAM_IMPORT_BEHAVIOR, 
ImportBehavior.NAME_BESTEFFORT);
 
         Map<String, Object> config = new HashMap<String, Object>();