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/12/21 14:26:19 UTC
svn commit: r1775439 - in
/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src:
main/java/org/apache/sling/karaf/testing/
test/java/org/apache/sling/karaf/tests/bootstrap/
Author: olli
Date: Wed Dec 21 14:26:19 2016
New Revision: 1775439
URL: http://svn.apache.org/viewvc?rev=1775439&view=rev
Log:
SLING-6426 Use Felix Configuration Admin format for all configurations
Modified:
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlMongoIT.java
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.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=1775439&r1=1775438&r2=1775439&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 Dec 21 14:26:19 2016
@@ -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)),
Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java?rev=1775439&r1=1775438&r2=1775439&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsMessagingMailIT.java Wed Dec 21 14:26:19 2016
@@ -48,10 +48,10 @@ public class SlingCommonsMessagingMailIT
@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")
);
}
Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java?rev=1775439&r1=1775438&r2=1775439&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java Wed Dec 21 14:26:19 2016
@@ -77,10 +77,10 @@ public class SlingLaunchpadNosqlCouchbas
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()),
Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlMongoIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlMongoIT.java?rev=1775439&r1=1775438&r2=1775439&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlMongoIT.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlMongoIT.java Wed Dec 21 14:26:19 2016
@@ -83,7 +83,7 @@ public class SlingLaunchpadNosqlMongoIT
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()),
Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java?rev=1775439&r1=1775438&r2=1775439&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java Wed Dec 21 14:26:19 2016
@@ -75,7 +75,7 @@ public class SlingLaunchpadOakMongoIT ex
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()),