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/10/17 14:02:49 UTC
svn commit: r1399192 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/security/
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
test/java/org/apache/jackrabbit/oak/plugins/index/old/
test/java/org/apache/jackrabbit...
Author: mduerig
Date: Wed Oct 17 12:02:48 2012
New Revision: 1399192
URL: http://svn.apache.org/viewvc?rev=1399192&view=rev
Log:
OAK-379: Query test failures on buildbot
- revert changes from revision 1399172
- use default login module configuration when none is given
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java?rev=1399192&r1=1399191&r2=1399192&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java Wed Oct 17 12:02:48 2012
@@ -77,6 +77,11 @@ public class SecurityProviderImpl implem
loginConfig = new OakConfiguration();
Configuration.setConfiguration(loginConfig);
}
+ if (loginConfig.getAppConfigurationEntry(appName) == null) {
+ log.warn("Failed to retrieve login configuration for {}: using default configuration.", appName);
+ loginConfig = new OakConfiguration();
+ Configuration.setConfiguration(loginConfig);
+ }
return new LoginContextProviderImpl(appName, loginConfig, nodeStore, this);
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1399192&r1=1399191&r2=1399192&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Wed Oct 17 12:02:48 2012
@@ -26,7 +26,6 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.CompositeHook;
import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
/**
* Tests the query engine using the default index implementation: the
@@ -51,7 +50,7 @@ public class LuceneIndexQueryTest extend
TEST_INDEX_HOME));
MicroKernel mk = new MicroKernelImpl();
createDefaultKernelTracker().available(mk);
- return new Oak(mk).with(qip).with(ch).with(new OpenSecurityProvider()).createContentRepository();
+ return new Oak(mk).with(qip).with(ch).with(getSecurityProvider()).createContentRepository();
}
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java?rev=1399192&r1=1399191&r2=1399192&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java Wed Oct 17 12:02:48 2012
@@ -21,7 +21,6 @@ import org.apache.jackrabbit.oak.query.A
import org.apache.jackrabbit.oak.spi.commit.CompositeHook;
import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.Ignore;
import org.junit.Test;
@@ -45,7 +44,7 @@ public class QueryTest extends AbstractQ
QueryIndexProvider qip = new CompositeQueryIndexProvider(pi);
CompositeHook hook = new CompositeHook(pi);
createDefaultKernelTracker().available(mk);
- return new Oak(mk).with(qip).with(hook).with(new OpenSecurityProvider()).createContentRepository();
+ return new Oak(mk).with(qip).with(hook).with(getSecurityProvider()).createContentRepository();
}
@Test
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java?rev=1399192&r1=1399191&r2=1399192&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java Wed Oct 17 12:02:48 2012
@@ -25,7 +25,6 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.CompositeHook;
import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
/**
* Tests the query engine using the default index implementation: the
@@ -40,7 +39,7 @@ public class PropertyIndexQueryTest exte
CommitHook ch = new CompositeHook(new PropertyIndexHook());
MicroKernel mk = new MicroKernelImpl();
createDefaultKernelTracker().available(mk);
- return new Oak(mk).with(qip).with(ch).with(new OpenSecurityProvider()).createContentRepository();
+ return new Oak(mk).with(qip).with(ch).with(getSecurityProvider()).createContentRepository();
}
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java?rev=1399192&r1=1399191&r2=1399192&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java Wed Oct 17 12:02:48 2012
@@ -18,7 +18,6 @@ import org.apache.jackrabbit.mk.core.Mic
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
/**
* Tests the query engine using the default index implementation: the
@@ -30,7 +29,7 @@ public class TraversingIndexQueryTest ex
protected ContentRepository createRepository() {
MicroKernel mk = new MicroKernelImpl();
createDefaultKernelTracker().available(mk);
- return new Oak(mk).with(new OpenSecurityProvider()).createContentRepository();
+ return new Oak(mk).with(getSecurityProvider()).createContentRepository();
}
}