jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1393009 [2/2] - in /jackrabbit/oak/trunk: oak-bench/base/src/main/java/org/apache/jackrabbit/oak/performance/ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/m...
Date Tue, 02 Oct 2012 16:21:14 GMT
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java?rev=1393009&r1=1393008&r2=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java
Tue Oct  2 16:21:12 2012
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.jcr;
 
 import java.io.IOException;
 import java.util.concurrent.ScheduledExecutorService;
-
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.jcr.ItemExistsException;
@@ -47,13 +46,11 @@ import org.apache.jackrabbit.oak.api.Tre
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.jcr.observation.ObservationManagerImpl;
 import org.apache.jackrabbit.oak.jcr.security.principal.PrincipalManagerImpl;
-import org.apache.jackrabbit.oak.jcr.security.user.UserManagerImpl;
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl;
 import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
 import org.apache.jackrabbit.oak.security.principal.TmpPrincipalProvider;
-import org.apache.jackrabbit.oak.security.user.UserContextImpl;
-import org.apache.jackrabbit.oak.spi.security.user.UserContext;
+import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
 import org.apache.jackrabbit.oak.util.TODO;
 import org.apache.jackrabbit.oak.value.ValueFactoryImpl;
 import org.slf4j.Logger;
@@ -74,24 +71,28 @@ public class SessionDelegate {
     private final Root root;
     private final boolean autoRefresh;
 
-    private final IdentifierManager idManager;
+    private final SecurityProvider securityProvider;
 
+    private final IdentifierManager idManager;
     private ObservationManagerImpl observationManager;
     private boolean isAlive = true;
     private int sessionOpCount;
 
     SessionDelegate(
             Repository repository, ScheduledExecutorService executor,
-            ContentSession contentSession, boolean autoRefresh)
+            ContentSession contentSession, SecurityProvider securityProvider,
+            boolean autoRefresh)
             throws RepositoryException {
 
         this.repository = checkNotNull(repository);
         this.executor = executor;
         this.contentSession = checkNotNull(contentSession);
+        this.securityProvider = securityProvider;
+        this.autoRefresh = autoRefresh;
+
         this.root = contentSession.getLatestRoot();
         this.workspace = new WorkspaceImpl(this);
         this.session = new SessionImpl(this);
-        this.autoRefresh = autoRefresh;
         this.idManager = new IdentifierManager(root);
         this.namePathMapper = new NamePathMapperImpl(new SessionNameMapper(this), idManager);
         this.valueFactory = new ValueFactoryImpl(contentSession.getCoreValueFactory(), namePathMapper);
@@ -484,9 +485,10 @@ public class SessionDelegate {
 
     @Nonnull
     UserManager getUserManager() throws UnsupportedRepositoryOperationException {
-        // FIXME
-        UserContext ctx = new UserContextImpl();
-        return TODO.unimplemented().returnValue(new UserManagerImpl(getSession(), getNamePathMapper(),
ctx.getUserProvider(contentSession, root), ctx.getMembershipProvider(contentSession, root),
ctx.getConfig()));
+        if (securityProvider != null) {
+            return securityProvider.getUserContext().getUserManager(session, contentSession,
root, getNamePathMapper());
+        } else {
+            throw new UnsupportedRepositoryOperationException("User management not supported.");
+        }
     }
-
 }

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/OsgiRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/OsgiRepository.java?rev=1393009&r1=1393008&r2=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/OsgiRepository.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/OsgiRepository.java
Tue Oct  2 16:21:12 2012
@@ -35,7 +35,7 @@ public class OsgiRepository extends Repo
 
     public OsgiRepository(
             ContentRepository repository, ScheduledExecutorService executor) {
-        super(repository, executor);
+        super(repository, executor, null); // FIXME pass security provider
     }
 
     @Override

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java?rev=1393009&r1=1393008&r2=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java
Tue Oct  2 16:21:12 2012
@@ -20,6 +20,7 @@ import java.security.Principal;
 
 import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
 import org.apache.jackrabbit.api.security.principal.PrincipalManager;
+import org.apache.jackrabbit.oak.spi.security.principal.PrincipalIteratorAdapter;
 import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
 import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider;
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractUserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractUserTest.java?rev=1393009&r1=1393008&r2=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractUserTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractUserTest.java
Tue Oct  2 16:21:12 2012
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.jcr.se
 import java.security.Principal;
 import java.util.Collections;
 import java.util.UUID;
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.UnsupportedRepositoryOperationException;
@@ -89,6 +90,15 @@ public abstract class AbstractUserTest e
         return new Subject(true, Collections.singleton(p), Collections.emptySet(), Collections.emptySet());
     }
 
