[sling-org-apache-sling-scripting-groovy] branch master updated: move initial content to directory initial-content

[olli]

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-groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new f16d591  move initial content to directory initial-content
f16d591 is described below

commit f16d5917ce65f7cd1355f4028c449213c14c411f
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Sun Sep 22 13:56:10 2019 +0200

    move initial content to directory initial-content
---
 .../java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java | 5 +----
 .../{ => initial-content}/apps/groovy/page/adaptto/html.gst          | 0
 .../resources/{ => initial-content}/apps/groovy/page/simple/html.gst | 0
 src/test/resources/{ => initial-content}/content/groovy.json         | 0
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java 
b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
index 0788681..e92c724 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
@@ -90,10 +90,7 @@ public class GroovyTestSupport extends TestSupport {
     public TestProbeBuilder probeConfiguration(final TestProbeBuilder 
testProbeBuilder) {
         testProbeBuilder.setHeader(Constants.EXPORT_PACKAGE, 
"org.apache.sling.scripting.groovy.it.app");
         testProbeBuilder.setHeader("Sling-Model-Packages", 
"org.apache.sling.scripting.groovy.it.app");
-        testProbeBuilder.setHeader("Sling-Initial-Content", String.join(",",
-            "apps/groovy;path:=/apps/groovy;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/groovy/page/adaptto/html.gst 
b/src/test/resources/initial-content/apps/groovy/page/adaptto/html.gst
similarity index 100%
rename from src/test/resources/apps/groovy/page/adaptto/html.gst
rename to src/test/resources/initial-content/apps/groovy/page/adaptto/html.gst
diff --git a/src/test/resources/apps/groovy/page/simple/html.gst 
b/src/test/resources/initial-content/apps/groovy/page/simple/html.gst
similarity index 100%
rename from src/test/resources/apps/groovy/page/simple/html.gst
rename to src/test/resources/initial-content/apps/groovy/page/simple/html.gst
diff --git a/src/test/resources/content/groovy.json 
b/src/test/resources/initial-content/content/groovy.json
similarity index 100%
rename from src/test/resources/content/groovy.json
rename to src/test/resources/initial-content/content/groovy.json