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 2019/09/22 11:54:07 UTC
[sling-org-apache-sling-scripting-thymeleaf] branch master updated:
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-scripting-thymeleaf.git
The following commit(s) were added to refs/heads/master by this push:
new 6875511 move initial content to directory initial-content
6875511 is described below
commit 6875511081f85bba3264a109eadf0f3844e4e833
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Sep 22 13:50:35 2019 +0200
move initial content to directory initial-content
---
.../sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java | 6 +-----
.../resources/{ => initial-content}/apps/jsp/page/resource/html.jsp | 0
src/test/resources/{ => initial-content}/apps/thymeleaf/ROOT.json | 0
...ping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.json | 0
.../{ => initial-content}/apps/thymeleaf/page/adaptto/html.html | 0
.../{ => initial-content}/apps/thymeleaf/page/bindings/html.html | 0
.../{ => initial-content}/apps/thymeleaf/page/decoupled/html.html | 0
.../{ => initial-content}/apps/thymeleaf/page/decoupled/html.th.xml | 0
.../{ => initial-content}/apps/thymeleaf/page/fragments/head.html | 0
.../{ => initial-content}/apps/thymeleaf/page/include/html.html | 0
.../{ => initial-content}/apps/thymeleaf/page/link/html.html | 0
.../{ => initial-content}/apps/thymeleaf/page/main/html.html | 0
.../{ => initial-content}/apps/thymeleaf/page/replace/html.html | 0
.../{ => initial-content}/apps/thymeleaf/page/text/html.html | 0
src/test/resources/{ => initial-content}/content/thymeleaf.json | 0
15 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
index 7bd4f66..9595edd 100644
--- a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
@@ -97,11 +97,7 @@ public abstract class ThymeleafTestSupport extends TestSupport {
testProbeBuilder.setHeader(Constants.BUNDLE_SYMBOLICNAME, "org.apache.sling.scripting.thymeleaf.it.app");
testProbeBuilder.setHeader(Constants.EXPORT_PACKAGE, "org.apache.sling.scripting.thymeleaf.it.app");
testProbeBuilder.setHeader("Sling-Model-Packages", "org.apache.sling.scripting.thymeleaf.it.app");
- testProbeBuilder.setHeader("Sling-Initial-Content", String.join(",",
- "apps/jsp;path:=/apps/jsp;overwrite:=true;uninstall:=true",
- "apps/thymeleaf;path:=/apps/thymeleaf;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/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/apps/thymeleaf/ROOT.json b/src/test/resources/initial-content/apps/thymeleaf/ROOT.json
similarity index 100%
rename from src/test/resources/apps/thymeleaf/ROOT.json
rename to src/test/resources/initial-content/apps/thymeleaf/ROOT.json
diff --git a/src/test/resources/apps/thymeleaf/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.json b/src/test/resources/initial-content/apps/thymeleaf/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.json
similarity index 100%
rename from src/test/resources/apps/thymeleaf/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.json
rename to src/test/resources/initial-content/apps/thymeleaf/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.json
diff --git a/src/test/resources/apps/thymeleaf/page/adaptto/html.html b/src/test/resources/initial-content/apps/thymeleaf/page/adaptto/html.html
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/adaptto/html.html
rename to src/test/resources/initial-content/apps/thymeleaf/page/adaptto/html.html
diff --git a/src/test/resources/apps/thymeleaf/page/bindings/html.html b/src/test/resources/initial-content/apps/thymeleaf/page/bindings/html.html
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/bindings/html.html
rename to src/test/resources/initial-content/apps/thymeleaf/page/bindings/html.html
diff --git a/src/test/resources/apps/thymeleaf/page/decoupled/html.html b/src/test/resources/initial-content/apps/thymeleaf/page/decoupled/html.html
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/decoupled/html.html
rename to src/test/resources/initial-content/apps/thymeleaf/page/decoupled/html.html
diff --git a/src/test/resources/apps/thymeleaf/page/decoupled/html.th.xml b/src/test/resources/initial-content/apps/thymeleaf/page/decoupled/html.th.xml
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/decoupled/html.th.xml
rename to src/test/resources/initial-content/apps/thymeleaf/page/decoupled/html.th.xml
diff --git a/src/test/resources/apps/thymeleaf/page/fragments/head.html b/src/test/resources/initial-content/apps/thymeleaf/page/fragments/head.html
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/fragments/head.html
rename to src/test/resources/initial-content/apps/thymeleaf/page/fragments/head.html
diff --git a/src/test/resources/apps/thymeleaf/page/include/html.html b/src/test/resources/initial-content/apps/thymeleaf/page/include/html.html
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/include/html.html
rename to src/test/resources/initial-content/apps/thymeleaf/page/include/html.html
diff --git a/src/test/resources/apps/thymeleaf/page/link/html.html b/src/test/resources/initial-content/apps/thymeleaf/page/link/html.html
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/link/html.html
rename to src/test/resources/initial-content/apps/thymeleaf/page/link/html.html
diff --git a/src/test/resources/apps/thymeleaf/page/main/html.html b/src/test/resources/initial-content/apps/thymeleaf/page/main/html.html
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/main/html.html
rename to src/test/resources/initial-content/apps/thymeleaf/page/main/html.html
diff --git a/src/test/resources/apps/thymeleaf/page/replace/html.html b/src/test/resources/initial-content/apps/thymeleaf/page/replace/html.html
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/replace/html.html
rename to src/test/resources/initial-content/apps/thymeleaf/page/replace/html.html
diff --git a/src/test/resources/apps/thymeleaf/page/text/html.html b/src/test/resources/initial-content/apps/thymeleaf/page/text/html.html
similarity index 100%
rename from src/test/resources/apps/thymeleaf/page/text/html.html
rename to src/test/resources/initial-content/apps/thymeleaf/page/text/html.html
diff --git a/src/test/resources/content/thymeleaf.json b/src/test/resources/initial-content/content/thymeleaf.json
similarity index 100%
rename from src/test/resources/content/thymeleaf.json
rename to src/test/resources/initial-content/content/thymeleaf.json