SLING-6426 Use Felix Configuration Admin format for all configurations
authorOliver Lietz <olli@apache.org>
Wed, 21 Dec 2016 14:26:19 +0000 (14:26 +0000)
committerOliver Lietz <olli@apache.org>
Wed, 21 Dec 2016 14:26:19 +0000 (14:26 +0000)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1775439 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlMongoIT.java
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java

index ab8144b..6b8557c 100644 (file)
@@ -136,7 +136,7 @@ public abstract class KarafTestSupport {
                 .unpackDirectory(new File("target/paxexam/" + getClass().getSimpleName())),
             keepRuntimeFolder(),
             logLevel(LogLevel.DEBUG),
-            editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.cfg", "whitelist.bundles.regexp", "^PAXEXAM.*$"),
+            editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config", "whitelist.bundles.regexp", "^PAXEXAM.*$"),
             editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "DEBUG, out, sift, osgi:*"),
             editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "serviceRequirements", "disable"),
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", Integer.toString(rmiRegistryPort)),
index 105a17b..5a5a3cf 100644 (file)
@@ -48,10 +48,10 @@ public class SlingCommonsMessagingMailIT extends KarafTestSupport {
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.cfg", "subject", "Default Subject"),
-            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.cfg", "from", "from@example.net"),
-            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.cfg", "smtp.hostname", "localhost"),
-            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.cfg", "smtp.port", "25"),
+            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "subject", "Default Subject"),
+            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "from", "from@example.net"),
+            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "smtp.hostname", "localhost"),
+            editConfigurationFilePut("etc/org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder.config", "smtp.port", "25"),
             addSlingFeatures("sling-commons-messaging-mail")
         );
     }
index 2880c59..04ed966 100644 (file)
@@ -77,10 +77,10 @@ public class SlingLaunchpadNosqlCouchbaseIT extends KarafTestSupport {
         final String couchbaseHosts = String.format("localhost:%s", port);
         return OptionUtils.combine(baseConfiguration(),
             editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(wrap)"),
-            editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.cfg", "couchbaseHosts", couchbaseHosts),
-            editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.cfg", "clientId", "sling-resourceprovider-couchbase"),
-            editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.cfg", "bucketName", "sling"),
-            editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.cfg", "enabled", "true"),
+            editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.config", "couchbaseHosts", couchbaseHosts),
+            editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.config", "clientId", "sling-resourceprovider-couchbase"),
+            editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.config", "bucketName", "sling"),
+            editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.config", "enabled", "true"),
             // wrappedBundle(mavenBundle().groupId("org.couchbase.mock").artifactId("CouchbaseMock").versionAsInProject()),
             wrappedBundle(mavenBundle().groupId("com.couchbase.client").artifactId("couchbase-client").versionAsInProject()),
             wrappedBundle(mavenBundle().groupId("com.intellij").artifactId("annotations").versionAsInProject()),
index 795f3d0..a422b8f 100644 (file)
@@ -83,7 +83,7 @@ public class SlingLaunchpadNosqlMongoIT extends KarafTestSupport {
         final String connectionString = String.format("localhost:%s", port);
         return OptionUtils.combine(baseConfiguration(),
             editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(wrap)"),
-            editConfigurationFilePut("etc/org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config.cfg", "connectionString", connectionString),
+            editConfigurationFilePut("etc/org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config.config", "connectionString", connectionString),
             wrappedBundle(mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.mongo").versionAsInProject()),
             wrappedBundle(mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.process").versionAsInProject()),
             wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna").versionAsInProject()),
index 5b8262d..3f775c9 100644 (file)
@@ -75,7 +75,7 @@ public class SlingLaunchpadOakMongoIT extends AbstractSlingLaunchpadOakTestSuppo
         final String mongoUri = String.format("mongodb://localhost:%s", port);
         return OptionUtils.combine(baseConfiguration(),
             editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(wrap)"),
-            editConfigurationFilePut("etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg", "mongouri", mongoUri),
+            editConfigurationFilePut("etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config", "mongouri", mongoUri),
             wrappedBundle(mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.mongo").versionAsInProject()),
             wrappedBundle(mavenBundle().groupId("de.flapdoodle.embed").artifactId("de.flapdoodle.embed.process").versionAsInProject()),
             wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna").versionAsInProject()),