Author: chetanm
Date: Mon Mar 21 05:31:44 2016
New Revision: 1735920
URL: http://svn.apache.org/viewvc?rev=1735920&view=rev
Log:
OAK-4132 - JaasConfigSpiTest fails intermittently with missing LoginModule
exception
Merging 1735549, 1735919
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 21 05:31:44 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735588,1735622,1735638
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735549,1735588,1735622,1735638,1735919
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy?rev=1735920&r1=1735919&r2=1735920&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
(original)
+++
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
Mon Mar 21 05:31:44 2016
@@ -58,6 +58,15 @@ abstract class AbstractRepositoryFactory
@After
void tearDown() {
+ try {
+ if (repository == null) {
+ PojoServiceRegistry registry = getRegistry()
+ OakOSGiRepositoryFactory.shutdown(registry, 5)
+ }
+ } catch (AssertionError ignore){
+
+ }
+
if (repository instanceof JackrabbitRepository) {
((JackrabbitRepository) repository).shutdown();
}
Modified:
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy?rev=1735920&r1=1735919&r2=1735920&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
(original)
+++
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
Mon Mar 21 05:31:44 2016
@@ -22,7 +22,6 @@ package org.apache.jackrabbit.oak.run.os
import org.apache.felix.connect.launch.BundleDescriptor
import org.apache.felix.connect.launch.PojoServiceRegistry
import groovy.json.JsonOutput
-import org.apache.commons.io.FileUtils
import org.junit.After
import org.junit.Before
import org.junit.Rule
@@ -53,6 +52,11 @@ class ConfigTest {
]
}
+ @After
+ void shutDown(){
+ OakOSGiRepositoryFactory.shutdown(registry, 5)
+ }
+
@Test
void testRuntimeConfig(){
config[REPOSITORY_CONFIG] = createConfigMap()
@@ -96,6 +100,8 @@ class ConfigTest {
assert cm.getConfiguration('bar').properties.get('a') == 'a1'
assert cm.getConfiguration('foo2').properties.get('a') == 'a2'
+ shutDown()
+
//Now re init and remove the pid bar
config[REPOSITORY_CONFIG] = [
foo : [a:'a-new', b:1],
Modified:
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1735920&r1=1735919&r2=1735920&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
(original)
+++
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
Mon Mar 21 05:31:44 2016
@@ -302,6 +302,7 @@ class DocumentNodeStoreConfigTest extend
@After
public void tearDown() {
+ super.tearDown()
if (mongoConn) {
MongoUtils.dropCollections(mongoConn.DB)
}
Modified:
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy?rev=1735920&r1=1735919&r2=1735920&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
(original)
+++
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
Mon Mar 21 05:31:44 2016
@@ -46,7 +46,11 @@ class SecurityProviderRegistrationTest e
registry = repositoryFactory.initializeServiceRegistry(config)
}
- /**
+ @Override
+ protected PojoServiceRegistry getRegistry() {
+ return registry
+ }
+/**
* Test that, without any additional configuration, a SecurityProvider
* service is registered by default.
*/
