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 2020/04/01 06:40:42 UTC
[sling-org-apache-sling-testing-paxexam] 04/10: SLING-9310 Rename
Option composum to composumNodes
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit ed1b8e38bdce4d1d26976b58ce16a8e6a310d7dd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Mar 31 09:51:15 2020 +0200
SLING-9310 Rename Option composum to composumNodes
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 4 ++--
...SlingOptionsComposumIT.java => SlingOptionsComposumNodesIT.java} | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index d919ba7..6f49115 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -1005,7 +1005,7 @@ public class SlingOptions {
);
}
- public static ModifiableCompositeOption composum() {
+ public static ModifiableCompositeOption composumNodes() {
return composite(
sling(),
slingJcr(),
@@ -1020,7 +1020,7 @@ public class SlingOptions {
mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-package-manager").version(versionResolver),
factoryConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment")
.put("whitelist.bundles", new String[]{"com.composum.core.commons", "com.composum.core.pckgmgr"})
- .put("whitelist.name", "composum")
+ .put("whitelist.name", "composum-nodes")
.asOption()
);
}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumNodesIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumNodesIT.java
index 877e00e..a4d21fc 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumNodesIT.java
@@ -27,18 +27,18 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-import static org.apache.sling.testing.paxexam.SlingOptions.composum;
+import static org.apache.sling.testing.paxexam.SlingOptions.composumNodes;
import static org.ops4j.pax.exam.CoreOptions.options;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsComposumIT extends SlingOptionsTestSupport {
+public class SlingOptionsComposumNodesIT extends SlingOptionsTestSupport {
@Configuration
public Option[] configuration() {
return options(
baseConfiguration(),
- composum()
+ composumNodes()
);
}