You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2014/10/15 17:12:39 UTC
svn commit: r1632079 -
/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
Author: angela
Date: Wed Oct 15 15:12:38 2014
New Revision: 1632079
URL: http://svn.apache.org/r1632079
Log:
minor improvement
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java?rev=1632079&r1=1632078&r2=1632079&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java Wed Oct 15 15:12:38 2014
@@ -21,6 +21,7 @@ import java.util.Map;
import javax.jcr.Credentials;
import javax.jcr.GuestCredentials;
import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import javax.jcr.security.Privilege;
@@ -72,16 +73,7 @@ abstract class AbstractLoginTest extends
@Override
public void setUp(Repository repository, Credentials credentials) throws Exception {
- Credentials creds;
- if ("admin".equals(runAsUser)) {
- creds = credentials;
- } else if ("anonymous".equals(runAsUser)) {
- creds = new GuestCredentials();
- } else {
- creds = new SimpleCredentials(USER, USER.toCharArray());
- }
- super.setUp(repository, creds);
-
+ super.setUp(repository, buildCredentials(repository, credentials));
Session s = loginAdministrative();
try {
AccessControlUtils.addAccessControlEntry(s, "/", EveryonePrincipal.getInstance(), new String[]{Privilege.JCR_READ}, true);
@@ -92,7 +84,17 @@ abstract class AbstractLoginTest extends
s.save();
s.logout();
}
+ }
+ private Credentials buildCredentials(Repository repository, Credentials credentials) throws RepositoryException {
+ Credentials creds;
+ if ("admin".equals(runAsUser)) {
+ creds = credentials;
+ } else if ("anonymous".equals(runAsUser)) {
+ creds = new GuestCredentials();
+ } else {
+ creds = new SimpleCredentials(USER, USER.toCharArray());
+ }
if (runWithToken) {
Configuration.setConfiguration(ConfigurationUtil.getJackrabbit2Configuration(ConfigurationParameters.EMPTY));
if (creds instanceof SimpleCredentials) {
@@ -104,6 +106,7 @@ abstract class AbstractLoginTest extends
throw new UnsupportedOperationException();
}
}
+ return creds;
}
@Override