adobe · buuhuu · Feb 9, 2022 · Feb 9, 2022 · Feb 9, 2022 · Feb 9, 2022
diff --git a/dispatcher/src/conf.d/rewrites/rewrite.rules b/dispatcher/src/conf.d/rewrites/rewrite.rules
@@ -28,5 +28,5 @@ RewriteCond %{REQUEST_URI} !^/saml_login
 RewriteCond %{REQUEST_URI} !^/system
 RewriteCond %{REQUEST_URI} !^/tmp
 RewriteCond %{REQUEST_URI} !^/var
-RewriteCond %{REQUEST_URI} (.html|.jpe?g|.png|.svg)$
+RewriteCond %{REQUEST_URI} (.html|.jpe?g|.png|.svg|.xml)$
 RewriteRule ^/(.*)$ /content/${CONTENT_FOLDER_NAME}/$1 [PT,L]
diff --git a/...ublish.dev/org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl.cfg.json b/...ublish.dev/org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl.cfg.json
@@ -1,5 +1,3 @@
 {
-  "resource.resolver.mapping": [
-    "/content/wknd/</", "/:/"
-  ]
+  "resource.resolver.map.location": "/etc/map.publish"
 }
diff --git a/...blish.prod/org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl.cfg.json b/...blish.prod/org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl.cfg.json
@@ -1,5 +1,3 @@
 {
-  "resource.resolver.mapping": [
-    "/content/wknd/</", "/:/"
-  ]
+  "resource.resolver.map.location": "/etc/map.publish"
 }
diff --git a/...lish.stage/org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl.cfg.json b/...lish.stage/org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl.cfg.json
@@ -1,5 +1,3 @@
 {
-  "resource.resolver.mapping": [
-    "/content/wknd/</", "/:/"
-  ]
+  "resource.resolver.map.location": "/etc/map.publish"
 }
diff --git a/...osgiconfig/config.publish/org.apache.sling.sitemap.impl.SitemapScheduler~default.cfg.json b/...osgiconfig/config.publish/org.apache.sling.sitemap.impl.SitemapScheduler~default.cfg.json
@@ -0,0 +1,4 @@
+{
+    "scheduler.name": "default",
+    "scheduler.expression": "0 0 0 * * ?"
+}
diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/.content.xml
@@ -7,13 +7,15 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-09-30T17:38:20.875-07:00"
         cq:lastRolledoutBy="admin"
+        cq:propertyInheritanceCancelled="[sling:sitemapRoot]"
         cq:tags="[wknd:customer-journey/attract]"
         cq:template="/conf/wknd/settings/wcm/templates/landing-page-template"
         jcr:description="WKND is a collective of outdoors, music, crafts, adventure sports, and travel enthusiasts that want to share our experiences, connections, and expertise with the world."
         jcr:mixinTypes="[cq:LiveRelationship,cq:LiveSync]"
         jcr:primaryType="cq:PageContent"
         jcr:title="WKND Adventures and Travel"
         sling:resourceType="wknd/components/page"
+        sling:sitemapRoot="{Boolean}true"
         pageTitle="Home">
         <root
             cq:lastRolledout="{Date}2020-09-30T17:38:05.410-07:00"

diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/errors/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/errors/.content.xml
@@ -6,7 +6,7 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-11-13T14:10:14.819-08:00"
         cq:lastRolledoutBy="admin"
-        cq:redirectTarget="/content/wknd/language-masters/en"
+        cq:redirectTarget="/content/wknd/ca/en"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:mixinTypes="[cq:LiveRelationship]"
         jcr:primaryType="cq:PageContent"

diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/errors/404/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/errors/404/.content.xml
@@ -6,6 +6,7 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-11-13T14:10:14.827-08:00"
         cq:lastRolledoutBy="admin"
+        cq:robotsTags="[noindex]"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:mixinTypes="[cq:LiveRelationship]"
         jcr:primaryType="cq:PageContent"

diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/errors/500/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/errors/500/.content.xml
@@ -6,6 +6,7 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-11-13T14:10:14.828-08:00"
         cq:lastRolledoutBy="admin"
+        cq:robotsTags="[noindex]"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:isCheckedOut="{Boolean}true"
         jcr:mixinTypes="[cq:LiveRelationship,mix:versionable]"

diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/errors/sign-in/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/ca/en/errors/sign-in/.content.xml
@@ -6,6 +6,7 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-11-13T14:10:14.828-08:00"
         cq:lastRolledoutBy="admin"
+        cq:robotsTags="[noindex]"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:mixinTypes="[cq:LiveRelationship]"
         jcr:primaryType="cq:PageContent"

diff --git a/...sample/src/main/content/jcr_root/content/wknd/language-masters/en/errors/404/.content.xml b/...sample/src/main/content/jcr_root/content/wknd/language-masters/en/errors/404/.content.xml
@@ -4,6 +4,7 @@
     <jcr:content
         cq:lastModified="{Date}2020-07-07T18:04:00.781-07:00"
         cq:lastModifiedBy="admin"
+        cq:robotsTags="[noindex]"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:primaryType="cq:PageContent"
         jcr:title="Page not found"

diff --git a/...sample/src/main/content/jcr_root/content/wknd/language-masters/en/errors/500/.content.xml b/...sample/src/main/content/jcr_root/content/wknd/language-masters/en/errors/500/.content.xml
@@ -4,6 +4,7 @@
     <jcr:content
         cq:lastModified="{Date}2020-07-07T18:05:01.646-07:00"
         cq:lastModifiedBy="admin"
