jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1302844 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr: GlobalContext.java SessionContext.java SessionImpl.java security/Authenticator.java security/AuthenticatorImpl.java security/CredentialsInfo.java
Date Tue, 20 Mar 2012 11:38:26 GMT
Author: angela
Date: Tue Mar 20 11:38:26 2012
New Revision: 1302844

URL: http://svn.apache.org/viewvc?rev=1302844&view=rev
Log:
OAK-27 : Remove Authenticator and CredentialsInfo in oak-jcr

Removed:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/Authenticator.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/AuthenticatorImpl.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/CredentialsInfo.java
Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java?rev=1302844&r1=1302843&r2=1302844&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java
Tue Mar 20 11:38:26 2012
@@ -22,8 +22,6 @@ package org.apache.jackrabbit.oak.jcr;
 import org.apache.jackrabbit.mk.MicroKernelFactory;
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.oak.jcr.configuration.RepositoryConfiguration;
-import org.apache.jackrabbit.oak.jcr.security.Authenticator;
-import org.apache.jackrabbit.oak.jcr.security.AuthenticatorImpl;
 import org.apache.jackrabbit.oak.jcr.util.Unchecked;
 
 import javax.jcr.Repository;
@@ -47,7 +45,6 @@ public class GlobalContext {
         put(RepositoryConfiguration.class, repositoryConfiguration);
         put(MicroKernel.class, MicroKernelFactory.getInstance(repositoryConfiguration.getMicrokernelUrl()));
         put(Repository.class, new RepositoryImpl(this));
-        put(Authenticator.class, AuthenticatorImpl.INSTANCE);
         put(SessionFactory.class, SessionImpl.FACTORY);
     }
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java?rev=1302844&r1=1302843&r2=1302844&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
Tue Mar 20 11:38:26 2012
@@ -20,7 +20,6 @@
 package org.apache.jackrabbit.oak.jcr;
 
 import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.oak.jcr.security.CredentialsInfo;
 import org.apache.jackrabbit.oak.jcr.state.NodeStateProvider;
 
 import javax.jcr.Session;
@@ -29,7 +28,6 @@ import javax.jcr.ValueFactory;
 public interface SessionContext<T extends Session> {
     T getSession();
     GlobalContext getGlobalContext();
-    CredentialsInfo getCredentialsInfo();
     String getWorkspaceName();
     MicroKernel getMicrokernel();
     String getRevision();

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java?rev=1302844&r1=1302843&r2=1302844&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
Tue Mar 20 11:38:26 2012
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.jcr;
 
 import org.apache.jackrabbit.commons.AbstractSession;
 import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.oak.jcr.security.Authenticator;
-import org.apache.jackrabbit.oak.jcr.security.CredentialsInfo;
 import org.apache.jackrabbit.oak.jcr.state.NodeStateProvider;
 import org.apache.jackrabbit.oak.jcr.state.TransientNodeState;
 import org.apache.jackrabbit.oak.jcr.state.TransientSpace;
@@ -62,7 +60,6 @@ public class SessionImpl extends Abstrac
     private final ValueFactory valueFactory;
 
     private final GlobalContext globalContext;
-    private final CredentialsInfo credentialsInfo;
     private final String workspaceName;
     private final MicroKernel microKernel;
     private final TransientSpace transientSpace;
@@ -76,8 +73,6 @@ public class SessionImpl extends Abstrac
         public Session createSession(GlobalContext globalContext, Credentials credentials,
                 String workspaceName) throws LoginException, NoSuchWorkspaceException {
 
-            Authenticator authenticator = globalContext.getInstance(Authenticator.class);
-            CredentialsInfo credentialsInfo = authenticator.authenticate(credentials);
             MicroKernel microKernel = globalContext.getInstance(MicroKernel.class);
             String revision = microKernel.getHeadRevision();
 
@@ -95,7 +90,7 @@ public class SessionImpl extends Abstrac
                 }
             }
 
-            return new SessionImpl(globalContext, credentialsInfo, workspaceName, revision);
+            return new SessionImpl(globalContext, workspaceName, revision);
         }
     };
 
@@ -114,11 +109,6 @@ public class SessionImpl extends Abstrac
         }
 
         @Override
-        public CredentialsInfo getCredentialsInfo() {
-            return credentialsInfo;
-        }
-
-        @Override
         public String getWorkspaceName() {
             return workspaceName;
         }
@@ -144,11 +134,10 @@ public class SessionImpl extends Abstrac
         }
     };
 
-    private SessionImpl(GlobalContext globalContext, CredentialsInfo credentialsInfo, String
workspaceName,
+    private SessionImpl(GlobalContext globalContext, String workspaceName,
             String revision) {
 
         this.globalContext = globalContext;
-        this.credentialsInfo = credentialsInfo;
         this.workspaceName = workspaceName;
         this.revision = revision;
 
@@ -171,17 +160,19 @@ public class SessionImpl extends Abstrac
 
     @Override
     public String getUserID() {
-        return credentialsInfo.getUserId();
+        // TODO
+        return null;
     }
 
     @Override
     public String[] getAttributeNames() {
-        return credentialsInfo.getAttributeNames();
-    }
+        // TODO
+        return null;    }
 
     @Override
     public Object getAttribute(String name) {
-        return credentialsInfo.getAttribute(name);
+        // TODO
+        return null;
     }
 
     @Override



Mime
View raw message