You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by gi...@apache.org on 2023/02/15 13:13:51 UTC
[sling-site] branch asf-site updated: Automatic website deployment from https://ci-builds.apache.org/job/Sling/job/modules/job/sling-site/job/master/628/
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/sling-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new dc3f4f51c Automatic website deployment from https://ci-builds.apache.org/job/Sling/job/modules/job/sling-site/job/master/628/
dc3f4f51c is described below
commit dc3f4f51c5dc5c3f0d5d31d95249584763b12e78
Author: jenkins <bu...@apache.org>
AuthorDate: Wed Feb 15 13:13:48 2023 +0000
Automatic website deployment from https://ci-builds.apache.org/job/Sling/job/modules/job/sling-site/job/master/628/
---
documentation/bundles/resource-merger.html | 4 ++--
sitemap.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/documentation/bundles/resource-merger.html b/documentation/bundles/resource-merger.html
index 1ddae0061..cb9ff0af2 100644
--- a/documentation/bundles/resource-merger.html
+++ b/documentation/bundles/resource-merger.html
@@ -199,7 +199,7 @@ resulting order: child1, child5, child2, child3, child4
<h1><a href="#resource-type-handling" id="resource-type-handling">Resource Type Handling</a></h1>
<p>When resources are merged into a new resource, the resource type of the merged resource is set to the resource type of the last resource used for merging (see Resource Picks).</p>
<p>The resource super type is set to the merged value of the 'sling:resourceType' property - if it exists and its value is not the same as the resource type.</p>
-<p>In addition, the 'sling:resourceType' property in the returned value map is set to the resource type of the merged resource. Similar, the 'sling:resourceSuperType' property is set to the resource super type (if not null).</p>
+<p>However, the 'sling:resourceType' and 'sling:resourceSuperType' property in the returned value map might not reflect these values. These are purely set based on the merging of the properties of the merged resources. For example, if the last resource does not set the 'sling:resourceType' property, then Resource#getResourceType() will return a different value than the property.</p>
<h1><a href="#resource-pickers" id="resource-pickers">Resource Pickers</a></h1>
<h2><a href="#merging-resource-picker-overlay-approach" id="merging-resource-picker-overlay-approach">Merging Resource Picker (Overlay approach)</a></h2>
<table>
@@ -292,7 +292,7 @@ resulting order: child1, child5, child2, child3, child4
content/documentation/bundles/resource-merger.md
</a>
</div> <div class="revisionInfo">
- Last modified by <span class="author">Carsten Ziegeler</span> on <span class="comment">2022-08-06</span>
+ Last modified by <span class="author">Carsten Ziegeler</span> on <span class="comment">2023-02-15</span>
</div><p>
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
logo are trademarks of The Apache Software Foundation. All other marks mentioned
diff --git a/sitemap.xml b/sitemap.xml
index beefdea1b..d9ab2a3d1 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
<url>
+ <loc>https://sling.apache.org/documentation/bundles/resource-merger.html</loc><lastmod>2023-02-15</lastmod>
+ </url><url>
<loc>https://sling.apache.org/news.html</loc><lastmod>2023-02-14</lastmod>
</url><url>
<loc>https://sling.apache.org/releases.html</loc><lastmod>2023-02-14</lastmod>
@@ -296,8 +298,6 @@
<loc>https://sling.apache.org/documentation/bundles/managing-users-and-groups-jackrabbit-usermanager.html</loc><lastmod>2022-02-04</lastmod>
</url><url>
<loc>https://sling.apache.org/documentation/bundles/internationalization-support-i18n.html</loc><lastmod>2021-03-11</lastmod>
- </url><url>
- <loc>https://sling.apache.org/documentation/bundles/resource-merger.html</loc><lastmod>2022-08-06</lastmod>
</url><url>
<loc>https://sling.apache.org/documentation/bundles/request-analysis.html</loc><lastmod>2017-11-22</lastmod>
</url><url>