[sling-org-apache-sling-starter-content] branch master updated: SLING-8721 Split resources into JCR and classpath content

[ol...@apache.org]

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-starter-content.git


The following commit(s) were added to refs/heads/master by this push:
     new ba96792  SLING-8721 Split resources into JCR and classpath content
ba96792 is described below

commit ba96792a4e7798f1ce15780bb5ecd1a719218454
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Sep 19 14:52:00 2019 +0200

    SLING-8721 Split resources into JCR and classpath content
---
 bnd.bnd                                                               | 2 +-
 src/main/frontend/gulpfile.js                                         | 4 ++--
 src/main/resources/{content => jcr}/ROOT.json                         | 0
 .../{content => jcr}/apps/sling/servlet/default/ace.html.esp          | 0
 .../{content => jcr}/apps/sling/servlet/default/acl.html.esp          | 0
 .../resources/{content => jcr}/apps/sling/starter/home/home.html.esp  | 0
 .../apps/sling/starter/sidebar-extensions/sidebar-extensions.html.esp | 0
 src/main/resources/{content/content => }/startup/index.html           | 0
 8 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
index 2c378b8..7da78d7 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,3 +1,3 @@
-Sling-Initial-Content: content
+Sling-Initial-Content: jcr
 
 -includeresource: target/frontend/dist
diff --git a/src/main/frontend/gulpfile.js b/src/main/frontend/gulpfile.js
index 850cca0..c534fc8 100755
--- a/src/main/frontend/gulpfile.js
+++ b/src/main/frontend/gulpfile.js
@@ -46,11 +46,11 @@ gulp.task('styles', function() {
         .pipe(cleanCSS())
         .pipe(concatCss('bundle.css'))
         .pipe(header(apache2License))
-        .pipe(gulp.dest('./dist/content/content/starter/css'));
+        .pipe(gulp.dest('./dist/jcr/content/starter/css'));
 });
 
 gulp.task('assets', function() {
-	gulp.src(['./src/{fonts,img}/**/*']).pipe(gulp.dest('./dist/content/content/starter'));
+	gulp.src(['./src/{fonts,img}/**/*']).pipe(gulp.dest('./dist/jcr/content/starter'));
 });
 
 
diff --git a/src/main/resources/content/ROOT.json b/src/main/resources/jcr/ROOT.json
similarity index 100%
rename from src/main/resources/content/ROOT.json
rename to src/main/resources/jcr/ROOT.json
diff --git a/src/main/resources/content/apps/sling/servlet/default/ace.html.esp b/src/main/resources/jcr/apps/sling/servlet/default/ace.html.esp
similarity index 100%
rename from src/main/resources/content/apps/sling/servlet/default/ace.html.esp
rename to src/main/resources/jcr/apps/sling/servlet/default/ace.html.esp
diff --git a/src/main/resources/content/apps/sling/servlet/default/acl.html.esp b/src/main/resources/jcr/apps/sling/servlet/default/acl.html.esp
similarity index 100%
rename from src/main/resources/content/apps/sling/servlet/default/acl.html.esp
rename to src/main/resources/jcr/apps/sling/servlet/default/acl.html.esp
diff --git a/src/main/resources/content/apps/sling/starter/home/home.html.esp b/src/main/resources/jcr/apps/sling/starter/home/home.html.esp
similarity index 100%
rename from src/main/resources/content/apps/sling/starter/home/home.html.esp
rename to src/main/resources/jcr/apps/sling/starter/home/home.html.esp
diff --git a/src/main/resources/content/apps/sling/starter/sidebar-extensions/sidebar-extensions.html.esp b/src/main/resources/jcr/apps/sling/starter/sidebar-extensions/sidebar-extensions.html.esp
similarity index 100%
rename from src/main/resources/content/apps/sling/starter/sidebar-extensions/sidebar-extensions.html.esp
rename to src/main/resources/jcr/apps/sling/starter/sidebar-extensions/sidebar-extensions.html.esp
diff --git a/src/main/resources/content/content/startup/index.html b/src/main/resources/startup/index.html
similarity index 100%
rename from src/main/resources/content/content/startup/index.html
rename to src/main/resources/startup/index.html