Author: chetanm
Date: Wed Apr 19 08:37:31 2017
New Revision: 1791877
URL: http://svn.apache.org/viewvc?rev=1791877&view=rev
Log:
OAK-6094 - Test failure: SecondaryStoreConfigIT
-- Remove dependency on oak-segment-
-- Switch to SegmentNodeStoreFactory for configuring secondary store
Modified:
jackrabbit/oak/trunk/oak-pojosr/pom.xml
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy
Modified: jackrabbit/oak/trunk/oak-pojosr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/pom.xml?rev=1791877&r1=1791876&r2=1791877&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Wed Apr 19 08:37:31 2017
@@ -89,11 +89,6 @@
<dependencies>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-segment</artifactId>
- <version>1.6.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
<version>${project.version}</version>
</dependency>
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy?rev=1791877&r1=1791876&r2=1791877&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy
Wed Apr 19 08:37:31 2017
@@ -37,7 +37,7 @@ import static org.junit.Assume.assumeTru
class SecondaryStoreConfigIT extends AbstractRepositoryFactoryTest{
@Test
- public void secondaryNodeStoreCache() throws Exception{
+ void secondaryNodeStoreCache() throws Exception{
mongoCheck()
MongoUtils.dropDatabase(MongoUtils.DB)
config[REPOSITORY_CONFIG_FILE] =
createConfigValue("oak-base-config.json")
@@ -46,8 +46,8 @@ class SecondaryStoreConfigIT extends Abs
mongouri : MongoUtils.URL,
db : MongoUtils.DB
],
-
'org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService' : [
- secondary : true
+
'org.apache.jackrabbit.oak.segment.SegmentNodeStoreFactory-secondary.config' : [
+ role : "secondary"
],
'org.apache.jackrabbit.oak.plugins.document.secondary.SecondaryStoreCacheService'
: [
includedPaths : ['/']
@@ -76,8 +76,6 @@ class SecondaryStoreConfigIT extends Abs
}
private mongoCheck() {
- // FIXME: OAK-6094
- assumeTrue(false)
//Somehow in Groovy assumeNotNull cause issue as Groovy probably
//does away with null array causing a NPE
assumeTrue(MongoUtils.isAvailable())
