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-scripting-freemarker.git
commit 4ab98f796e1f97622dd578e804add9e21356c7a4 Author: Oliver Lietz <[email protected]> AuthorDate: Sun Sep 22 11:13:08 2019 +0200 move initial content to directory initial-content --- .../sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java | 6 +----- .../{ => initial-content}/apps/freemarker/page/adaptto/html.ftl | 0 .../{ => initial-content}/apps/freemarker/page/bindings/html.ftl | 0 .../{ => initial-content}/apps/freemarker/page/include/html.ftl | 0 .../{ => initial-content}/apps/freemarker/page/simple/html.ftl | 0 .../resources/{ => initial-content}/apps/jsp/page/resource/html.jsp | 0 src/test/resources/{ => initial-content}/content/freemarker.json | 0 7 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java index 5f64874..209c244 100644 --- a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java +++ b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java @@ -86,11 +86,7 @@ public abstract class FreemarkerTestSupport extends TestSupport { public TestProbeBuilder probeConfiguration(final TestProbeBuilder testProbeBuilder) { testProbeBuilder.setHeader(Constants.EXPORT_PACKAGE, "org.apache.sling.scripting.freemarker.it.app"); testProbeBuilder.setHeader("Sling-Model-Packages", "org.apache.sling.scripting.freemarker.it.app"); - testProbeBuilder.setHeader("Sling-Initial-Content", String.join(",", - "apps/freemarker;path:=/apps/freemarker;overwrite:=true;uninstall:=true", - "apps/jsp;path:=/apps/jsp;overwrite:=true;uninstall:=true", - "content;path:=/content;overwrite:=true;uninstall:=true" - )); + testProbeBuilder.setHeader("Sling-Initial-Content", "initial-content"); return testProbeBuilder; } diff --git a/src/test/resources/apps/freemarker/page/adaptto/html.ftl b/src/test/resources/initial-content/apps/freemarker/page/adaptto/html.ftl similarity index 100% rename from src/test/resources/apps/freemarker/page/adaptto/html.ftl rename to src/test/resources/initial-content/apps/freemarker/page/adaptto/html.ftl diff --git a/src/test/resources/apps/freemarker/page/bindings/html.ftl b/src/test/resources/initial-content/apps/freemarker/page/bindings/html.ftl similarity index 100% rename from src/test/resources/apps/freemarker/page/bindings/html.ftl rename to src/test/resources/initial-content/apps/freemarker/page/bindings/html.ftl diff --git a/src/test/resources/apps/freemarker/page/include/html.ftl b/src/test/resources/initial-content/apps/freemarker/page/include/html.ftl similarity index 100% rename from src/test/resources/apps/freemarker/page/include/html.ftl rename to src/test/resources/initial-content/apps/freemarker/page/include/html.ftl diff --git a/src/test/resources/apps/freemarker/page/simple/html.ftl b/src/test/resources/initial-content/apps/freemarker/page/simple/html.ftl similarity index 100% rename from src/test/resources/apps/freemarker/page/simple/html.ftl rename to src/test/resources/initial-content/apps/freemarker/page/simple/html.ftl diff --git a/src/test/resources/apps/jsp/page/resource/html.jsp b/src/test/resources/initial-content/apps/jsp/page/resource/html.jsp similarity index 100% rename from src/test/resources/apps/jsp/page/resource/html.jsp rename to src/test/resources/initial-content/apps/jsp/page/resource/html.jsp diff --git a/src/test/resources/content/freemarker.json b/src/test/resources/initial-content/content/freemarker.json similarity index 100% rename from src/test/resources/content/freemarker.json rename to src/test/resources/initial-content/content/freemarker.json
