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 md...@apache.org on 2012/12/07 23:37:08 UTC
svn commit: r1418528 - in /jackrabbit/oak/trunk:
oak-core/src/test/java/org/apache/jackrabbit/oak/security/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/
Author: mduerig
Date: Fri Dec 7 22:37:07 2012
New Revision: 1418528
URL: http://svn.apache.org/viewvc?rev=1418528&view=rev
Log:
OAK-497: No LoginModules configured error on Java 7
remove now obsolete work around
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/AbstractSecurityTest.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStubBase.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/AbstractSecurityTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/AbstractSecurityTest.java?rev=1418528&r1=1418527&r2=1418528&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/AbstractSecurityTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/AbstractSecurityTest.java Fri Dec 7 22:37:07 2012
@@ -47,8 +47,6 @@ public abstract class AbstractSecurityTe
.with(getSecurityProvider())
.createContentRepository();
- // TODO: OAK-17. workaround for missing test configuration
- Configuration.setConfiguration(new OakConfiguration());
admin = login(getAdminCredentials());
Configuration.setConfiguration(getConfiguration());
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStubBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStubBase.java?rev=1418528&r1=1418527&r2=1418528&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStubBase.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStubBase.java Fri Dec 7 22:37:07 2012
@@ -19,16 +19,15 @@ package org.apache.jackrabbit.oak.jcr;
import java.security.Principal;
import java.util.Properties;
import java.util.concurrent.Executors;
+
import javax.jcr.Credentials;
import javax.jcr.GuestCredentials;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.security.auth.login.Configuration;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.apache.jackrabbit.oak.security.OakConfiguration;
import org.apache.jackrabbit.test.NotExecutableException;
import org.apache.jackrabbit.test.RepositoryStub;
@@ -42,12 +41,9 @@ public class OakRepositoryStubBase exten
* @param settings repository settings
* @throws javax.jcr.RepositoryException If an error occurs.
*/
- public OakRepositoryStubBase(Properties settings) throws RepositoryException {
+ public OakRepositoryStubBase(Properties settings) {
super(settings);
- // TODO: OAK-17. workaround for missing test configuration
- Configuration.setConfiguration(new OakConfiguration());
-
String dir = "target/mk-tck-" + System.currentTimeMillis();
Jcr jcr = new Jcr(new MicroKernelImpl(dir));
jcr.with(Executors.newScheduledThreadPool(1));
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java?rev=1418528&r1=1418527&r2=1418528&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java Fri Dec 7 22:37:07 2012
@@ -18,16 +18,14 @@ package org.apache.jackrabbit.oak.jcr;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+
import javax.jcr.GuestCredentials;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
-import javax.security.auth.login.Configuration;
-import org.apache.jackrabbit.oak.security.OakConfiguration;
import org.junit.After;
-import org.junit.Before;
/**
* Abstract base class for repository tests providing methods for accessing
@@ -43,12 +41,6 @@ public abstract class AbstractRepository
private Repository repository = null;
private Session adminSession = null;
- @Before
- public void before() throws Exception {
- // TODO: OAK-17. workaround for missing test configuration
- Configuration.setConfiguration(new OakConfiguration());
- }
-
@After
public void logout() throws RepositoryException {
// release session field