Author: buildbot
Date: Fri Oct 14 13:39:25 2016
New Revision: 999425
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Oct 14 13:39:25 2016
@@ -1 +1 @@
-1764844
+1764894
Modified:
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
(original)
+++
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html
Fri Oct 14 13:39:25 2016
@@ -132,7 +132,7 @@ h2:hover > .headerlink, h3:hover > .head
<p>By default all configuration data is stored in <code>/conf</code>. Fallback
paths are <code>/conf/global</code>, <code>/apps/conf</code>and
<code>/libs/conf</code>.</p>
<p>The paths are configurable in the service configuration.</p>
<h1 id="context-paths">Context paths<a class="headerlink"
href="#context-paths" title="Permanent link">¶</a></h1>
-<p>The content resource hierarchy is defined by setting
<code>sling:config-ref</code> properties. Each resource that has a
<code>sling:config-ref</code> property set defines the root resource of a
context, the whole subtree is the context. Within the subtree further nested
contexts can be defined.</p>
+<p>The content resource hierarchy is defined by setting
<code>sling:configRef</code> properties. Each resource that has a
<code>sling:configRef</code> property set defines the root resource of a
context, the whole subtree is the context. Within the subtree further nested
contexts can be defined.</p>
<h1 id="configuration-resource-resolving">Configuration resource resolving<a
class="headerlink" href="#configuration-resource-resolving" title="Permanent
link">¶</a></h1>
<p>This illustration shows an example for configuration resource lookup:</p>
<p><img alt="Configuration resource lookup" src="config-resource-lookup.png"
/></p>
@@ -147,7 +147,7 @@ h2:hover > .headerlink, h3:hover > .head
<li><code>/libs/conf</code> - because it is configured as fallback path</li>
</ol>
<p>So the basic rules are:
-<em> Go up in the content resource tree until a resource with
<code>sling:config-ref</code> is found. This is the 'inner-most' context. Check
if a configuration resource exists at the path the property points to.
+<em> Go up in the content resource tree until a resource with
<code>sling:configRef</code> is found. This is the 'inner-most' context. Check
if a configuration resource exists at the path the property points to.
</em> Check for parent resources of the references configuration resource
(below <code>/conf</code>)
<em> Go further up in the content resource tree for parent contexts, and check
their configuration resources as well (they may reference completely different
location below <code>/conf</code>)
</em> Check the fallback paths</p>
@@ -179,17 +179,17 @@ h2:hover > .headerlink, h3:hover > .head
</ul>
<p>For singleton resources, there is not resource inheritance. The first
resource that is found in the configuration resource resolving lookup order is
returned.</p>
<p>For collection resources there is no resource inheritance enabled by
default. The children of the first resource that is found in the configuration
resource resolving lookup order are returned.</p>
-<p>By defining a property <code>sling:config-collection-inherit</code> on the
configuration resource, the children of the next resource that is found in the
configuration resource resolving lookup order are combined with the children of
the current configuration resource, returned a merged list. If both
configuration resources contain child resources with the same name, duplicates
are eliminated and only the children of the first resource are included.</p>
-<p>By setting the property <code>sling:config-collection-inherit</code> on
multiple configuration resources that are part of the lookup order it is
possible to form deeper inheritance chains following the same rules.</p>
+<p>By defining a property <code>sling:configCollectionInherit</code> on the
configuration resource, the children of the next resource that is found in the
configuration resource resolving lookup order are combined with the children of
the current configuration resource, returned a merged list. If both
configuration resources contain child resources with the same name, duplicates
are eliminated and only the children of the first resource are included.</p>
+<p>By setting the property <code>sling:configCollectionInherit</code> on
multiple configuration resources that are part of the lookup order it is
possible to form deeper inheritance chains following the same rules.</p>
<p>Example for resource inheritance:</p>
<p><img alt="Resource inheritance" src="resource-inheritance.png" /></p>
-<p>The result of this example is: <strong>C, A, B</strong>. It would by just
<strong>C</strong> if the <code>sling:config-collection-inherit</code> is not
set.</p>
+<p>The result of this example is: <strong>C, A, B</strong>. It would by just
<strong>C</strong> if the <code>sling:configCollectionInherit</code> is not
set.</p>
<h1 id="property-inheritance">Property inheritance<a class="headerlink"
href="#property-inheritance" title="Permanent link">¶</a></h1>
<p>By default, no property inheritance takes place. That means only the
properties that are stored in the configuration resource are mapped to the
annotation class or returned as value map, regardless wither singleton or
collection resources are returned, or if resource collection inheritance is
enabled or not.</p>
-<p>By defining a property <code>sling:config-property-inherit</code> on the
configuration resource, property merging is enabled between the current
configuration resource and the next resource with the same name (singleton or
resource collection item) in the configuration resource lookup order. That
means that all properties that are not defined on the current configuration
resource are inherited from the next resources and a merged value map is used
for the configuration mapping.</p>
-<p>By setting the property <code>sling:config-property-inherit</code> on
multiple configuration resources that are part of the lookup order it is
possible to form deeper inheritance chains following the same rules.</p>
+<p>By defining a property <code>sling:configPropertyInherit</code> on the
configuration resource, property merging is enabled between the current
configuration resource and the next resource with the same name (singleton or
resource collection item) in the configuration resource lookup order. That
means that all properties that are not defined on the current configuration
resource are inherited from the next resources and a merged value map is used
for the configuration mapping.</p>
+<p>By setting the property <code>sling:configPropertyInherit</code> on
multiple configuration resources that are part of the lookup order it is
possible to form deeper inheritance chains following the same rules.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1764796 by sseifert on Thu, 13 Oct 2016 21:25:47 +0000
+ Rev. 1764894 by sseifert on Fri, 14 Oct 2016 13:37:54 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified:
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
(original)
+++
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration-spi.html
Fri Oct 14 13:39:25 2016
@@ -136,7 +136,7 @@ h2:hover > .headerlink, h3:hover > .head
</ul>
<p>All existing implementations are iterated in order of their service
ranking.</p>
<h1 id="context-path-strategy">Context Path Strategy<a class="headerlink"
href="#context-path-strategy" title="Permanent link">¶</a></h1>
-<p>By providing an implementation of
<code>org.apache.sling.contextaware.config.resource.spi.ContextPathStrategy</code>
you can provide additional ways how context paths are detected in your content
resource hierarchy.</p>
+<p>By providing an implementation of
<code>org.apache.sling.contextaware.config.resource.spi.ContextPathStrategy</code>
you can provide additional ways how context paths and their configuration
references are detected in your content resource hierarchy.</p>
<p>E.g. you could implement detecting context paths by project-specific
conventions.</p>
<h1 id="configuration-resource-resolver-strategy">Configuration Resource
Resolver Strategy<a class="headerlink"
href="#configuration-resource-resolver-strategy" title="Permanent
link">¶</a></h1>
<p>By providing an implementation of
<code>org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy</code>
you can define where configuration data is looked up, and how resource and
property inheritance is handled.</p>
@@ -146,7 +146,7 @@ h2:hover > .headerlink, h3:hover > .head
<h1 id="configuration-metadata-provider">Configuration Metadata Provider<a
class="headerlink" href="#configuration-metadata-provider" title="Permanent
link">¶</a></h1>
<p>By providing an implementation of
<code>org.apache.sling.contextaware.config.spi.ConfigurationMetadataProvider</code>
you can provide information about configuration metadata from other sources
than annotation classes.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1764796 by sseifert on Thu, 13 Oct 2016 21:25:47 +0000
+ Rev. 1764894 by sseifert on Fri, 14 Oct 2016 13:37:54 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified:
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration.html
(original)
+++
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration.html
Fri Oct 14 13:39:25 2016
@@ -192,7 +192,7 @@ Alternatively you can directly adapt you
<p>The ConfigurationBuilder also supports getting the configurations as
ValueMap or by adapting the configuration resources e.g. to a Sling Model. In
this case you have to specify a configuration name which is otherwise derived
automatically from the annotation class.</p>
<p>Internally the ConfigurationResolver used the ConfigurationResourceResolver
to get the configuration resources. It uses always the bucket name
<code>sling:configs</code>.</p>
<h1 id="contexts-and-configuration-references">Contexts and configuration
references<a class="headerlink" href="#contexts-and-configuration-references"
title="Permanent link">¶</a></h1>
-<p>When you use the <a
href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html";>Default
Implementation</a> contexts in the content resource hierarchy is defined by
setting <code>sling:config-ref</code> properties. Each resource that has a
<code>sling:config-ref</code> property set defines the root resource of a
context, the whole subtree is the context. Within the subtree further nested
contexts can be defined. The property contains a resource path pointing to a
resource below <code>/conf</code>. This is the configuration reference.</p>
+<p>When you use the <a
href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html";>Default
Implementation</a> contexts in the content resource hierarchy is defined by
setting <code>sling:configRef</code> properties. Each resource that has a
<code>sling:configRef</code> property set defines the root resource of a
context, the whole subtree is the context. Within the subtree further nested
contexts can be defined. The property contains a resource path pointing to a
resource below <code>/conf</code>. This is the configuration reference.</p>
<p>Example:</p>
<p><img alt="Context and config reference"
src="context-and-config-reference.png" /></p>
<p>If you define nested contexts or use a deeper hierarchy of resourced in
<code>/conf</code> the inheritance rules are applied. Additionally it is
possible to define default values as fallback if no configuration resource
exists yet in <code>/conf</code>. See <a
href="http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration-default-implementation.html";>Default
Implementation</a> for details.</p>
@@ -288,7 +288,7 @@ the applications/libraries you use, or y
<li><a
href="https://adapt.to/2016/en/schedule/sling-context-aware-configuration.html";>Sling
Context-Aware Configuration - Talk from adaptTo() 2016</a></li>
</ul>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1764795 by sseifert on Thu, 13 Oct 2016 21:23:47 +0000
+ Rev. 1764894 by sseifert on Fri, 14 Oct 2016 13:37:54 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