+    protected static Node getNode(Authorizable authorizable, Session session) throws NotExecutableException,
RepositoryException {
+        String path = authorizable.getPath();
+        if (session.nodeExists(path)) {
+            return session.getNode(path);
+        } else {
+            throw new NotExecutableException("Cannot access node for authorizable " + authorizable.getID());
+        }
+    }
+
     protected Principal getTestPrincipal() throws RepositoryException {
         String pn = "any_principal" + UUID.randomUUID();
         return getTestPrincipal(pn);
@@ -112,4 +122,5 @@ public abstract class AbstractUserTest e
         // should never happen. An Session should always have a corresponding User.
         throw new NotExecutableException("Unable to retrieve a User.");
     }
+
 }
\ No newline at end of file

Copied: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableTest.java
(from r1392769, jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImplTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableTest.java?p2=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableTest.java&p1=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImplTest.java&r1=1392769&r2=1393009&rev=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImplTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableTest.java
Tue Oct  2 16:21:12 2012
@@ -34,6 +34,7 @@ import javax.jcr.nodetype.ConstraintViol
 
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
+import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
 import org.apache.jackrabbit.test.NotExecutableException;
@@ -41,9 +42,9 @@ import org.apache.jackrabbit.value.Strin
 import org.junit.Test;
 
 /**
- * AuthorizableImplTest...
+ * AuthorizableTest...
  */
-public class AuthorizableImplTest extends AbstractUserTest {
+public class AuthorizableTest extends AbstractUserTest {
 
     private List<String> protectedUserProps = new ArrayList<String>();
     private List<String> protectedGroupProps = new ArrayList<String>();
@@ -136,8 +137,8 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testProtectedUserProperties() throws NotExecutableException, RepositoryException
{
-        UserImpl user = (UserImpl) getTestUser(superuser);
-        Node n = user.getNode();
+        User user = getTestUser(superuser);
+        Node n = getNode(user, superuser);
 
         if (n.hasProperty(UserConstants.REP_PASSWORD)) {
             checkProtected(n.getProperty(UserConstants.REP_PASSWORD));
@@ -152,7 +153,7 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testProtectedGroupProperties() throws NotExecutableException, RepositoryException
{
-        Node n = ((GroupImpl) group).getNode();
+        Node n = getNode(group, superuser);
 
         if (n.hasProperty(UserConstants.REP_PRINCIPAL_NAME)) {
             checkProtected(n.getProperty(UserConstants.REP_PRINCIPAL_NAME));
@@ -164,7 +165,7 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testMembersPropertyType() throws NotExecutableException, RepositoryException
{
-        Node n = ((GroupImpl) group).getNode();
+        Node n = getNode(group, superuser);
 
         if (!n.hasProperty(UserConstants.REP_MEMBERS)) {
             group.addMember(getTestUser(superuser));
@@ -215,10 +216,10 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testSetSpecialPropertiesDirectly() throws NotExecutableException, RepositoryException
{
-        AuthorizableImpl user = (AuthorizableImpl) getTestUser(superuser);
-        Node n = user.getNode();
+        Authorizable user = getTestUser(superuser);
+        Node n = getNode(user, superuser);
         try {
-            String pName = user.getPrincipalName();
+            String pName = user.getPrincipal().getName();
             n.setProperty(UserConstants.REP_PRINCIPAL_NAME, new StringValue("any-value"));
 
             // should have failed => change value back.
@@ -242,8 +243,8 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testRemoveSpecialUserPropertiesDirectly() throws RepositoryException, NotExecutableException
{
-        AuthorizableImpl g = (AuthorizableImpl) getTestUser(superuser);
-        Node n = g.getNode();
+        Authorizable g = getTestUser(superuser);
+        Node n = getNode(g, superuser);
         try {
             n.getProperty(UserConstants.REP_PASSWORD).remove();
             fail("Attempt to remove protected property rep:password should fail.");
@@ -262,7 +263,7 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testRemoveSpecialGroupPropertiesDirectly() throws RepositoryException, NotExecutableException
{
-        Node n = ((GroupImpl) group).getNode();
+        Node n = getNode(group, superuser);
         try {
             if (n.hasProperty(UserConstants.REP_PRINCIPAL_NAME)) {
                 n.getProperty(UserConstants.REP_PRINCIPAL_NAME).remove();
@@ -283,8 +284,8 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testUserGetProperties() throws RepositoryException, NotExecutableException
{
-        AuthorizableImpl user = (AuthorizableImpl) getTestUser(superuser);
-        Node n = user.getNode();
+        Authorizable user = getTestUser(superuser);
+        Node n = getNode(user, superuser);
 
         for (PropertyIterator it = n.getProperties(); it.hasNext();) {
             Property p = it.nextProperty();
@@ -301,7 +302,7 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testGroupGetProperties() throws RepositoryException, NotExecutableException
{
-        Node n = ((GroupImpl) group).getNode();
+        Node n = getNode(group, superuser);
 
         for (PropertyIterator it = n.getProperties(); it.hasNext();) {
             Property prop = it.nextProperty();
@@ -318,7 +319,7 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testSingleToMultiValued() throws Exception {
-        AuthorizableImpl user = (AuthorizableImpl) getTestUser(superuser);
+        Authorizable user = getTestUser(superuser);
         UserManager uMgr = getUserManager(superuser);
         try {
             Value v = superuser.getValueFactory().createValue("anyValue");
@@ -340,7 +341,7 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testMultiValuedToSingle() throws Exception {
-        AuthorizableImpl user = (AuthorizableImpl) getTestUser(superuser);
+        Authorizable user = getTestUser(superuser);
         UserManager uMgr = getUserManager(superuser);
         try {
             Value v = superuser.getValueFactory().createValue("anyValue");
@@ -362,8 +363,8 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testObjectMethods() throws Exception {
-        final AuthorizableImpl user = (AuthorizableImpl) getTestUser(superuser);
-        AuthorizableImpl user2 = (AuthorizableImpl) getTestUser(superuser);
+        final Authorizable user = getTestUser(superuser);
+        Authorizable user2 = getTestUser(superuser);
 
         assertEquals(user, user2);
         assertEquals(user.hashCode(), user2.hashCode());
@@ -436,9 +437,9 @@ public class AuthorizableImplTest extend
 
     @Test
     public void testGetPath() throws Exception {
-        AuthorizableImpl user = (AuthorizableImpl) getTestUser(superuser);
+        Authorizable user = getTestUser(superuser);
         try {
-            assertEquals(user.getNode().getPath(), user.getPath());
+            assertEquals(getNode(user, superuser).getPath(), user.getPath());
         } catch (UnsupportedRepositoryOperationException e) {
             // ok.
         }

Copied: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupTest.java
(from r1392769, jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImplTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupTest.java?p2=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupTest.java&p1=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImplTest.java&r1=1392769&r2=1393009&rev=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImplTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupTest.java
Tue Oct  2 16:21:12 2012
@@ -32,9 +32,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * GroupImplTest...
+ * GroupTest...
  */
-public class GroupImplTest extends AbstractUserTest {
+public class GroupTest extends AbstractUserTest {
 
     private List<String> members = new ArrayList<String>();
 

Copied: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/ImpersonationTest.java
(from r1392769, jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/ImpersonationImplTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/ImpersonationTest.java?p2=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/ImpersonationTest.java&p1=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/ImpersonationImplTest.java&r1=1392769&r2=1393009&rev=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/ImpersonationImplTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/ImpersonationTest.java
Tue Oct  2 16:21:12 2012
@@ -28,9 +28,9 @@ import org.apache.jackrabbit.test.NotExe
 import org.junit.Test;
 
 /**
- * ImpersonationImplTest...
+ * ImpersonationTest...
  */
-public class ImpersonationImplTest extends AbstractUserTest {
+public class ImpersonationTest extends AbstractUserTest {
 
     private User user2;
 

Copied: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerTest.java
(from r1392769, jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImplTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerTest.java?p2=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerTest.java&p1=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImplTest.java&r1=1392769&r2=1393009&rev=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImplTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerTest.java
Tue Oct  2 16:21:12 2012
@@ -41,7 +41,7 @@ import org.apache.jackrabbit.test.NotExe
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class UserManagerImplTest extends AbstractUserTest {
+public class UserManagerTest extends AbstractUserTest {
 
     private String getTestUserId(Principal p) throws RepositoryException {
         String hint = "UID" + p.getName();
@@ -62,7 +62,7 @@ public class UserManagerImplTest extends
         assertNotNull(userMgr.getAuthorizable(uid));
         assertEquals(user,  userMgr.getAuthorizable(uid));
 
-        assertNotNull(((UserImpl) user).getTree());
+        assertNotNull(getNode(user, superuser));
     }
 
     public void testGetAuthorizable() throws RepositoryException, NotExecutableException
{
@@ -74,7 +74,7 @@ public class UserManagerImplTest extends
         assertNotNull(userMgr.getAuthorizable(uid));
         assertEquals(user,  userMgr.getAuthorizable(uid));
 
-        assertNotNull(((UserImpl) user).getTree());
+        assertNotNull(getNode(user, superuser));
     }
 
     @Test
@@ -751,9 +751,9 @@ public class UserManagerImplTest extends
     }
 
     @Test
-    public void testEnforceAuthorizableFolderHierarchy() throws RepositoryException {
+    public void testEnforceAuthorizableFolderHierarchy() throws RepositoryException, NotExecutableException
{
         Authorizable auth = userMgr.getAuthorizable(user.getID());
-        Node userNode = superuser.getNode(auth.getPath());
+        Node userNode = getNode(auth, superuser);
 
         Node folder = userNode.addNode("folder", UserConstants.NT_REP_AUTHORIZABLE_FOLDER);
         String path = folder.getPath();

Copied: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserTest.java
(from r1392769, jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImplTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserTest.java?p2=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserTest.java&p1=jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImplTest.java&r1=1392769&r2=1393009&rev=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImplTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserTest.java
Tue Oct  2 16:21:12 2012
@@ -30,7 +30,7 @@ import org.junit.Test;
 /**
  * UserTest...
  */
-public class UserImplTest extends AbstractUserTest {
+public class UserTest extends AbstractUserTest {
 
     @Test
     public void testIsUser() throws RepositoryException {
@@ -48,6 +48,7 @@ public class UserImplTest extends Abstra
         assertFalse(user.isAdmin());
     }
 
+    @Test
     public void testAdminIsAdmin() throws NotExecutableException, RepositoryException {
         User admin = (User) userMgr.getAuthorizable(superuser.getUserID());
         if (admin == null) {

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1393009&r1=1393008&r2=1393009&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Tue
Oct  2 16:21:12 2012
@@ -168,7 +168,7 @@ public class Main {
             context.addServlet(oak, path + "/*");
 
             final Repository jcrRepository = new RepositoryImpl(
-                    repository, Executors.newScheduledThreadPool(1));
+                    repository, Executors.newScheduledThreadPool(1), null); // TODO: pass
securityprovider
 
             ServletHolder webdav =
                     new ServletHolder(new SimpleWebdavServlet() {



Mime
View raw message