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/02/26 12:41:13 UTC
[sling-org-apache-sling-pipes] 01/06: move initial content to
directory initial-content
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-pipes.git
commit f543b8c9b3698f194fb956d77e1b74091229fba2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Feb 25 20:59:23 2020 +0100
move initial content to directory initial-content
---
src/test/java/org/apache/sling/pipes/AbstractPipeTest.java | 2 +-
src/test/java/org/apache/sling/pipes/ManifoldPipeTest.java | 2 +-
src/test/java/org/apache/sling/pipes/internal/ACLPipeTest.java | 2 +-
src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java | 2 +-
src/test/java/org/apache/sling/pipes/internal/PackagePipeTest.java | 2 +-
src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java | 5 +----
.../jcr_root => initial-content}/apps/pipes-it/fruit/fruit.html | 0
.../jcr_root => initial-content}/apps/pipes-it/list/list.html | 0
.../{SLING-INF/jcr_root => initial-content}/content/fruits.json | 0
.../jcr_root => initial-content}/content/list-component.json | 0
.../jcr_root => initial-content}/etc/pipes-it/another-list.json | 0
.../jcr_root => initial-content}/etc/pipes-it/bad-list.json | 0
.../jcr_root => initial-content}/etc/pipes-it/fruit-list.json | 0
13 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java b/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java
index 0355604..2c3c128 100644
--- a/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java
@@ -72,7 +72,7 @@ public class AbstractPipeTest {
plumberImpl.registerPipe("slingPipes/dummyNull", DummyNull.class);
plumberImpl.registerPipe("slingPipes/dummySearch", DummySearch.class);
plumber = plumberImpl;
- context.load().json("/SLING-INF/jcr_root/content/fruits.json", PATH_FRUITS);
+ context.load().json("/initial-content/content/fruits.json", PATH_FRUITS);
}
protected Pipe getPipe(String path){
diff --git a/src/test/java/org/apache/sling/pipes/ManifoldPipeTest.java b/src/test/java/org/apache/sling/pipes/ManifoldPipeTest.java
index c1d959e..fb36a25 100644
--- a/src/test/java/org/apache/sling/pipes/ManifoldPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/ManifoldPipeTest.java
@@ -43,7 +43,7 @@ public class ManifoldPipeTest extends AbstractPipeTest {
public void setup() throws PersistenceException {
super.setup();
context = new SlingContext(ResourceResolverType.JCR_OAK);
- context.load().json("/SLING-INF/jcr_root/content/fruits.json", PATH_FRUITS);
+ context.load().json("/initial-content/content/fruits.json", PATH_FRUITS);
context.load().json("/threaded.json", PATH_PIPE);
}
diff --git a/src/test/java/org/apache/sling/pipes/internal/ACLPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/ACLPipeTest.java
index 29e5dfa..e92b7e4 100644
--- a/src/test/java/org/apache/sling/pipes/internal/ACLPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/ACLPipeTest.java
@@ -53,7 +53,7 @@ public class ACLPipeTest extends AbstractPipeTest {
public void setup() throws PersistenceException {
super.setup();
oak.load().json("/acl.json", PATH_PIPE);
- oak.load().json("/SLING-INF/jcr_root/content/fruits.json", PATH_FRUITS);
+ oak.load().json("/initial-content/content/fruits.json", PATH_FRUITS);
}
@Test
diff --git a/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
index bc3f559..f02b509 100644
--- a/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
@@ -53,7 +53,7 @@ public class MovePipeTest extends AbstractPipeTest {
public void setup() throws PersistenceException {
super.setup();
oak.load().json("/move.json", PATH_PIPE);
- oak.load().json("/SLING-INF/jcr_root/content/fruits.json", PATH_FRUITS);
+ oak.load().json("/initial-content/content/fruits.json", PATH_FRUITS);
}
@Test
diff --git a/src/test/java/org/apache/sling/pipes/internal/PackagePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/PackagePipeTest.java
index ae27948..980be4a 100644
--- a/src/test/java/org/apache/sling/pipes/internal/PackagePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/PackagePipeTest.java
@@ -36,7 +36,7 @@ public class PackagePipeTest extends AbstractPipeTest {
@Test
public void filterModeTest() throws Exception {
- oak.load().json("/SLING-INF/jcr_root/content/fruits.json", PATH_FRUITS);
+ oak.load().json("/initial-content/content/fruits.json", PATH_FRUITS);
String packagePath = "/content/package";
ExecutionResult result = plumber.newPipe(oak.resourceResolver())
.echo("/content/fruits")
diff --git a/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java b/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
index 0818fcd..fa37e6a 100644
--- a/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
+++ b/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
@@ -113,10 +113,7 @@ public abstract class PipesTestSupport extends TestSupport {
@ProbeBuilder
public TestProbeBuilder probeConfiguration(final TestProbeBuilder testProbeBuilder) {
- testProbeBuilder.setHeader("Sling-Initial-Content",
- "SLING-INF/jcr_root/apps/pipes-it;path:=/apps/pipes-it;overwrite:=true," +
- "SLING-INF/jcr_root/etc/pipes-it;path:=/etc/pipes-it;overwrite:=true," +
- "SLING-INF/jcr_root/content;path:=/content;overwrite:=true"
+ testProbeBuilder.setHeader("Sling-Initial-Content","initial-content"
);
return testProbeBuilder;
}
diff --git a/src/test/resources/SLING-INF/jcr_root/apps/pipes-it/fruit/fruit.html b/src/test/resources/initial-content/apps/pipes-it/fruit/fruit.html
similarity index 100%
rename from src/test/resources/SLING-INF/jcr_root/apps/pipes-it/fruit/fruit.html
rename to src/test/resources/initial-content/apps/pipes-it/fruit/fruit.html
diff --git a/src/test/resources/SLING-INF/jcr_root/apps/pipes-it/list/list.html b/src/test/resources/initial-content/apps/pipes-it/list/list.html
similarity index 100%
rename from src/test/resources/SLING-INF/jcr_root/apps/pipes-it/list/list.html
rename to src/test/resources/initial-content/apps/pipes-it/list/list.html
diff --git a/src/test/resources/SLING-INF/jcr_root/content/fruits.json b/src/test/resources/initial-content/content/fruits.json
similarity index 100%
rename from src/test/resources/SLING-INF/jcr_root/content/fruits.json
rename to src/test/resources/initial-content/content/fruits.json
diff --git a/src/test/resources/SLING-INF/jcr_root/content/list-component.json b/src/test/resources/initial-content/content/list-component.json
similarity index 100%
rename from src/test/resources/SLING-INF/jcr_root/content/list-component.json
rename to src/test/resources/initial-content/content/list-component.json
diff --git a/src/test/resources/SLING-INF/jcr_root/etc/pipes-it/another-list.json b/src/test/resources/initial-content/etc/pipes-it/another-list.json
similarity index 100%
rename from src/test/resources/SLING-INF/jcr_root/etc/pipes-it/another-list.json
rename to src/test/resources/initial-content/etc/pipes-it/another-list.json
diff --git a/src/test/resources/SLING-INF/jcr_root/etc/pipes-it/bad-list.json b/src/test/resources/initial-content/etc/pipes-it/bad-list.json
similarity index 100%
rename from src/test/resources/SLING-INF/jcr_root/etc/pipes-it/bad-list.json
rename to src/test/resources/initial-content/etc/pipes-it/bad-list.json
diff --git a/src/test/resources/SLING-INF/jcr_root/etc/pipes-it/fruit-list.json b/src/test/resources/initial-content/etc/pipes-it/fruit-list.json
similarity index 100%
rename from src/test/resources/SLING-INF/jcr_root/etc/pipes-it/fruit-list.json
rename to src/test/resources/initial-content/etc/pipes-it/fruit-list.json