You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/09/07 12:20:30 UTC
svn commit: r1759604 -
/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
Author: olli
Date: Wed Sep 7 12:20:30 2016
New Revision: 1759604
URL: http://svn.apache.org/viewvc?rev=1759604&view=rev
Log:
SLING-6043 Switch from inline configurations to config files
enable .config extension in Felix File Install
Modified:
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java?rev=1759604&r1=1759603&r2=1759604&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java Wed Sep 7 12:20:30 2016
@@ -136,6 +136,7 @@ public abstract class KarafTestSupport {
.unpackDirectory(new File("target/paxexam/" + getClass().getSimpleName())),
keepRuntimeFolder(),
logLevel(LogLevel.DEBUG),
+ editConfigurationFilePut("etc/custom.properties", "felix.fileinstall.filter", ".*\\\\.(cfg|config)"),
editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "DEBUG, out, sift, osgi:*"),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", Integer.toString(rmiRegistryPort)),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", Integer.toString(rmiServerPort)),