Author: olli
Date: Tue Jul 14 06:54:46 2015
New Revision: 1690868
URL: http://svn.apache.org/r1690868
Log:
SLING-4411 SLING-4412 workaround OAK-3083
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java?rev=1690868&r1=1690867&r2=1690868&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
Tue Jul 14 06:54:46 2015
@@ -137,6 +137,7 @@ public abstract class KarafTestSupport {
.unpackDirectory(new File("target/paxexam/" +
getClass().getSimpleName())),
keepRuntimeFolder(),
logLevel(LogLevelOption.LogLevel.INFO),
+ editConfigurationFilePut("etc/org.apache.karaf.features.cfg",
"serviceRequirements", "disable"), // TODO OAK-3083
editConfigurationFilePut("etc/org.apache.karaf.features.cfg",
"featuresBoot", "(aries-blueprint, bundle, config, deployer, diagnostic,
feature, instance, jaas, kar, log, management, package, service, shell,
shell-compat, ssh, system, wrap, eventadmin, webconsole, http,
http-whiteboard)"),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg",
"rmiRegistryPort", Integer.toString(rmiRegistryPort)),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg",
"rmiServerPort", Integer.toString(rmiServerPort)),
