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 e19219d053131c13715ca60a5a6ef8aa69b165bc Author: Dan Klco <[email protected]> AuthorDate: Tue Oct 20 16:59:25 2020 -0400 Fixing issues while evaluting latest content loader --- feature/src/main/features/oak/oak_base.json | 2 +- .../jcr_root/oak%3Aindex/ntBaseLucene.json | 2 +- .../jcr_root/oak%3Aindex/slingPageLucene.json | 7 +++--- .../jcr_root/static/sling-cms/thumbnails.json | 28 ---------------------- 4 files changed, 5 insertions(+), 34 deletions(-) diff --git a/feature/src/main/features/oak/oak_base.json b/feature/src/main/features/oak/oak_base.json index 464ec6f..fdb0c5d 100644 --- a/feature/src/main/features/oak/oak_base.json +++ b/feature/src/main/features/oak/oak_base.json @@ -138,7 +138,7 @@ "start-order":"20" }, { - "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.3.0", + "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.4.0-SNAPSHOT", "start-order":"20" }, { diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/ntBaseLucene.json b/ui/src/main/resources/jcr_root/oak%3Aindex/ntBaseLucene.json index 98d81b0..12fbf2f 100644 --- a/ui/src/main/resources/jcr_root/oak%3Aindex/ntBaseLucene.json +++ b/ui/src/main/resources/jcr_root/oak%3Aindex/ntBaseLucene.json @@ -20,7 +20,7 @@ "jcr:primaryType": "nt:unstructured", "properties": { "jcr:primaryType": "nt:unstructured", - "cqTags": { + "slingTaxonomy": { "jcr:primaryType": "nt:unstructured", "ordered": false, "propertyIndex": true, diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json b/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json index 8abf95c..4162f6b 100644 --- a/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json +++ b/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json @@ -3,8 +3,7 @@ "compatVersion": 2, "type": "lucene", "async": [ - "async", - "nrt" + "async" ], "evaluatePathRestrictions": true, "excludedPaths": [ @@ -60,14 +59,14 @@ "jcr:primaryType": "nt:unstructured", "properties": { "jcr:primaryType": "nt:unstructured", - "cqLastModified": { + "slingLastModified": { "jcr:primaryType": "nt:unstructured", "ordered": true, "propertyIndex": true, "name": "jcr:content/sling:lastModified", "type": "Date" }, - "cqLastModifiedBy": { + "slingLastModifiedBy": { "jcr:primaryType": "nt:unstructured", "propertyIndex": true, "name": "jcr:content/sling:lastModifiedBy", diff --git a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails.json b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails.json index a93ba01..d7f202c 100644 --- a/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails.json +++ b/ui/src/main/resources/jcr_root/static/sling-cms/thumbnails.json @@ -3,33 +3,5 @@ "jcr:content": { "jcr:primaryType": "nt:unstructured", "jcr:title": "Sling CMS Thumbnails" - }, - "file.png": { - "jcr:primaryType": "sling:File", - "jcr:content": { - "jcr:primaryType": "sling:FileContent", - "jcr:mimeType": "image/png" - } - }, - "folder.png": { - "jcr:primaryType": "sling:File", - "jcr:content": { - "jcr:primaryType": "sling:FileContent", - "jcr:mimeType": "image/png" - } - }, - "page.png": { - "jcr:primaryType": "sling:File", - "jcr:content": { - "jcr:primaryType": "sling:FileContent", - "jcr:mimeType": "image/png" - } - }, - "site.png": { - "jcr:primaryType": "sling:File", - "jcr:content": { - "jcr:primaryType": "sling:FileContent", - "jcr:mimeType": "image/png" - } } } \ No newline at end of file
