Author: olli
Date: Tue Nov 3 12:21:04 2015
New Revision: 1712273
URL: http://svn.apache.org/viewvc?rev=1712273&view=rev
Log:
SLING-4411 provide Oak features
remove workaround for 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=1712273&r1=1712272&r2=1712273&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 Nov 3 12:21:04 2015
@@ -136,7 +136,6 @@ 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)),
