[sling-org-apache-sling-app-cms] 02/02: Updating to put the error pages and configurations in the seed mount

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit d7358bd67ca810ffb5987ee07ef12aefc121527e
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed Oct 14 16:54:51 2020 -0400

    Updating to put the error pages and configurations in the seed mount
---
 core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java | 2 +-
 core/src/main/java/org/apache/sling/cms/core/models/package-info.java | 2 +-
 docs/error-pages.md                                                   | 4 ++--
 ui/src/main/resources/jcr_root/{conf/global.json => libs/conf.json}   | 0
 .../sling-cms => libs/sling-cms/content}/errorhandling/401.json       | 0
 .../sling-cms => libs/sling-cms/content}/errorhandling/403.json       | 0
 .../sling-cms => libs/sling-cms/content}/errorhandling/404.json       | 0
 .../sling-cms => libs/sling-cms/content}/errorhandling/default.json   | 0
 8 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java b/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java
index a87e46e..388838c 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java
@@ -135,7 +135,7 @@ public class ErrorHandler {
     /**
      * Path under which the error pages for Sling CMS can be found.
      */
-    public static final String SLING_CMS_ERROR_PATH = "/content/sling-cms/errorhandling/";
+    public static final String SLING_CMS_ERROR_PATH = "/libs/sling-cms/content/errorhandling/";
 
     @RequestAttribute
     @Named(SlingConstants.ERROR_STATUS)
diff --git a/core/src/main/java/org/apache/sling/cms/core/models/package-info.java b/core/src/main/java/org/apache/sling/cms/core/models/package-info.java
index 7e393d6..38b2477 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/package-info.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/package-info.java
@@ -20,7 +20,7 @@
 /**
  * Package with all of the core models used to support the Sling reference CMS
  */
-@Version("2.2.0")
+@Version("2.2.1")
 package org.apache.sling.cms.core.models;
 
 import org.osgi.annotation.versioning.Version;
diff --git a/docs/error-pages.md b/docs/error-pages.md
index c814bd0..274f376 100644
--- a/docs/error-pages.md
+++ b/docs/error-pages.md
@@ -16,8 +16,8 @@ When a user encounters an error on a Sling CMS site, Sling CMS will attempt to p
 
  - Check for a `sling:Page` at */content/[SITE_GROUP]/[SITE_NAME]/errors/[STATUS_CODE]*
  - Check for a `sling:Page` at */content/[SITE_GROUP]/[SITE_NAME]/errors/default*
- - Check for a `sling:Page` at */content/sling-cms/errorhandling/[STATUS_CODE]*
- - Check for a `sling:Page` at */content/sling-cms/errorhandling/default*
+ - Check for a `sling:Page` at */libs/sling-cms/content/errorhandling/[STATUS_CODE]*
+ - Check for a `sling:Page` at */libs/sling-cms/content/errorhandling/default*
  
 This allows you to customize the response to an error while not providing too much information to your users. For example, if you provide the following structure:
 
diff --git a/ui/src/main/resources/jcr_root/conf/global.json b/ui/src/main/resources/jcr_root/libs/conf.json
similarity index 100%
rename from ui/src/main/resources/jcr_root/conf/global.json
rename to ui/src/main/resources/jcr_root/libs/conf.json
diff --git a/ui/src/main/resources/jcr_root/content/sling-cms/errorhandling/401.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/401.json
similarity index 100%
rename from ui/src/main/resources/jcr_root/content/sling-cms/errorhandling/401.json
rename to ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/401.json
diff --git a/ui/src/main/resources/jcr_root/content/sling-cms/errorhandling/403.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/403.json
similarity index 100%
rename from ui/src/main/resources/jcr_root/content/sling-cms/errorhandling/403.json
rename to ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/403.json
diff --git a/ui/src/main/resources/jcr_root/content/sling-cms/errorhandling/404.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/404.json
similarity index 100%
rename from ui/src/main/resources/jcr_root/content/sling-cms/errorhandling/404.json
rename to ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/404.json
diff --git a/ui/src/main/resources/jcr_root/content/sling-cms/errorhandling/default.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/default.json
similarity index 100%
rename from ui/src/main/resources/jcr_root/content/sling-cms/errorhandling/default.json
rename to ui/src/main/resources/jcr_root/libs/sling-cms/content/errorhandling/default.json