+        cq:robotsTags="[noindex]"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:isCheckedOut="{Boolean}true"
         jcr:mixinTypes="[mix:versionable]"

diff --git a/...le/src/main/content/jcr_root/content/wknd/language-masters/en/errors/sign-in/.content.xml b/...le/src/main/content/jcr_root/content/wknd/language-masters/en/errors/sign-in/.content.xml
@@ -4,6 +4,7 @@
     <jcr:content
         cq:lastModified="{Date}2020-11-13T13:19:57.753-08:00"
         cq:lastModifiedBy="admin"
+        cq:robotsTags="[noindex]"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:primaryType="cq:PageContent"
         jcr:title="Sign In"

diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/.content.xml
@@ -7,13 +7,15 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-09-30T17:38:21.080-07:00"
         cq:lastRolledoutBy="admin"
+        cq:propertyInheritanceCancelled="[sling:sitemapRoot]"
         cq:tags="[wknd:customer-journey/attract]"
         cq:template="/conf/wknd/settings/wcm/templates/landing-page-template"
         jcr:description="WKND is a collective of outdoors, music, crafts, adventure sports, and travel enthusiasts that want to share our experiences, connections, and expertise with the world."
         jcr:mixinTypes="[cq:LiveRelationship,cq:LiveSync]"
         jcr:primaryType="cq:PageContent"
         jcr:title="WKND Adventures and Travel"
         sling:resourceType="wknd/components/page"
+        sling:sitemapRoot="{Boolean}true"
         pageTitle="Home">
         <root
             cq:lastRolledout="{Date}2020-09-30T17:38:06.417-07:00"

diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/errors/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/errors/.content.xml
@@ -6,7 +6,7 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-11-13T14:10:14.829-08:00"
         cq:lastRolledoutBy="admin"
-        cq:redirectTarget="/content/wknd/language-masters/en"
+        cq:redirectTarget="/content/wknd/us/en"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:mixinTypes="[cq:LiveRelationship]"
         jcr:primaryType="cq:PageContent"

diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/errors/404/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/errors/404/.content.xml
@@ -6,6 +6,7 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-11-13T14:10:14.836-08:00"
         cq:lastRolledoutBy="admin"
+        cq:robotsTags="[noindex]"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:mixinTypes="[cq:LiveRelationship]"
         jcr:primaryType="cq:PageContent"

diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/errors/500/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/errors/500/.content.xml
@@ -6,6 +6,7 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-11-13T14:10:14.837-08:00"
         cq:lastRolledoutBy="admin"
+        cq:robotsTags="[noindex]"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:isCheckedOut="{Boolean}true"
         jcr:mixinTypes="[cq:LiveRelationship,mix:versionable]"

diff --git a/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/errors/sign-in/.content.xml b/ui.content.sample/src/main/content/jcr_root/content/wknd/us/en/errors/sign-in/.content.xml
@@ -6,6 +6,7 @@
         cq:lastModifiedBy="admin"
         cq:lastRolledout="{Date}2020-11-13T14:10:14.837-08:00"
         cq:lastRolledoutBy="admin"
+        cq:robotsTags="[noindex]"
         cq:template="/conf/wknd/settings/wcm/templates/content-page-template"
         jcr:mixinTypes="[cq:LiveRelationship]"
         jcr:primaryType="cq:PageContent"

diff --git a/ui.content/pom.xml b/ui.content/pom.xml
@@ -58,7 +58,7 @@
                         </jackrabbit-nodetypes>
                         <jackrabbit-filter>
                             <options>
-                                <validRoots>/conf,/content,/content/experience-fragments,/content/dam,/content/cq:tags</validRoots>
+                                <validRoots>/conf,/content,/content/experience-fragments,/content/dam,/content/cq:tags,/etc</validRoots>
                             </options>
                         </jackrabbit-filter>
                     </validatorsSettings>

diff --git a/ui.content/src/main/content/META-INF/vault/filter.xml b/ui.content/src/main/content/META-INF/vault/filter.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
+    <filter root="/etc/map.publish/https/wknd-site"/>
+    <filter root="/etc/map.publish/https/wknd-site-reverse"/>
     <filter root="/conf/wknd" mode="merge"/>
     <filter root="/content/wknd" mode="merge"/>
     <filter root="/content/dam/wknd" mode="merge"/>

diff --git a/ui.content/src/main/content/jcr_root/etc/map.publish/.content.xml b/ui.content/src/main/content/jcr_root/etc/map.publish/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.content/src/main/content/jcr_root/etc/map.publish/https/.content.xml b/ui.content/src/main/content/jcr_root/etc/map.publish/https/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.content/src/main/content/jcr_root/etc/map.publish/https/wknd-site-reverse/.content.xml b/ui.content/src/main/content/jcr_root/etc/map.publish/https/wknd-site-reverse/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"
+    jcr:mixinTypes="[sling:MappingSpec]"
+    sling:internalRedirect="/content/wknd/(.+)"
+    sling:match="$[env:AEM_DOMAIN_WKND_SITE]/$1"/>
diff --git a/ui.content/src/main/content/jcr_root/etc/map.publish/https/wknd-site/.content.xml b/ui.content/src/main/content/jcr_root/etc/map.publish/https/wknd-site/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"
+    jcr:mixinTypes="[sling:MappingSpec]"
+    sling:internalRedirect="[/,/content/wknd/]"
+    sling:match="$[env:AEM_DOMAIN_WKND_SITE].\\d+/"/>