You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2023/01/08 20:46:47 UTC
[sling-org-apache-sling-app-cms] 02/02: SLING-11746 - Fixing issue checking out CMS in windows
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 618c02c1546a09182858741a1e1f083733e61d4f
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Thu Jan 5 16:26:07 2023 -0500
SLING-11746 - Fixing issue checking out CMS in windows
---
feature/pom.xml | 2 +-
feature/src/main/features/base.json | 6 +--
feature/src/main/features/cms/cms-repoinit.txt | 17 ++++---
.../src/main/features/models-jacksonexporter.json | 8 ++++
ui/src/main/resources/jcr_root/ROOT.json | 5 --
.../{oak:index => _oak_index}/ntHierarchyNode.json | 1 +
.../{oak:index => _oak_index}/slingComponent.json | 1 +
.../{oak:index => _oak_index}/slingFile.json | 1 +
.../{oak:index => _oak_index}/slingPage.json | 1 +
.../{oak:index => _oak_index}/slingTaxonomy.json | 1 +
.../jcr_root/_oak_index/slingeventJob.json | 56 ++++++++++++++++++++++
11 files changed, 84 insertions(+), 15 deletions(-)
diff --git a/feature/pom.xml b/feature/pom.xml
index e261081f..f93c604c 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingfeature-maven-plugin</artifactId>
- <version>1.4.24</version>
+ <version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<framework>
diff --git a/feature/src/main/features/base.json b/feature/src/main/features/base.json
index 24c15b4e..cc8b4ca6 100644
--- a/feature/src/main/features/base.json
+++ b/feature/src/main/features/base.json
@@ -121,7 +121,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.xss:2.2.20",
+ "id":"org.apache.sling:org.apache.sling.xss:2.3.2",
"start-order":"20"
},
{
@@ -221,11 +221,11 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.14",
+ "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.8.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.38",
+ "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.42",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/cms/cms-repoinit.txt b/feature/src/main/features/cms/cms-repoinit.txt
index 600ab1d0..53187c86 100644
--- a/feature/src/main/features/cms/cms-repoinit.txt
+++ b/feature/src/main/features/cms/cms-repoinit.txt
@@ -18,24 +18,29 @@
#
# CMS root paths
-create path (sling:OrderedFolder) /etc/i18n
+add mixin sling:Redirect to /
+set properties on /
+ set sling:resourceType{String} to sling:redirect
+ set sling:target{String} to /cms/start.html
+end
+create path (sling:Folder) /etc/i18n
set ACL for everyone
allow jcr:read on /etc/i18n
end
-create path (sling:OrderedFolder) /etc/taxonomy
+create path (sling:Folder) /etc/taxonomy
set ACL for everyone
allow jcr:read on /etc/taxonomy
end
-create path (sling:OrderedFolder) /static
+create path (sling:Folder) /static
set ACL for everyone
allow jcr:read on /static
end
-create path (sling:OrderedFolder) /conf
+create path (sling:Folder) /conf
set ACL for everyone
allow jcr:read on /conf
end
-create path (sling:OrderedFolder) /content
-create path (sling:OrderedFolder) /etc/usergenerated
+create path (sling:Folder) /content
+create path (sling:Folder) /etc/usergenerated
set ACL for everyone
allow jcr:read on /etc/usergenerated
end
diff --git a/feature/src/main/features/models-jacksonexporter.json b/feature/src/main/features/models-jacksonexporter.json
index 7228c257..067be589 100644
--- a/feature/src/main/features/models-jacksonexporter.json
+++ b/feature/src/main/features/models-jacksonexporter.json
@@ -12,6 +12,14 @@
"id":"com.fasterxml.jackson.core:jackson-databind:${jackson-version}",
"start-order":"20"
},
+ {
+ "id":"com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson-version}",
+ "start-order":"20"
+ },
+ {
+ "id":"org.codehaus.woodstox:stax2-api:4.2.1",
+ "start-order":"20"
+ },
{
"id":"org.apache.sling:org.apache.sling.models.jacksonexporter:1.1.2",
"start-order":"20"
diff --git a/ui/src/main/resources/jcr_root/ROOT.json b/ui/src/main/resources/jcr_root/ROOT.json
deleted file mode 100644
index ce0f9ed1..00000000
--- a/ui/src/main/resources/jcr_root/ROOT.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "jcr:mixinTypes": [ "sling:Redirect","rep:AccessControllable" ],
- "sling:resourceType": "sling:redirect",
- "sling:target": "/cms/start.html"
-}
diff --git a/ui/src/main/resources/jcr_root/oak:index/ntHierarchyNode.json b/ui/src/main/resources/jcr_root/_oak_index/ntHierarchyNode.json
similarity index 99%
rename from ui/src/main/resources/jcr_root/oak:index/ntHierarchyNode.json
rename to ui/src/main/resources/jcr_root/_oak_index/ntHierarchyNode.json
index 7f85e66a..4d9a839c 100644
--- a/ui/src/main/resources/jcr_root/oak:index/ntHierarchyNode.json
+++ b/ui/src/main/resources/jcr_root/_oak_index/ntHierarchyNode.json
@@ -6,6 +6,7 @@
"evaluatePathRestrictions": true,
"includedPaths": ["/content", "/static"],
"queryPaths": ["/content", "/static"],
+ "reindex": true,
"indexRules": {
"jcr:primaryType": "nt:unstructured",
"nt:hierarchyNode": {
diff --git a/ui/src/main/resources/jcr_root/oak:index/slingComponent.json b/ui/src/main/resources/jcr_root/_oak_index/slingComponent.json
similarity index 97%
rename from ui/src/main/resources/jcr_root/oak:index/slingComponent.json
rename to ui/src/main/resources/jcr_root/_oak_index/slingComponent.json
index cdc96126..180154fe 100644
--- a/ui/src/main/resources/jcr_root/oak:index/slingComponent.json
+++ b/ui/src/main/resources/jcr_root/_oak_index/slingComponent.json
@@ -5,6 +5,7 @@
"async": ["async", "nrt"],
"includedPaths": ["/apps", "/libs"],
"evaluatePathRestrictions": true,
+ "reindex": true,
"indexRules": {
"jcr:primaryType": "nt:unstructured",
"sling:Component": {
diff --git a/ui/src/main/resources/jcr_root/oak:index/slingFile.json b/ui/src/main/resources/jcr_root/_oak_index/slingFile.json
similarity index 99%
rename from ui/src/main/resources/jcr_root/oak:index/slingFile.json
rename to ui/src/main/resources/jcr_root/_oak_index/slingFile.json
index 1f21a3f6..07a9d4ae 100644
--- a/ui/src/main/resources/jcr_root/oak:index/slingFile.json
+++ b/ui/src/main/resources/jcr_root/_oak_index/slingFile.json
@@ -5,6 +5,7 @@
"async": ["async", "nrt"],
"includedPaths": ["/content", "/static"],
"evaluatePathRestrictions": true,
+ "reindex": true,
"aggregates": {
"jcr:primaryType": "nt:unstructured",
"sling:File": {
diff --git a/ui/src/main/resources/jcr_root/oak:index/slingPage.json b/ui/src/main/resources/jcr_root/_oak_index/slingPage.json
similarity index 99%
rename from ui/src/main/resources/jcr_root/oak:index/slingPage.json
rename to ui/src/main/resources/jcr_root/_oak_index/slingPage.json
index 1e06bede..b6d87e6b 100644
--- a/ui/src/main/resources/jcr_root/oak:index/slingPage.json
+++ b/ui/src/main/resources/jcr_root/_oak_index/slingPage.json
@@ -5,6 +5,7 @@
"async": ["async", "nrt"],
"evaluatePathRestrictions": true,
"includedPaths": ["/content", "/static"],
+ "reindex": true,
"aggregates": {
"jcr:primaryType": "nt:unstructured",
"sling:Page": {
diff --git a/ui/src/main/resources/jcr_root/oak:index/slingTaxonomy.json b/ui/src/main/resources/jcr_root/_oak_index/slingTaxonomy.json
similarity index 97%
rename from ui/src/main/resources/jcr_root/oak:index/slingTaxonomy.json
rename to ui/src/main/resources/jcr_root/_oak_index/slingTaxonomy.json
index 9e072920..396c7267 100644
--- a/ui/src/main/resources/jcr_root/oak:index/slingTaxonomy.json
+++ b/ui/src/main/resources/jcr_root/_oak_index/slingTaxonomy.json
@@ -5,6 +5,7 @@
"includedPaths": ["/etc/taxonomy"],
"async": ["async", "nrt"],
"evaluatePathRestrictions": true,
+ "reindex": true,
"indexRules": {
"jcr:primaryType": "nt:unstructured",
"sling:Taxonomy": {
diff --git a/ui/src/main/resources/jcr_root/_oak_index/slingeventJob.json b/ui/src/main/resources/jcr_root/_oak_index/slingeventJob.json
new file mode 100644
index 00000000..27b8f689
--- /dev/null
+++ b/ui/src/main/resources/jcr_root/_oak_index/slingeventJob.json
@@ -0,0 +1,56 @@
+{
+ "jcr:primaryType": "oak:QueryIndexDefinition",
+ "compatVersion": 2,
+ "includedPaths": [
+ "/var/eventing"
+ ],
+ "type": "lucene",
+ "async": [
+ "async",
+ "nrt"
+ ],
+ "evaluatePathRestrictions": true,
+ "reindex": true,
+ "indexRules": {
+ "jcr:primaryType": "nt:unstructured",
+ "slingevent:Job": {
+ "jcr:primaryType": "nt:unstructured",
+ "properties": {
+ "jcr:primaryType": "nt:unstructured",
+ "eventJobTopic": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "analyzed": true,
+ "name": "event.job.topic",
+ "type": "String"
+ },
+ "slingeventCreated": {
+ "jcr:primaryType": "nt:unstructured",
+ "ordered": true,
+ "propertyIndex": true,
+ "name": "slingevent:created",
+ "type": "Date"
+ },
+ "slingeventId": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "slingevent:eventId"
+ },
+ "finishedState": {
+ "jcr:primaryType": "nt:unstructured",
+ "nullCheckEnabled": true,
+ "propertyIndex": true,
+ "name": "slingevent:finishedState",
+ "type": "String"
+ },
+ "finishedDate": {
+ "jcr:primaryType": "nt:unstructured",
+ "ordered": true,
+ "propertyIndex": true,
+ "name": "slingevent:finishedDate",
+ "type": "Date"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file