You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2019/01/05 20:21:45 UTC

[incubator-tamaya-site] branch asf-site updated: TAMAYA-373: Regen site

This is an automated email from the ASF dual-hosted git repository.

pottlinger pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new dd92a2e  TAMAYA-373: Regen site
dd92a2e is described below

commit dd92a2e3c44c4da24c9f6a10d56be01a796fe7f8
Author: Hugo Hirsch <gi...@hugo-hirsch.de>
AuthorDate: Sat Jan 5 21:21:33 2019 +0100

    TAMAYA-373: Regen site
---
 history.html => about.html                         |  138 +-
 apidocs/index.html                                 |   37 +-
 archive.html                                       |   43 +-
 blog/2014/no-jsr-in-javaee8.html                   |   35 +-
 blog/2014/whatistamaya.html                        |   31 +-
 blog/2015/dzone-article.html                       |   31 +-
 blog/2015/introduction.html                        |   31 +-
 blog/2015/javaland.html                            |   39 +-
 blog/2015/new-configuration-api.html               |   31 +-
 blog/2016/apachecon-seville.html                   |   39 +-
 blog/2016/apachecon-vancouver.html                 |   35 +-
 blog/2016/bedcon.html                              |   35 +-
 blog/2016/dirk-weil-javaeeblog.html                |   31 +-
 blog/2016/infoq-article.html                       |   31 +-
 blog/2016/java2days-sofia.html                     |   31 +-
 blog/2016/javaland.html                            |   47 +-
 blog/2016/javaone.html                             |   39 +-
 blog/2016/jug-basel.html                           |   31 +-
 blog/2016/jug-stgallen.html                        |   31 +-
 blog/2016/tamaya-book.html                         |   39 +-
 blog/2016/voxxed-days-zurich.html                  |   31 +-
 blog/2017/03/javaland.html                         |   41 +-
 blog/2017/06/release-03.html                       |   37 +-
 blog/2017/09/new-api-links.html                    |   39 +-
 blog/2018/02/release-03-announcement.html          |  134 +-
 css/base.css                                       |   20 +-
 development/community.html                         |  276 +--
 development/possible-contributions.html            |  599 +++---
 development/source.html                            |  225 ++-
 development/team.html                              |  347 ++--
 devguide.html                                      |  460 ++---
 documentation/api.html                             | 1949 ++++++++++++--------
 documentation/core.html                            |  925 ++++++----
 documentation/extensions.html                      |  503 +++--
 documentation/extensions/mod_camel.html            |  227 +--
 documentation/extensions/mod_cdi.html              |  442 +++--
 .../extensions/mod_classloader_support.html        |  224 ++-
 documentation/extensions/mod_collections.html      |  665 ++++---
 documentation/extensions/mod_consul.html           |  185 +-
 documentation/extensions/mod_etcd.html             |  296 ++-
 documentation/extensions/mod_events.html           |  572 +++---
 documentation/extensions/mod_features.html         |  192 +-
 documentation/extensions/mod_filter.html           |  189 +-
 documentation/extensions/mod_formats.html          |  618 ++++---
 documentation/extensions/mod_functions.html        |  276 ++-
 documentation/extensions/mod_hazelcast.html        |  224 ++-
 documentation/extensions/mod_injection.html        |  818 ++++----
 documentation/extensions/mod_jndi.html             |  142 +-
 documentation/extensions/mod_jodatime.html         |  313 ++--
 documentation/extensions/mod_json.html             |  178 +-
 documentation/extensions/mod_management.html       |  224 ++-
 documentation/extensions/mod_metamodel.html        |  714 ++++---
 documentation/extensions/mod_microprofile.html     |  145 +-
 documentation/extensions/mod_mutable_config.html   |  460 ++---
 documentation/extensions/mod_optional.html         |  123 +-
 documentation/extensions/mod_osgi.html             | 1138 +++++++-----
 documentation/extensions/mod_remote.html           |  145 +-
 documentation/extensions/mod_resolver.html         |  282 +--
 documentation/extensions/mod_resources.html        |  232 +--
 documentation/extensions/mod_server.html           |  316 ++--
 documentation/extensions/mod_spring.html           |  341 ++--
 documentation/extensions/mod_usagetracker.html     |  314 ++--
 documentation/extensions/mod_validation.html       |  219 ++-
 documentation/extensions/mod_vertx.html            |  287 +--
 documentation/extensions/mod_yaml.html             |  163 +-
 documentation/quickstart.html                      |  526 +++---
 documentation/spisupport.html                      |  172 +-
 documentation/usecases.html                        | 1512 +++++++++------
 download.html                                      |  190 +-
 examples.html                                      |  144 +-
 download.html => features.html                     |  244 ++-
 feed.xml                                           |  587 +++---
 highleveldesign.html                               |  450 +++--
 history.html                                       |   99 +-
 index.html                                         |  426 +----
 logos/tamaya.png                                   |  Bin 0 -> 2015 bytes
 release-guide.html                                 | 1537 ++++++++-------
 sitemap.xml                                        |  266 +--
 start.html                                         |  176 +-
 79 files changed, 13025 insertions(+), 10359 deletions(-)

diff --git a/history.html b/about.html
similarity index 72%
copy from history.html
copy to about.html
index 655dbe4..942d158 100644
--- a/history.html
+++ b/about.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 	    <meta charset="utf-8"/>
-	    <title>Tamaya Incubator</title>
+	    <title>About Tamaya</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 	    <meta name="description" content=""/>
 	    <meta name="author" content=""/>
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="sitemap.xml">Sitemap</a></li>
-						<li><a href="feed.xml">Subscribe</a></li>
+			<li><a href="sitemap.xml">Sitemap</a></li>
+			<li><a href="feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -122,52 +125,87 @@
 		<div class="container">
 
 			<div class="page-header">
-				<h1></h1>
+				<h1>About Tamaya</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div class="sect1"> 
- <h2 id="_apache_tamaya_release_history">Apache Tamaya: Release History</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Overview of all released versions of Apache Tamaya.</p> 
-  </div> 
-  <table class="tableblock frame-all grid-all" style="width: 70%;"> 
-   <colgroup> 
-    <col style="width: 18.1818%;"> 
-    <col style="width: 27.2727%;"> 
-    <col style="width: 27.2727%;"> 
-    <col style="width: 27.2728%;"> 
-   </colgroup> 
-   <tbody> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Version</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Release date</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Release Notes</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Download</p></td> 
-    </tr> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">0.3-incubating</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">2016-09-12</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">n/a</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://www.apache.org/dist/incubator/tamaya/0.3-incubating/" target="_blank" rel="noopener">Download of 0.3 incubating</a></p></td> 
-    </tr> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">0.2-incubating</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">2016-04-06</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://www.apache.org/dist/incubator/tamaya/0.2-incubating/ReleaseNotes-0.2-incubating.html" target="_blank" rel="noopener">Release Notes for 0.2 incubating</a></p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://www.apache.org/dist/incubator/tamaya/0.2-incubating/" target="_blank" rel="noopener">Download of 0.2 incubating</a></p></td> 
-    </tr> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">0.1-incubating</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">2015-08-22</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://www.apache.org/dist/incubator/tamaya/0.1-incubating/ReleaseNotes-0.1-incubating.html" target="_blank" rel="noopener">Release Notes for 0.1 incubating</a></p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://www.apache.org/dist/incubator/tamaya/0.1-incubating/" target="_blank" rel="noopener">Download of 0.1 incubating</a></p></td> 
-    </tr> 
-   </tbody> 
-  </table> 
- </div> 
+			<p><div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>Apache Tamaya (incubating) provides a <strong>unopinionated and powerful
+configuration solution</strong> for developers on the JVM.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_rationale">Rationale</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Configuration is one of the most prominent cross-cutting concerns similar to logging. Most of us already have been
+writing similar code again and again in each of our projects. Sometimes in a similar way but mostly always slightly
+different, but certainly with high coupling to your configuration backends. Given your code is reused or integrated
+some how, or deployed by some customers, struggling starts: not supported backends, different policies, missing
+combination and validation mechanisms and so on. Tamaya solves all this by defining a common API and backend SPI.
+Your code is decoupled from the configuration backend. There is no difference if your code is deployed on your dev box
+or in a clustered Docker environment in production, it stays the same!</p>
+</div>
+<div class="paragraph">
+<p>For further information we recommend to have a look at our documentation resources:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="features.html">Feature Overview</a></p>
+</li>
+<li>
+<p><a href="documentation/usecases.html">Use Cases and Requirements</a></p>
+</li>
+<li>
+<p><a href="highleveldesign.html">High Level Design</a></p>
+</li>
+<li>
+<p><a href="documentation/api.html">API</a></p>
+</li>
+<li>
+<p><a href="documentation/core.html">Core</a></p>
+</li>
+<li>
+<p><a href="documentation/extensions.html">Extensions</a></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_you_just_wanna_start_right_away">You just wanna start right away</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>So here is five liner to start&#8230;&#8203;</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Add <code>org.apache.tamaya:tamaya-core:0.4-incubating-SNAPSHOT</code> to your dependencies.</p>
+</li>
+<li>
+<p>Add some config to <code>META-INF/javaconfiguration.properties</code></p>
+</li>
+<li>
+<p>Access your configuration by <code>Configuration.current()</code> and use it.</p>
+</li>
+<li>
+<p>Look at the <a href="features.html">extensions modules</a> to customize your setup!</p>
+</li>
+<li>
+<p>Enjoy!</p>
+</li>
+</ol>
+</div>
+<div class="paragraph">
+<p>And, yes, give feedback, so we can improve ;-)</p>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -178,9 +216,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/apidocs/index.html b/apidocs/index.html
index 37a4114..27d7f9b 100644
--- a/apidocs/index.html
+++ b/apidocs/index.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../sitemap.xml">Sitemap</a></li>
-						<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="../sitemap.xml">Sitemap</a></li>
+			<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,16 +128,20 @@
 				<h1>API overview</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div class="paragraph"> 
- <p>At the moment you can see multiple API versions:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p>stable version (latest official release): <a href="./stable/index.html">0.3-incubating</a></p> </li> 
-  <li> <p>development version (upcoming release): <a href="./development/index.html">0.4-incubating-SNAPSHOT</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>At the moment you can see multiple API versions:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>stable version (latest official release): <a href="./stable/index.html">0.3-incubating</a></p>
+</li>
+<li>
+<p>development version (upcoming release): <a href="./development/index.html">0.4-incubating-SNAPSHOT</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -145,9 +152,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/archive.html b/archive.html
index e58f0f9..ae4fe9b 100644
--- a/archive.html
+++ b/archive.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="sitemap.xml">Sitemap</a></li>
-						<li><a href="feed.xml">Subscribe</a></li>
+			<li><a href="sitemap.xml">Sitemap</a></li>
+			<li><a href="feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,7 +128,7 @@
 			</div>
 
 			
-			    <h3>Februar 2018</h3>
+			    <h3>February 2018</h3>
 
 				<h4>08 - <a href="blog/2018/02/release-03-announcement.html">Tamaya 0.3-incubating release announcement</a></h4>
 				
@@ -139,21 +142,21 @@
 			
 
 			
-			    <h3>Juni 2017</h3>
+			    <h3>June 2017</h3>
 
 				<h4>06 - <a href="blog/2017/06/release-03.html">Tamaya 0.3-incubating release candidate</a></h4>
 				
 			
 
 			
-			    <h3>März 2017</h3>
+			    <h3>March 2017</h3>
 
 				<h4>28 - <a href="blog/2017/03/javaland.html">Javaland - Configuration beyond Java EE8</a></h4>
 				
 			
 
 			
-			    <h3>Dezember 2016</h3>
+			    <h3>December 2016</h3>
 
 				<h4>01 - <a href="blog/2016/dirk-weil-javaeeblog.html">Blog post (German) - Dirk Weil: Anwendungskonfiguration mit Apache Tamaya</a></h4>
 				
@@ -188,49 +191,49 @@
 			
 
 			
-			    <h3>Juni 2016</h3>
+			    <h3>June 2016</h3>
 
 				<h4>17 - <a href="blog/2016/infoq-article.html">InnoQ-article - Configure Once, Run Everywhere: Decoupling Configuration and Runtime</a></h4>
 				
 			
 
 			
-			    <h3>Mai 2016</h3>
+			    <h3>May 2016</h3>
 
 				<h4>11 - <a href="blog/2016/apachecon-vancouver.html">ApacheCon North America 2016 - Vancouver, Canada</a></h4>
 				
 			
 
 			
-			    <h3>März 2016</h3>
+			    <h3>March 2016</h3>
 
 				<h4>09 - <a href="blog/2016/javaland.html">Javaland - Configuring Containers</a></h4>
 				
 			
 
 			
-			    <h3>März 2016</h3>
+			    <h3>March 2016</h3>
 
 				<h4>03 - <a href="blog/2016/voxxed-days-zurich.html">Voxxed Days Zürich - Configuration with Apache Tamaya</a></h4>
 				
 			
 
 			
-			    <h3>März 2016</h3>
+			    <h3>March 2016</h3>
 
 				<h4>02 - <a href="blog/2016/jug-basel.html">JUG Basel - Introduction to Apache Tamaya (German)</a></h4>
 				
 			
 
 			
-			    <h3>Januar 2016</h3>
+			    <h3>January 2016</h3>
 
 				<h4>26 - <a href="blog/2016/jug-stgallen.html">JUG St. Gallen - Introduction to Apache Tamaya (German)</a></h4>
 				
 			
 
 			
-			    <h3>Januar 2016</h3>
+			    <h3>January 2016</h3>
 
 				<h4>11 - <a href="blog/2016/tamaya-book.html">German e-book - Apache Tamaya</a></h4>
 				
@@ -251,21 +254,21 @@
 			
 
 			
-			    <h3>Juli 2015</h3>
+			    <h3>July 2015</h3>
 
 				<h4>01 - <a href="blog/2015/introduction.html">Introduction to configuration (German)</a></h4>
 				
 			
 
 			
-			    <h3>März 2015</h3>
+			    <h3>March 2015</h3>
 
 				<h4>24 - <a href="blog/2015/javaland.html">JavaLand 2015 - Slides of talk about Java configuration</a></h4>
 				
 			
 
 			
-			    <h3>Dezember 2014</h3>
+			    <h3>December 2014</h3>
 
 				<h4>15 - <a href="blog/2014/whatistamaya.html">Introduction to Apache Tamaya Incubating (German)</a></h4>
 				
@@ -286,9 +289,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2014/no-jsr-in-javaee8.html b/blog/2014/no-jsr-in-javaee8.html
index 4ecba69..b58c2d6 100644
--- a/blog/2014/no-jsr-in-javaee8.html
+++ b/blog/2014/no-jsr-in-javaee8.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,14 +130,18 @@
 
 			<p><em>2014-09-03</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole wrote a blog post explaining that there will not be a configuration JSR in Java EE8.</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://jaxenter.de/ruckzieher-java-ee-8-ohne-konfigurations-jsr-678">German news article at JAXenter</a></p> </li> 
-  <li> <p><a href="http://javaeeconfig.blogspot.de/2014/09/no-java-ee-configuration-for-ee8-dear.html">original blog post</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole wrote a blog post explaining that there will not be a configuration JSR in Java EE8.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://jaxenter.de/ruckzieher-java-ee-8-ohne-konfigurations-jsr-678">German news article at JAXenter</a></p>
+</li>
+<li>
+<p><a href="http://javaeeconfig.blogspot.de/2014/09/no-java-ee-configuration-for-ee8-dear.html">original blog post</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -145,9 +152,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2014/whatistamaya.html b/blog/2014/whatistamaya.html
index ca101e4..a47c87e 100644
--- a/blog/2014/whatistamaya.html
+++ b/blog/2014/whatistamaya.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2014-12-15</em></p>
 
-			<p><div class="paragraph"> 
- <p>This article, written by Michael Thomas, gives an overview of Apache Tamaya Incubating, its concepts and motivation as a portable configuration system for Java SE, ME, EE-deployments.</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://jaxenter.de/was-ist-apache-tamaya-171">Was ist Apache Tamaya? (German article)</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>This article, written by Michael Thomas, gives an overview of Apache Tamaya Incubating, its concepts and motivation as a portable configuration system for Java SE, ME, EE-deployments.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://jaxenter.de/was-ist-apache-tamaya-171">Was ist Apache Tamaya? (German article)</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2015/dzone-article.html b/blog/2015/dzone-article.html
index f7fa613..255bdc0 100644
--- a/blog/2015/dzone-article.html
+++ b/blog/2015/dzone-article.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2015-09-17</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole wrote an article about Tamaya at DZone:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://dzone.com/articles/apache-tamaya-configuration">Anatole’s article</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole wrote an article about Tamaya at DZone:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://dzone.com/articles/apache-tamaya-configuration">Anatole&#8217;s article</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2015/introduction.html b/blog/2015/introduction.html
index 5e669d8..0e6779a 100644
--- a/blog/2015/introduction.html
+++ b/blog/2015/introduction.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2015-07-01</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole and Thorben Janssen wrote an introduction about configuration and motivation to pursuit work on Apache Tamaya:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://jaxenter.de/konfiguration-in-java-20526">Konfiguration in Java (German article)</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole and Thorben Janssen wrote an introduction about configuration and motivation to pursuit work on Apache Tamaya:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://jaxenter.de/konfiguration-in-java-20526">Konfiguration in Java (German article)</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2015/javaland.html b/blog/2015/javaland.html
index fab6124..7a00280 100644
--- a/blog/2015/javaland.html
+++ b/blog/2015/javaland.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,15 +130,21 @@
 
 			<p><em>2015-03-24</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole held a talk about Tamaya at JavaLand 2015:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="http://www.javaland.eu/en/home/">JavaLand conference page - only current year</a></p> </li> 
-  <li> <p><a href="https://www.doag.org/formes/servlet/DocNavi?action=getFile&amp;did=6796393&amp;key=">Anatole’s presentation</a></p> </li> 
-  <li> <p><a href="https://opensource.com/event/javaland-2015">JavaLand 2015 event information</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole held a talk about Tamaya at JavaLand 2015:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://www.javaland.eu/en/home/">JavaLand conference page - only current year</a></p>
+</li>
+<li>
+<p><a href="https://www.doag.org/formes/servlet/DocNavi?action=getFile&amp;did=6796393&amp;key=">Anatole&#8217;s presentation</a></p>
+</li>
+<li>
+<p><a href="https://opensource.com/event/javaland-2015">JavaLand 2015 event information</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -146,9 +155,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2015/new-configuration-api.html b/blog/2015/new-configuration-api.html
index bbef366..dce30bd 100644
--- a/blog/2015/new-configuration-api.html
+++ b/blog/2015/new-configuration-api.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2015-09-07</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole wrote a blog post about Tamaya and its API:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="http://javaeeconfig.blogspot.ch/2015/09/apache-tamaya-new-configuration-api.html">Blog post</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole wrote a blog post about Tamaya and its API:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://javaeeconfig.blogspot.ch/2015/09/apache-tamaya-new-configuration-api.html">Blog post</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/apachecon-seville.html b/blog/2016/apachecon-seville.html
index 7686dd9..2890991 100644
--- a/blog/2016/apachecon-seville.html
+++ b/blog/2016/apachecon-seville.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,15 +130,21 @@
 
 			<p><em>2016-11-16</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole took part in ApacheCon Europe in Seville from 2016-11-16 to 2016-11-18:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="http://events.linuxfoundation.org/events/apache-big-data-europe">ApacheCon BigData Europe 2016 Seville</a></p> </li> 
-  <li> <p><a href="http://events.linuxfoundation.org/events/apachecon-europe">ApacheCon Europe 2016 Seville</a></p> </li> 
-  <li> <p><a href="http://events.linuxfoundation.org/sites/events/files/slides/ConfigureOnceRunEverywhere_JavaOne2016.pdf">Anatole’s slides</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole took part in ApacheCon Europe in Seville from 2016-11-16 to 2016-11-18:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://events.linuxfoundation.org/events/apache-big-data-europe">ApacheCon BigData Europe 2016 Seville</a></p>
+</li>
+<li>
+<p><a href="http://events.linuxfoundation.org/events/apachecon-europe">ApacheCon Europe 2016 Seville</a></p>
+</li>
+<li>
+<p><a href="http://events.linuxfoundation.org/sites/events/files/slides/ConfigureOnceRunEverywhere_JavaOne2016.pdf">Anatole&#8217;s slides</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -146,9 +155,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/apachecon-vancouver.html b/blog/2016/apachecon-vancouver.html
index cc35299..352a64f 100644
--- a/blog/2016/apachecon-vancouver.html
+++ b/blog/2016/apachecon-vancouver.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,14 +130,18 @@
 
 			<p><em>2016-05-11</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole took part in ApacheCon Vancouver from 2016-05-11 to 2016-05-13:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="http://events.linuxfoundation.org/events/archive/2016/apachecon-north-america">ApacheCon 2016 Vancouver</a></p> </li> 
-  <li> <p><a href="http://de.slideshare.net/AnatoleTresch/configure-your-projects-with-apache-tamaya">Anatole’s slides</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole took part in ApacheCon Vancouver from 2016-05-11 to 2016-05-13:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://events.linuxfoundation.org/events/archive/2016/apachecon-north-america">ApacheCon 2016 Vancouver</a></p>
+</li>
+<li>
+<p><a href="http://de.slideshare.net/AnatoleTresch/configure-your-projects-with-apache-tamaya">Anatole&#8217;s slides</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -145,9 +152,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/bedcon.html b/blog/2016/bedcon.html
index 0619226..ee524fe 100644
--- a/blog/2016/bedcon.html
+++ b/blog/2016/bedcon.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,14 +130,18 @@
 
 			<p><em>2016-09-06</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole held a talk about Tamaya at BedCon2016:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="http://bed-con.org/2016/">BedCon 2016 conference page</a></p> </li> 
-  <li> <p><a href="http://bed-con.org/2016/files/slides/Configuration_v3_BedCon.pdf">Anatole’s presentation</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole held a talk about Tamaya at BedCon2016:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://bed-con.org/2016/">BedCon 2016 conference page</a></p>
+</li>
+<li>
+<p><a href="http://bed-con.org/2016/files/slides/Configuration_v3_BedCon.pdf">Anatole&#8217;s presentation</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -145,9 +152,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/dirk-weil-javaeeblog.html b/blog/2016/dirk-weil-javaeeblog.html
index 3474c76..26f398e 100644
--- a/blog/2016/dirk-weil-javaeeblog.html
+++ b/blog/2016/dirk-weil-javaeeblog.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2016-12-01</em></p>
 
-			<p><div class="paragraph"> 
- <p>Dirk Weil wrote an article about Tamaya on his blog:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://javaeeblog.wordpress.com/2016/12/01/anwendungskonfiguration-mit-apache-tamaya/amp/">JavaEEBlog: Dirk’s article</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Dirk Weil wrote an article about Tamaya on his blog:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://javaeeblog.wordpress.com/2016/12/01/anwendungskonfiguration-mit-apache-tamaya/amp/">JavaEEBlog: Dirk&#8217;s article</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/infoq-article.html b/blog/2016/infoq-article.html
index 4eaf727..55af0e3 100644
--- a/blog/2016/infoq-article.html
+++ b/blog/2016/infoq-article.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2016-06-17</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole wrote an article about Tamaya at InnoQ:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://www.infoq.com/articles/Apache-Tamaya-Configure-Once-Run-Everywhere">Anatole’s article</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole wrote an article about Tamaya at InnoQ:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://www.infoq.com/articles/Apache-Tamaya-Configure-Once-Run-Everywhere">Anatole&#8217;s article</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/java2days-sofia.html b/blog/2016/java2days-sofia.html
index fb4e0fd..ff3ad72 100644
--- a/blog/2016/java2days-sofia.html
+++ b/blog/2016/java2days-sofia.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2016-11-16</em></p>
 
-			<p><div class="paragraph"> 
- <p>Werner and Dmitry (Oracle) presented the concepts and ideas of Tamaya at the conference in Bulgaria:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="http://www.slideshare.net/DmitryKornilov/configuration-for-java-ee-config-jsr-and-tamaya">Slides</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Werner and Dmitry (Oracle) presented the concepts and ideas of Tamaya at the conference in Bulgaria:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://www.slideshare.net/DmitryKornilov/configuration-for-java-ee-config-jsr-and-tamaya">Slides</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/javaland.html b/blog/2016/javaland.html
index 5f46f85..d9b7363 100644
--- a/blog/2016/javaland.html
+++ b/blog/2016/javaland.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,17 +130,27 @@
 
 			<p><em>2016-03-09</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole held a talk about Tamaya at Javaland 2016:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://www.javaland.eu/">Javaland</a></p> </li> 
-  <li> <p><a href="https://www.javaland.eu/en/archive-2016/">Javaland conference, Brühl, Germany, 2016-03-08 - 2016-03-10</a></p> </li> 
-  <li> <p><a href="https://www.javaland.eu/en/archive-2016/downloads/">conference presentations, Topic: Configuring Containers</a></p> </li> 
-  <li> <p><a href="https://www.doag.org/konferenz/konferenzplaner/b.php?id=499959&amp;locS=1">Conference planer 2016</a></p> </li> 
-  <li> <p><a href="https://www.doag.org/konferenz/konferenzplaner/konferenzplaner_details.php?locS=1&amp;id=499959&amp;vid=509415">Anatole’s talk on 2016-03-09 (German)</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole held a talk about Tamaya at Javaland 2016:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://www.javaland.eu/">Javaland</a></p>
+</li>
+<li>
+<p><a href="https://www.javaland.eu/en/archive-2016/">Javaland conference, Brühl, Germany, 2016-03-08 - 2016-03-10</a></p>
+</li>
+<li>
+<p><a href="https://www.javaland.eu/en/archive-2016/downloads/">conference presentations, Topic: Configuring Containers</a></p>
+</li>
+<li>
+<p><a href="https://www.doag.org/konferenz/konferenzplaner/b.php?id=499959&amp;locS=1">Conference planer 2016</a></p>
+</li>
+<li>
+<p><a href="https://www.doag.org/konferenz/konferenzplaner/konferenzplaner_details.php?locS=1&amp;id=499959&amp;vid=509415">Anatole&#8217;s talk on 2016-03-09 (German)</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -148,9 +161,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/javaone.html b/blog/2016/javaone.html
index 7df3b9d..739b092 100644
--- a/blog/2016/javaone.html
+++ b/blog/2016/javaone.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,15 +130,21 @@
 
 			<p><em>2016-09-27</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole held a talk about Tamaya at JavaOne and took part in the Hackergarten:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://community.oracle.com/docs/DOC-997220">Hackergarten schedule</a></p> </li> 
-  <li> <p><a href="https://blogs.oracle.com/java/java-community-at-javaone">Java Community at JavaOne</a></p> </li> 
-  <li> <p><a href="http://www.slideshare.net/AnatoleTresch/configure-once-run-everywhere-2016">Anatole’s presentation</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole held a talk about Tamaya at JavaOne and took part in the Hackergarten:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://community.oracle.com/docs/DOC-997220">Hackergarten schedule</a></p>
+</li>
+<li>
+<p><a href="https://blogs.oracle.com/java/java-community-at-javaone">Java Community at JavaOne</a></p>
+</li>
+<li>
+<p><a href="http://www.slideshare.net/AnatoleTresch/configure-once-run-everywhere-2016">Anatole&#8217;s presentation</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -146,9 +155,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/jug-basel.html b/blog/2016/jug-basel.html
index 3351332..148f648 100644
--- a/blog/2016/jug-basel.html
+++ b/blog/2016/jug-basel.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2016-03-02</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole is going to talk about "Konfiguration mit Apache Tamaya" at Java Usergroup meeting in Basel.</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="http://www.jug.ch/html/events/2016/apache_tamaya_bs.html">JUG details</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole is going to talk about "Konfiguration mit Apache Tamaya" at Java Usergroup meeting in Basel.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://www.jug.ch/html/events/2016/apache_tamaya_bs.html">JUG details</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/jug-stgallen.html b/blog/2016/jug-stgallen.html
index 91b4fc2..f147d3d 100644
--- a/blog/2016/jug-stgallen.html
+++ b/blog/2016/jug-stgallen.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2016-01-26</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole is going to talk about "Konfiguration mit Apache Tamaya" at Java Usergroup meeting in St. Gallen.</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="http://www.jug.ch/html/events/2016/apache_tamaya_bs.html">JUG details</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole is going to talk about "Konfiguration mit Apache Tamaya" at Java Usergroup meeting in St. Gallen.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://www.jug.ch/html/events/2016/apache_tamaya_bs.html">JUG details</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/tamaya-book.html b/blog/2016/tamaya-book.html
index 3652014..503c98e 100644
--- a/blog/2016/tamaya-book.html
+++ b/blog/2016/tamaya-book.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,15 +130,21 @@
 
 			<p><em>2016-01-11</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole Tresch and Thorben Janssen authored a German ebook about Tamaya that derived from a JavaMagzin article series:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://entwickler.de/press/apache-tamaya-196233.html">entwickler.de - e-book</a></p> </li> 
-  <li> <p><a href="https://books.google.ch/books?id=SMN-DAAAQBAJ&amp;printsec=frontcover&amp;hl=de#v=onepage&amp;q&amp;f=false">Google book preview</a></p> </li> 
-  <li> <p><a href="https://www.amazon.de/Apache-Tamaya-Einstieg-Konfiguration-shortcuts-ebook/dp/B01AIJ7QMM?tag=tendoryuberlin">Apache Tamaya: Einstieg in die Konfiguration in Java (shortcuts 168) Kindle Edition at amazon.de</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole Tresch and Thorben Janssen authored a German ebook about Tamaya that derived from a JavaMagzin article series:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://entwickler.de/press/apache-tamaya-196233.html">entwickler.de - e-book</a></p>
+</li>
+<li>
+<p><a href="https://books.google.ch/books?id=SMN-DAAAQBAJ&amp;printsec=frontcover&amp;hl=de#v=onepage&amp;q&amp;f=false">Google book preview</a></p>
+</li>
+<li>
+<p><a href="https://www.amazon.de/Apache-Tamaya-Einstieg-Konfiguration-shortcuts-ebook/dp/B01AIJ7QMM?tag=tendoryuberlin">Apache Tamaya: Einstieg in die Konfiguration in Java (shortcuts 168) Kindle Edition at amazon.de</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -146,9 +155,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2016/voxxed-days-zurich.html b/blog/2016/voxxed-days-zurich.html
index 8c837cb..fa84cfb 100644
--- a/blog/2016/voxxed-days-zurich.html
+++ b/blog/2016/voxxed-days-zurich.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,13 +130,15 @@
 
 			<p><em>2016-03-03</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole took part in Voxxed Days Zürich, a recording of his talk is:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://www.youtube.com/watch?v=wgWeDAFET0o">Anatole’s talk (YouTube)</a></p> </li> 
- </ul> 
+			<p><div class="paragraph">
+<p>Anatole took part in Voxxed Days Zürich, a recording of his talk is:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://www.youtube.com/watch?v=wgWeDAFET0o">Anatole&#8217;s talk (YouTube)</a></p>
+</li>
+</ul>
 </div></p>
 
 			<hr />
@@ -144,9 +149,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2017/03/javaland.html b/blog/2017/03/javaland.html
index 25ce960..8670853 100644
--- a/blog/2017/03/javaland.html
+++ b/blog/2017/03/javaland.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../../feed.xml">Subscribe</a></li>
+			<li><a href="../../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,17 +130,21 @@
 
 			<p><em>2017-03-28</em></p>
 
-			<p><div class="paragraph"> 
- <p>Anatole held a talk about Tamaya at Javaland 2017:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://www.javaland.eu/">Javaland</a></p> </li> 
-  <li> <p><a href="https://www.slideshare.net/AnatoleTresch/configuration-beyond-java-ee-8">Anatole’s slides</a></p> </li> 
- </ul> 
-</div> 
-<div class="paragraph"> 
- <p>The talk was attended by roughly 30 people and lively discussions about Tamaya and Microprofile.io followed. Currently Tamaya seems in good shape to tackle the future of configuration in Java.</p> 
+			<p><div class="paragraph">
+<p>Anatole held a talk about Tamaya at Javaland 2017:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://www.javaland.eu/">Javaland</a></p>
+</li>
+<li>
+<p><a href="https://www.slideshare.net/AnatoleTresch/configuration-beyond-java-ee-8">Anatole&#8217;s slides</a></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The talk was attended by roughly 30 people and lively discussions about Tamaya and Microprofile.io followed. Currently Tamaya seems in good shape to tackle the future of configuration in Java.</p>
 </div></p>
 
 			<hr />
@@ -148,9 +155,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2017/06/release-03.html b/blog/2017/06/release-03.html
index be7fe31..8ff3b1b 100644
--- a/blog/2017/06/release-03.html
+++ b/blog/2017/06/release-03.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../../feed.xml">Subscribe</a></li>
+			<li><a href="../../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,16 +130,18 @@
 
 			<p><em>2017-06-06</em></p>
 
-			<p><div class="paragraph"> 
- <p>After a long and sweaty journey a new release candidate passed the internal vote:</p> 
-</div> 
-<div class="ulist"> 
- <ul> 
-  <li> <p><a href="https://repository.apache.org/content/groups/public/org/apache/tamaya/tamaya-all/0.3-incubating/">Maven repository</a></p> </li> 
- </ul> 
-</div> 
-<div class="paragraph"> 
- <p>An official release announcement will follow as well as migration information :-) Stay tuned!</p> 
+			<p><div class="paragraph">
+<p>After a long and sweaty journey a new release candidate passed the internal vote:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://repository.apache.org/content/groups/public/org/apache/tamaya/tamaya-all/0.3-incubating/">Maven repository</a></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>An official release announcement will follow as well as migration information :-) Stay tuned!</p>
 </div></p>
 
 			<hr />
@@ -147,9 +152,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2017/09/new-api-links.html b/blog/2017/09/new-api-links.html
index 7d7c636..9887463 100644
--- a/blog/2017/09/new-api-links.html
+++ b/blog/2017/09/new-api-links.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../../feed.xml">Subscribe</a></li>
+			<li><a href="../../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,17 +130,19 @@
 
 			<p><em>2017-09-12</em></p>
 
-			<p><div class="paragraph"> 
- <p>The homepage allows multiple API versions to be linked - you can find multiple versions of our API now.</p> 
-</div> 
-<div class="paragraph"> 
- <p>The most current released version - considered stable - can be found here: <a href="https://tamaya.incubator.apache.org/apidocs/stable/index.html" class="bare">https://tamaya.incubator.apache.org/apidocs/stable/index.html</a></p> 
-</div> 
-<div class="paragraph"> 
- <p>While the current development version - considered unstable - is: <a href="https://tamaya.incubator.apache.org/apidocs/development/index.html" class="bare">https://tamaya.incubator.apache.org/apidocs/development/index.html</a></p> 
-</div> 
-<div class="paragraph"> 
- <p>Happy hacking :-)</p> 
+			<p><div class="paragraph">
+<p>The homepage allows multiple API versions to be linked - you can find multiple versions of our API now.</p>
+</div>
+<div class="paragraph">
+<p>The most current released version - considered stable - can be found here:
+<a href="https://tamaya.incubator.apache.org/apidocs/stable/index.html" class="bare">https://tamaya.incubator.apache.org/apidocs/stable/index.html</a></p>
+</div>
+<div class="paragraph">
+<p>While the current development version - considered unstable - is:
+<a href="https://tamaya.incubator.apache.org/apidocs/development/index.html" class="bare">https://tamaya.incubator.apache.org/apidocs/development/index.html</a></p>
+</div>
+<div class="paragraph">
+<p>Happy hacking :-)</p>
 </div></p>
 
 			<hr />
@@ -148,9 +153,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/blog/2018/02/release-03-announcement.html b/blog/2018/02/release-03-announcement.html
index 9cdc927..f0c8866 100644
--- a/blog/2018/02/release-03-announcement.html
+++ b/blog/2018/02/release-03-announcement.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../../feed.xml">Subscribe</a></li>
+			<li><a href="../../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -127,56 +130,81 @@
 
 			<p><em>2018-02-08</em></p>
 
-			<p><div id="preamble"> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>We are proud to announce a new version of Tamaya:</p> 
-  </div> 
-  <div class="ulist"> 
-   <ul> 
-    <li> <p><a href="https://repository.apache.org/content/groups/public/org/apache/tamaya/tamaya-all/0.3-incubating/">Maven repository</a></p> </li> 
-   </ul> 
-  </div> 
- </div> 
-</div> 
-<h1 id="_main_features" class="sect0">Main features</h1> 
-<div class="ulist"> 
- <ul> 
-  <li> <p>We fixed a lot of bugs.</p> </li> 
-  <li> <p>We reduced the log "noise" on startup.</p> </li> 
-  <li> <p>We introduced PropertyValue as a SPI artifact to support meta-entries.</p> </li> 
-  <li> <p>We integrated the builder extension within the existing builder API.</p> </li> 
-  <li> <p>We simplified a couple of APIs so working with explicit builders is as straightforward as using auto-discovery features.</p> </li> 
-  <li> <p>It is now possible to inject configuration values into any kind of beans/templates, without being annotated at all as well.</p> </li> 
-  <li> <p>We resolved possible license issues by replacing corresponding dependencies with Apache variants.</p> </li> 
-  <li> <p>We added converters for File and Path.</p> </li> 
-  <li> <p>We removed the binary distribution package in favour of the source distribution and the uploaded maven artifacts.</p> </li> 
- </ul> 
-</div> 
-<h1 id="_project_structure" class="sect0">Project structure</h1> 
-<div class="paragraph"> 
- <p>The slim Tamaya API and core implementation is enhanced by different kinds of production-ready extensions modules, while a sandbox contains different alpha-grade modules.</p> 
-</div> 
-<div class="paragraph"> 
- <p>Details on how to use Tamaya can be found on our site: <a href="http://tamaya.incubator.apache.org/" class="bare">http://tamaya.incubator.apache.org/</a> With this release we also separated the homepage code completely from the project code, to ease independent lifecycles.</p> 
-</div> 
-<div class="paragraph"> 
- <p>You may download the release via: <a href="http://www.apache.org/dyn/closer.cgi/incubator/tamaya/0.3-incubating" class="bare">http://www.apache.org/dyn/closer.cgi/incubator/tamaya/0.3-incubating</a> or in your pom.xml from Maven central:</p> 
-</div> 
-<div class="listingblock"> 
- <div class="content"> 
-  <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+			<p><div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>We are proud to announce a new version of Tamaya:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://repository.apache.org/content/groups/public/org/apache/tamaya/tamaya-all/0.3-incubating/">Maven repository</a></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<h1 id="_main_features" class="sect0">Main features</h1>
+<div class="ulist">
+<ul>
+<li>
+<p>We fixed a lot of bugs.</p>
+</li>
+<li>
+<p>We reduced the log "noise" on startup.</p>
+</li>
+<li>
+<p>We introduced PropertyValue as a SPI artifact to support meta-entries.</p>
+</li>
+<li>
+<p>We integrated the builder extension within the existing builder API.</p>
+</li>
+<li>
+<p>We simplified a couple of APIs so working with explicit builders is as straightforward as using auto-discovery features.</p>
+</li>
+<li>
+<p>It is now possible to inject configuration values into any kind of beans/templates, without being annotated at all as well.</p>
+</li>
+<li>
+<p>We resolved possible license issues by replacing corresponding dependencies with Apache variants.</p>
+</li>
+<li>
+<p>We added converters for File and Path.</p>
+</li>
+<li>
+<p>We removed the binary distribution package in favour of the source distribution and the uploaded maven artifacts.</p>
+</li>
+</ul>
+</div>
+<h1 id="_project_structure" class="sect0">Project structure</h1>
+<div class="paragraph">
+<p>The slim Tamaya API and core implementation is enhanced by different kinds of production-ready extensions modules, while a sandbox contains different alpha-grade modules.</p>
+</div>
+<div class="paragraph">
+<p>Details on how to use Tamaya can be found on our site: <a href="http://tamaya.incubator.apache.org/" class="bare">http://tamaya.incubator.apache.org/</a>
+With this release we also separated the homepage code completely from the project code, to ease independent lifecycles.</p>
+</div>
+<div class="paragraph">
+<p>You may download the release via:
+<a href="http://www.apache.org/dyn/closer.cgi/incubator/tamaya/0.3-incubating" class="bare">http://www.apache.org/dyn/closer.cgi/incubator/tamaya/0.3-incubating</a>
+or in your pom.xml from Maven central:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
     &lt;groupId&gt;org.apache.tamaya&lt;/groupId&gt;
     &lt;artifactId&gt;tamaya-core&lt;/artifactId&gt;
     &lt;version&gt;0.3-incubating&lt;/version&gt;
-&lt;/dependency&gt;</code></pre> 
- </div> 
-</div> 
-<div class="paragraph"> 
- <p>When downloading, please verify signatures using the KEYS file: <a href="https://www.apache.org/dist/incubator/tamaya/0.3-incubating/apiandcore/KEYS" class="bare">https://www.apache.org/dist/incubator/tamaya/0.3-incubating/apiandcore/KEYS</a></p> 
-</div> 
-<div class="paragraph"> 
- <p>The list of changes included in this release can be found at: <a href="https://issues.apache.org/jira/projects/TAMAYA/versions/12329052" class="bare">https://issues.apache.org/jira/projects/TAMAYA/versions/12329052</a></p> 
+&lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>When downloading, please verify signatures using the KEYS file:
+<a href="https://www.apache.org/dist/incubator/tamaya/0.3-incubating/apiandcore/KEYS" class="bare">https://www.apache.org/dist/incubator/tamaya/0.3-incubating/apiandcore/KEYS</a></p>
+</div>
+<div class="paragraph">
+<p>The list of changes included in this release can be found at:
+<a href="https://issues.apache.org/jira/projects/TAMAYA/versions/12329052" class="bare">https://issues.apache.org/jira/projects/TAMAYA/versions/12329052</a></p>
 </div></p>
 
 			<hr />
@@ -187,9 +215,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/css/base.css b/css/base.css
index 68fe241..96a8004 100644
--- a/css/base.css
+++ b/css/base.css
@@ -36,16 +36,34 @@ body {
   }
 }
 
+.incubator-logo {
+  width; 300px;
+  height: 30px;
+}
+
 /* Custom page CSS
 -------------------------------------------------- */
 /* Not required for template or sticky footer method. */
 
 #wrap > .container {
-  padding-top: 60px;
+  padding-top: 20px;
 }
 .container .credit {
   margin: 20px 0;
 }
+.front-logo {
+  padding-top: 6px;
+  padding-right: 20px;
+  padding-bottom: 10px;
+  padding-left: 0px;
+}
+.front-cell {
+  padding-top: 5px;
+  padding-right: 5px;
+  padding-bottom: 5px;
+  padding-left: 0px;
+  width: 33%;
+}
 
 /*code {
   font-size: 80%;
diff --git a/development/community.html b/development/community.html
index b4087ee..d3011d0 100644
--- a/development/community.html
+++ b/development/community.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../sitemap.xml">Sitemap</a></li>
-						<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="../sitemap.xml">Sitemap</a></li>
+			<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,123 +128,158 @@
 				<h1>Apache Tamaya: Community</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div class="sect1"> 
- <h2 id="_users">Users</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>If you are a new user and you would like to participate in Tamaya (would be great!), you can have a look at the current project documentation. Apache Tamaya currently does not yet have a users mailing list. If you want discuss your use cases we encourage you to <a href="mailto:dev-subscribe@tamaya.incubator.apache.org">subscribe</a> to our <a href="mailto:dev@tamaya.incubator.apache.org">mailing list for developers</a>. Furthermore, you can check our <a href="#a_mailing_lists">mail [...]
-  </div> 
-  <div class="paragraph"> 
-   <p>Before you file a ticket in our <a href="https://issues.apache.org/jira/browse/TAMAYA" target="_blank" rel="noopener">Jira</a> please ask on the mailing list if it’s a known issue in case of a bug or if there is an ongoing discussion in case of a feature.</p> 
-  </div> 
-  <div class="paragraph"> 
-   <p>You are very welcome to follow our twitter account <a href="https://twitter.com/tamayaconf" target="_blank" rel="noopener">@tamayaconf</a> and spread the word of Tamaya with tweets, blog entries,…​</p> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_getting_involved">Getting Involved</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Everybody is welcome to get involved with our community. You can find general information at <a href="https://apache.org/foundation/getinvolved.html" class="bare">https://apache.org/foundation/getinvolved.html</a> and <a href="https://apache.org/foundation/how-it-works.html" class="bare">https://apache.org/foundation/how-it-works.html</a>. The following sections provides some details about the different levels of getting involved.</p> 
-  </div> 
-  <div class="paragraph"> 
-   <p>If you want to contribute to the documentation of Apache Tamaya, please read the instructions about the Documentation that addresses how to contribute, render and publish it.</p> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_contributors">Contributors</h3> 
-   <div class="paragraph"> 
-    <p>Before you get a committer you have to contribute to our effort. E.g. you can help users, participate in discussions on the dev list, submit patches,…​ . Therefore, it’s essential to file a <a href="https://www.apache.org/licenses/icla.txt" target="_blank" rel="noopener">Individual Contributor License Agreement (ICLA)</a> or <a href="https://www.apache.org/licenses/cla-corporate.txt" target="_blank" rel="noopener">Software Grant and Corporate Contributor License Agreement (CCLA)</ [...]
-   </div> 
-   <div class="paragraph"> 
-    <p>If you would like to submit a patch through Jira, you can have a look at the <a href="../devguide.html">suggested Git approach</a>.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The lists of current contributors and committers can be found on the <a href="team.html" target="_blank" rel="noopener">team and contributers page</a>.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_committers">Committers</h3> 
-   <div class="paragraph"> 
-    <p>Before you read this section, please ensure that you have read the contributor section. All of you are welcome to join our development effort. <a href="mailto:dev-subscribe@tamaya.incubator.apache.org">Subscribe</a> to our <a href="mailto:dev@tamaya.incubator.apache.org">mailing list for developers</a> and start contributing and help users.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Optionally <a href="mailto:commits-subscribe@tamaya.incubator.apache.org">subscribe</a> to our <a href="mailto:commits@tamaya.incubator.apache.org">mailing list for commits</a>. Furthermore, you can check our <a href="community.html#mailing-lists">mail-archives</a>.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Further details are available at <a href="https://www.apache.org/dev/" target="_blank" rel="noopener">https://www.apache.org/dev/</a>.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_mailing_lists">Mailing lists</h3> 
-   <div class="paragraph"> 
-    <p>The table below lists all mailings used by the Tamaya project.</p> 
-   </div> 
-   <table class="tableblock frame-all grid-all" style="width: 70%;"> 
-    <colgroup> 
-     <col style="width: 20%;"> 
-     <col style="width: 20%;"> 
-     <col style="width: 20%;"> 
-     <col style="width: 20%;"> 
-     <col style="width: 20%;"> 
-    </colgroup> 
-    <thead> 
-     <tr> 
-      <th class="tableblock halign-left valign-top">List</th> 
-      <th class="tableblock halign-left valign-top">Subscribe</th> 
-      <th class="tableblock halign-left valign-top">Unsubscribe</th> 
-      <th class="tableblock halign-left valign-top">Archive</th> 
-      <th class="tableblock halign-left valign-top">Mirrors</th> 
-     </tr> 
-    </thead> 
-    <tbody> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Developer List</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-subscribe@tamaya.incubator.apache.org">Subscribe</a></p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-unsubscribe@tamaya.incubator.apache.org">Unsubscribe</a></p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://mail-archives.apache.org/mod_mbox/incubator-tamaya-dev/" target="_blank" rel="noopener">Archive</a></p></td> 
-      <td class="tableblock halign-left valign-top"></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Committer List</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:commits-subscribe@tamaya.incubator.apache.org">Subscribe</a></p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:commits-unsubscribe@tamaya.incubator.apache.org">Unsubscribe</a></p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://mail-archives.apache.org/mod_mbox/incubator-tamaya-commits/" target="_blank" rel="noopener">Archive</a></p></td> 
-      <td class="tableblock halign-left valign-top"></td> 
-     </tr> 
-    </tbody> 
-   </table> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_jira">JIRA</h3> 
-   <div class="paragraph"> 
-    <p>Any kind of issue has to be filed in our <a href="https://issues.apache.org/jira/browse/TAMAYA" target="_blank" rel="noopener">issue tracker</a>. If you have any question, you can ask us (e.g. via the mailing list for developers).</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_spread_the_word">Spread the word</h3> 
-   <div class="paragraph"> 
-    <p>You are very welcome e.g. to write blog entries, mention our twitter handle @tamayaconf if you tweet about the project or just follow our twitter account <a href="https://twitter.com/tamayaconf" target="_blank" rel="noopener">@tamayaconf</a></p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_irc">IRC</h3> 
-   <div class="paragraph"> 
-    <p>Usually discussions happen on the mailing list. Some informal discussions take place in our IRC-Channel <a href="irc://irc.freenode.net/apache-tamaya" class="bare">irc://irc.freenode.net/apache-tamaya</a>.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>// with the irssi command-line client:
+			<p><div class="sect1">
+<h2 id="_users">Users</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>If you are a new user and you would like to participate in Tamaya
+(would be great!), you can have a look at the current
+project documentation. Apache Tamaya currently does
+not yet have a users mailing list. If you want discuss your use cases
+we encourage you to <a href="mailto:dev-subscribe@tamaya.incubator.apache.org">subscribe</a>
+to our <a href="mailto:dev@tamaya.incubator.apache.org">mailing list for developers</a>.
+Furthermore, you can check our <a href="#a_mailing_lists">mail-archives</a>.</p>
+</div>
+<div class="paragraph">
+<p>Before you file a ticket in our <a href="https://issues.apache.org/jira/browse/TAMAYA" target="_blank" rel="noopener">Jira</a>
+please ask on the mailing list if it&#8217;s a known issue in case of a
+bug or if there is an ongoing discussion in case of a feature.</p>
+</div>
+<div class="paragraph">
+<p>You are very welcome to follow our twitter account
+<a href="https://twitter.com/tamayaconf" target="_blank" rel="noopener">@tamayaconf</a> and spread the word
+of Tamaya with tweets, blog entries,&#8230;&#8203;</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_getting_involved">Getting Involved</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Everybody is welcome to get involved with our community. You can find general
+information at <a href="https://apache.org/foundation/getinvolved.html" class="bare">https://apache.org/foundation/getinvolved.html</a> and
+<a href="https://apache.org/foundation/how-it-works.html" class="bare">https://apache.org/foundation/how-it-works.html</a>.
+The following sections provides some details about the different levels of getting involved.</p>
+</div>
+<div class="paragraph">
+<p>If you want to contribute to the
+documentation of Apache Tamaya, please
+read the instructions about the Documentation
+that addresses how to contribute, render and publish it.</p>
+</div>
+<div class="sect2">
+<h3 id="_contributors">Contributors</h3>
+<div class="paragraph">
+<p>Before you get a committer you have to contribute to our effort.
+E.g. you can help users, participate in discussions on the dev list,
+submit patches,&#8230;&#8203; . Therefore, it&#8217;s essential to file
+a <a href="https://www.apache.org/licenses/icla.txt" target="_blank" rel="noopener">Individual Contributor License Agreement (ICLA)</a>
+or <a href="https://www.apache.org/licenses/cla-corporate.txt" target="_blank" rel="noopener">Software Grant and Corporate Contributor License Agreement (CCLA)</a>
+and send it to secretary at apache dot org (or fax it) as early as possible.</p>
+</div>
+<div class="paragraph">
+<p>If you would like to submit a patch through Jira, you can have a look at the
+<a href="../devguide.html">suggested Git approach</a>.</p>
+</div>
+<div class="paragraph">
+<p>The lists of current contributors and committers can be found
+on the <a href="team.html" target="_blank" rel="noopener">team and contributers page</a>.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_committers">Committers</h3>
+<div class="paragraph">
+<p>Before you read this section, please ensure that you have read
+the contributor section. All of you are welcome to join our development effort.
+<a href="mailto:dev-subscribe@tamaya.incubator.apache.org">Subscribe</a> to our
+<a href="mailto:dev@tamaya.incubator.apache.org">mailing list for developers</a> and
+start contributing and help users.</p>
+</div>
+<div class="paragraph">
+<p>Optionally <a href="mailto:commits-subscribe@tamaya.incubator.apache.org">subscribe</a> to our
+<a href="mailto:commits@tamaya.incubator.apache.org">mailing list for commits</a>.
+Furthermore, you can check our <a href="community.html#mailing-lists">mail-archives</a>.</p>
+</div>
+<div class="paragraph">
+<p>Further details are available at <a href="https://www.apache.org/dev/" target="_blank" rel="noopener">https://www.apache.org/dev/</a>.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_mailing_lists">Mailing lists</h3>
+<div class="paragraph">
+<p>The table below lists all mailings used by the Tamaya project.</p>
+</div>
+<table class="tableblock frame-all grid-all" style="width: 70%;">
+<colgroup>
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">List</th>
+<th class="tableblock halign-left valign-top">Subscribe</th>
+<th class="tableblock halign-left valign-top">Unsubscribe</th>
+<th class="tableblock halign-left valign-top">Archive</th>
+<th class="tableblock halign-left valign-top">Mirrors</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Developer List</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-subscribe@tamaya.incubator.apache.org">Subscribe</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-unsubscribe@tamaya.incubator.apache.org">Unsubscribe</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://mail-archives.apache.org/mod_mbox/incubator-tamaya-dev/" target="_blank" rel="noopener">Archive</a></p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Committer List</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:commits-subscribe@tamaya.incubator.apache.org">Subscribe</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:commits-unsubscribe@tamaya.incubator.apache.org">Unsubscribe</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://mail-archives.apache.org/mod_mbox/incubator-tamaya-commits/" target="_blank" rel="noopener">Archive</a></p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_jira">JIRA</h3>
+<div class="paragraph">
+<p>Any kind of issue has to be filed in our
+<a href="https://issues.apache.org/jira/browse/TAMAYA" target="_blank" rel="noopener">issue tracker</a>.
+If you have any question, you can ask us
+(e.g. via the mailing list for developers).</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_spread_the_word">Spread the word</h3>
+<div class="paragraph">
+<p>You are very welcome e.g. to write blog entries, mention our twitter handle
+ @tamayaconf if you tweet about the project or just follow our twitter
+account <a href="https://twitter.com/tamayaconf" target="_blank" rel="noopener">@tamayaconf</a></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_irc">IRC</h3>
+<div class="paragraph">
+<p>Usually discussions happen on the mailing list. Some informal discussions take
+place in our IRC-Channel <a href="irc://irc.freenode.net/apache-tamaya" class="bare">irc://irc.freenode.net/apache-tamaya</a>.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>// with the irssi command-line client:
 $ irssi
 
 &gt; /connect irc.freenode.net
-&gt; /join #apache-tamaya</pre> 
-    </div> 
-   </div> 
-  </div> 
- </div> 
+&gt; /join #apache-tamaya</pre>
+</div>
+</div>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -252,9 +290,9 @@ $ irssi
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/development/possible-contributions.html b/development/possible-contributions.html
index 2015d25..232f3d3 100644
--- a/development/possible-contributions.html
+++ b/development/possible-contributions.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../sitemap.xml">Sitemap</a></li>
-						<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="../sitemap.xml">Sitemap</a></li>
+			<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,83 +128,96 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
+
+			<p><!-- toc disabled -->
+<h1 id="_apache_tamaya_possible_tasks" class="sect0">Apache Tamaya - Possible Tasks</h1>
+<div style="page-break-after: always;"></div>
+<div class="sect1">
+<h2 id="_introduction">1. Introduction</h2>
+<div class="sectionbody">
 
-			<p><!-- toc disabled --> 
-<h1 id="_apache_tamaya_possible_tasks" class="sect0">Apache Tamaya - Possible Tasks</h1> 
-<div style="page-break-after: always;"></div> 
-<div class="sect1"> 
- <h2 id="_introduction">1. Introduction</h2> 
- <div class="sectionbody"> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_what_is_tamaya">2. What is Tamaya</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>{name} is the Apache standard for flexible and powerful configuration. Objective is to provide flavors for Java SE, ME as well as to ship with powerful features for Java EE and Cloud Solutions. All functions provided is build on top of a small but very powerful, flexible and extendible API. This API is implemented by a core implementation, which then can be extended or adapted for use in different runtime scenarios, such as SE, ME, EE, Spring, OSGI and more. Similarly additional mo [...]
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_purpose_of_this_document">2.1. Purpose of this Document</h3> 
-   <div class="paragraph"> 
-    <p>The document should help to organize people and ideas around the Apache Tamaya Library. It list possible features, ideas and tasks that need to be done. Everybody can have a look at and see, where hos contribution and capabilities would fit best.</p> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_main_features">3. Main Features</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_metadata_model">3.1. Metadata Model</h3> 
-   <div class="paragraph"> 
-    <p>Currently MetaInfo models metadata as a separate constuct. It has been shown that this leads to more complex handling when creating composites and makes the API overall more complex. The idea is to model metadata as simple key/value pairs, that are part of the provider/configuration data as well, but handled separately. Metadata hereby is identified by a starting '_' character in its key. For example refer to the following configuration properties:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     Basic Properties
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">a.b.Foo=foo
+</div>
+</div>
+<div class="sect1">
+<h2 id="_what_is_tamaya">2. What is Tamaya</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>{name} is the Apache standard for flexible and powerful configuration. Objective is to provide flavors for
+Java SE, ME as well as to ship with powerful features for Java EE and Cloud Solutions. All functions provided
+is build on top of a small but very powerful, flexible and extendible API. This API is implemented by a core implementation,
+which then can be extended or adapted for use in different runtime scenarios, such as SE, ME, EE, Spring, OSGI
+and more. Similarly additional modules may be provided that help also existing solution to be plugged into
+{name}, so you can start right away using {name} without having to rebuild/change your existing application.</p>
+</div>
+<div class="sect2">
+<h3 id="_purpose_of_this_document">2.1. Purpose of this Document</h3>
+<div class="paragraph">
+<p>The document should help to organize people and ideas around the Apache Tamaya Library. It list possible features,
+ideas and tasks that need to be done. Everybody can have a look at and see, where hos contribution and capabilities
+would fit best.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_main_features">3. Main Features</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_metadata_model">3.1. Metadata Model</h3>
+<div class="paragraph">
+<p>Currently MetaInfo models metadata as a separate constuct. It has been shown that this leads to more complex
+handling when creating composites and makes the API overall more complex. The idea is to model metadata as simple
+key/value pairs, that are part of the provider/configuration data as well, but handled separately. Metadata hereby
+is identified by a starting '_' character in its key. For example refer to the following configuration properties:</p>
+</div>
+<div class="listingblock">
+<div class="title">Basic Properties</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">a.b.Foo=foo
 a.b.Bar=bar
 a.AnyOther=whatelse
-Something=none</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Now we can model meta-data as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     Metadata Properties
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">[a.b].info=An area info
+Something=none</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now we can model meta-data as follows:</p>
+</div>
+<div class="listingblock">
+<div class="title">Metadata Properties</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">[a.b].info=An area info
 [a.b.Foo].auth=role1,role2
 [a.b.Foo].encrypt=PGP
 [a.b.Foo].sensitive=true
-[].info=This is a test configuration example.</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The above would model the following:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>The area a.b has the meta property info.</p> </li> 
-     <li> <p>The entry a.b.Foo has three meta properties auth,encrypt and sensitive. These could be interpreted by a security view and used to encrypt the values returned by the configuration instance, if not the current user has one of the specified roles.</p> </li> 
-     <li> <p>The last meta data defines an attribute info for the whole provider/configuration (the root area).</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Given that the overall entries would be as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     Full Properties with Meta Properties
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">[a.b].info=An area info
+[].info=This is a test configuration example.</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The above would model the following:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The area a.b has the meta property info.</p>
+</li>
+<li>
+<p>The entry a.b.Foo has three meta properties auth,encrypt and sensitive. These could be interpreted by a security
+view and used to encrypt the values returned by the configuration instance, if not the current user has one of the
+specified roles.</p>
+</li>
+<li>
+<p>The last meta data defines an attribute info for the whole provider/configuration (the root area).</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Given that the overall entries would be as follows:</p>
+</div>
+<div class="listingblock">
+<div class="title">Full Properties with Meta Properties</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">[a.b].info=An area info
 a.b.Foo=foo
 [a.b.Foo].auth=role1,role2
 [a.b.Foo].encrypt=PGP
@@ -209,196 +225,245 @@ a.b.Foo=foo
 a.b.Bar=bar
 [].info=This is a test configuration example.
 a.AnyOther=whatelse
-Something=none</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The current MetaInfo class could be adapted, so it is reading data from the underlying configuration/provider, instead of its own datastructure. This would make a later mapping of configuration and its metadata into DB table, JSON etc, much more easier. The providers on the other side may suppress any metadata from ordinary output, such as toString(), Similarly accessing metadata using the official config API (get, getOrDefault, getAreas etc) should be disabled. The MetaInfoBuilde [...]
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_management_client">3.2. Management Client</h3> 
-   <div class="paragraph"> 
-    <p>A nice web-based client to manage configuration data would be nice as well. This also includes a UI for creating new configurations.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_mapping_configuration_to_a_database">3.3. Mapping Configuration to a Database</h3> 
-   <div class="paragraph"> 
-    <p>A flexible mechanism should be implemented that allows the use of databases (SQL/JPA as well as non-SQL) for storing/retreiving/managing configuration:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>JPA, Hibernate</p> </li> 
-     <li> <p>MongoDB</p> </li> 
-     <li> <p>…​</p> </li> 
-    </ul> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_integration_with_jigsaw">3.4. Integration with Jigsaw</h3> 
-   <div class="paragraph"> 
-    <p>Once Jigsaw is mature and in a usable (still early) stage, examples are to be created and tested, where OSGI is used as the basic runtime platform, e.g. Apache Felix, but as well others.</p> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_distributed_remote_configuration_support">4. Distributed/Remote Configuration Support</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_configuration_distribution_policies">4.1. Configuration Distribution Policies</h3> 
-   <div class="paragraph"> 
-    <p>Different configuration distribution policies should be defined any implemented, e.g. distributed cache, restful services, web services, EJB/RMI calls, asynchronous queues, publish/subsribe models, …​</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_preferences_support">4.2. Preferences Support</h3> 
-   <div class="paragraph"> 
-    <p>Write a PreferencesFactory for java.util.preferences.</p> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_third_party_integration">5. Third Party Integration</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_integration_with_deltaspike_config">5.1. Integration with Deltaspike Config</h3> 
-   <div class="paragraph"> 
-    <p>Integration with Deltaspike Config should be implemented and discussed with Deltaspike guys.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_integration_with_spring">5.2. Integration with Spring</h3> 
-   <div class="paragraph"> 
-    <p>A {name} module should be created that allows Spring to be used either as client or configuration provider.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_integration_with_jetty">5.3. Integration with Jetty</h3> 
-   <div class="paragraph"> 
-    <p>A {name} module should be created that allows a Jetty instance to be deployed and started that is (completely) configured based on configuration server.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_integration_with_tomcat">5.4. Integration with Tomcat</h3> 
-   <div class="paragraph"> 
-    <p>A {name} module should be created that allows a Tomcat instance to be deployed and started that is (completely) configured based on configuration server.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_configuration_of_java_ee">5.5. Configuration of Java EE</h3> 
-   <div class="paragraph"> 
-    <p>In the Java EE area there would be several options:</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_configuration_of_application_servers_administrative_resources">5.6. Configuration of Application Servers (administrative resources)</h3> 
-   <div class="paragraph"> 
-    <p>It should be possible to start a application server instance remotely and configure all administrative resources and the deployments based on the configuration service, server to be considered maybe</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>Wildfly</p> </li> 
-     <li> <p>IBM</p> </li> 
-     <li> <p>Weblogic</p> </li> 
-     <li> <p>Glassfish</p> </li> 
-     <li> <p>Apache Geronimo</p> </li> 
-    </ul> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_configuration_of_bean_validation">5.6.1. Configuration of Bean Validation</h4> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>Add configurable validators.</p> </li> 
-      <li> <p>Configure bean validation based on configuration</p> </li> 
-      <li> <p>…​</p> </li> 
-     </ul> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_jndi_support">5.7. JNDI Support</h3> 
-   <div class="paragraph"> 
-    <p>Write a JCA adapter to provide configuration data through JNDI.</p> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_configure_jsf">5.7.1. Configure JSF</h4> 
-    <div class="paragraph"> 
-     <p>Use the JSF XML Document event to completely configure JSF.</p> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_configure_web_services">5.7.2. Configure Web Services</h4> 
-    <div class="paragraph"> 
-     <p>Provide a WebServiceProviderFactory that may be configured.</p> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_configure_jpa">5.7.3. Configure JPA</h4> 
-    <div class="paragraph"> 
-     <p>Provide an implementation that allows configuration of persistence units. Talk with JPA EG people to see if we can get an SPI to hook in a stadardized way.</p> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_configure_ejbs">5.7.4. Configure EJBs</h4> 
-    <div class="paragraph"> 
-     <p>Provide an implementation that allows configuration of EJBs and MDBs:</p> 
-    </div> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>Register beans</p> </li> 
-      <li> <p>Unregister/disable beans</p> </li> 
-      <li> <p>Intercept beans</p> </li> 
-      <li> <p>Support Configuration Injection (in the worst case using a standard Interceptor, provide supporting artifacts to help developers to achive this easily).</p> </li> 
-      <li> <p>Talk with EE8 Umbrella EG (Bill Shanon, Linda DeMichels) on a feasible SPI for EE8, if possible join the EG.</p> </li> 
-     </ul> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_configure">5.7.5. Configure …​</h4> 
-    <div class="paragraph"> 
-     <p>Just think of any Java EE aspects that might be worth to be configured. If it can be done, e.g. by managing CDI managed resources, it might be easy. For others it is a good idea to discuss things with our matter of experts…​</p> 
-    </div> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_special_goodies">6. Special Goodies</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_maintenance_mode_servlet_filter">6.1. Maintenance Mode Servlet Filter</h3> 
-   <div class="paragraph"> 
-    <p>Provide a servlet filter that is capable of switching to maintenance mode, based on configuration. Similarly also a forwarding servlet could be useful, wehere only request based on configuration are forwarded, other might be rejected or dropped as configured.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_dynamic_camel_routes">6.2. Dynamic Camel Routes</h3> 
-   <div class="paragraph"> 
-    <p>Provides dynamic (configurable) Camel routes, e.g. usable within ServiceMix or standalone.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_dynamic_cxf">6.3. Dynamic CXF</h3> 
-   <div class="paragraph"> 
-    <p>Provides dynamic (configurable) CXF adapters, e.g. usable within ServiceMix or standalone.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_configurable_apache_mq">6.4. Configurable Apache MQ</h3> 
-   <div class="paragraph"> 
-    <p>Provides an implementation for configuring Apache MQ.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_dynamic">6.5. Dynamic …​</h3> 
-   <div class="paragraph"> 
-    <p>Interested to see what other ideas are around. Let us know!</p> 
-   </div> 
-  </div> 
- </div> 
+Something=none</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The current MetaInfo class could be adapted, so it is reading data from the underlying configuration/provider,
+instead of its own datastructure. This would make a later mapping of configuration and its metadata into DB table, JSON
+etc, much more easier.
+The providers on the other side may suppress any metadata from ordinary output, such
+as toString(), Similarly accessing metadata using the official config API (get, getOrDefault, getAreas etc)
+should be disabled. The MetaInfoBuilder must probably as well adapted or redesigned.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_management_client">3.2. Management Client</h3>
+<div class="paragraph">
+<p>A nice web-based client to manage configuration data would be nice as well. This also includes a UI for creating new
+configurations.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_mapping_configuration_to_a_database">3.3. Mapping Configuration to a Database</h3>
+<div class="paragraph">
+<p>A flexible mechanism should be implemented that allows the use of databases (SQL/JPA as well as non-SQL) for
+storing/retreiving/managing configuration:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>JPA, Hibernate</p>
+</li>
+<li>
+<p>MongoDB</p>
+</li>
+<li>
+<p>&#8230;&#8203;</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_integration_with_jigsaw">3.4. Integration with Jigsaw</h3>
+<div class="paragraph">
+<p>Once Jigsaw is mature and in a usable (still early) stage, examples are to be created and tested, where OSGI is used as
+the basic runtime platform, e.g. Apache Felix, but as well others.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_distributedremote_configuration_support">4. Distributed/Remote Configuration Support</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_configuration_distribution_policies">4.1. Configuration Distribution Policies</h3>
+<div class="paragraph">
+<p>Different configuration distribution policies should be defined any implemented, e.g. distributed cache, restful services,
+web services, EJB/RMI calls, asynchronous queues, publish/subsribe models, &#8230;&#8203;</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_preferences_support">4.2. Preferences Support</h3>
+<div class="paragraph">
+<p>Write a PreferencesFactory for java.util.preferences.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_third_party_integration">5. Third Party Integration</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_integration_with_deltaspike_config">5.1. Integration with Deltaspike Config</h3>
+<div class="paragraph">
+<p>Integration with Deltaspike Config should be implemented and discussed with Deltaspike guys.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_integration_with_spring">5.2. Integration with Spring</h3>
+<div class="paragraph">
+<p>A {name} module should be created that allows Spring to be used either as client or configuration provider.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_integration_with_jetty">5.3. Integration with Jetty</h3>
+<div class="paragraph">
+<p>A {name} module should be created that allows a Jetty instance to be deployed and started that is (completely)
+configured based on configuration server.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_integration_with_tomcat">5.4. Integration with Tomcat</h3>
+<div class="paragraph">
+<p>A {name} module should be created that allows a Tomcat instance to be deployed and started that is (completely)
+configured based on configuration server.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_configuration_of_java_ee">5.5. Configuration of Java EE</h3>
+<div class="paragraph">
+<p>In the Java EE area there would be several options:</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_configuration_of_application_servers_administrative_resources">5.6. Configuration of Application Servers (administrative resources)</h3>
+<div class="paragraph">
+<p>It should be possible to start a application server instance remotely and configure all administrative resources and the
+deployments based on the configuration service, server to be considered maybe</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Wildfly</p>
+</li>
+<li>
+<p>IBM</p>
+</li>
+<li>
+<p>Weblogic</p>
+</li>
+<li>
+<p>Glassfish</p>
+</li>
+<li>
+<p>Apache Geronimo</p>
+</li>
+</ul>
+</div>
+<div class="sect3">
+<h4 id="_configuration_of_bean_validation">5.6.1. Configuration of Bean Validation</h4>
+<div class="ulist">
+<ul>
+<li>
+<p>Add configurable validators.</p>
+</li>
+<li>
+<p>Configure bean validation based on configuration</p>
+</li>
+<li>
+<p>&#8230;&#8203;</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_jndi_support">5.7. JNDI Support</h3>
+<div class="paragraph">
+<p>Write a JCA adapter to provide configuration data through JNDI.</p>
+</div>
+<div class="sect3">
+<h4 id="_configure_jsf">5.7.1. Configure JSF</h4>
+<div class="paragraph">
+<p>Use the JSF XML Document event to completely configure JSF.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_configure_web_services">5.7.2. Configure Web Services</h4>
+<div class="paragraph">
+<p>Provide a WebServiceProviderFactory that may be configured.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_configure_jpa">5.7.3. Configure JPA</h4>
+<div class="paragraph">
+<p>Provide an implementation that allows configuration of persistence units. Talk with JPA EG people to see if we can
+get an SPI to hook in a stadardized way.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_configure_ejbs">5.7.4. Configure EJBs</h4>
+<div class="paragraph">
+<p>Provide an implementation that allows configuration of EJBs and MDBs:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Register beans</p>
+</li>
+<li>
+<p>Unregister/disable beans</p>
+</li>
+<li>
+<p>Intercept beans</p>
+</li>
+<li>
+<p>Support Configuration Injection (in the worst case using a standard Interceptor, provide supporting artifacts to
+help developers to achive this easily).</p>
+</li>
+<li>
+<p>Talk with EE8 Umbrella EG (Bill Shanon, Linda DeMichels) on a feasible SPI for EE8, if possible join the EG.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_configure">5.7.5. Configure &#8230;&#8203;</h4>
+<div class="paragraph">
+<p>Just think of any Java EE aspects that might be worth to be configured. If it can be done, e.g. by managing CDI managed
+resources, it might be easy. For others it is a good idea to discuss things with our matter of experts&#8230;&#8203;</p>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_special_goodies">6. Special Goodies</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_maintenance_mode_servlet_filter">6.1. Maintenance Mode Servlet Filter</h3>
+<div class="paragraph">
+<p>Provide a servlet filter that is capable of switching to maintenance mode, based on configuration. Similarly also a forwarding
+servlet could be useful, wehere only request based on configuration are forwarded, other might be rejected or dropped
+as configured.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_dynamic_camel_routes">6.2. Dynamic Camel Routes</h3>
+<div class="paragraph">
+<p>Provides dynamic (configurable) Camel routes, e.g. usable within ServiceMix or standalone.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_dynamic_cxf">6.3. Dynamic CXF</h3>
+<div class="paragraph">
+<p>Provides dynamic (configurable) CXF adapters, e.g. usable within ServiceMix or standalone.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_configurable_apache_mq">6.4. Configurable Apache MQ</h3>
+<div class="paragraph">
+<p>Provides an implementation for configuring Apache MQ.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_dynamic">6.5. Dynamic &#8230;&#8203;</h3>
+<div class="paragraph">
+<p>Interested to see what other ideas are around. Let us know!</p>
+</div>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -409,9 +474,9 @@ Something=none</code></pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/development/source.html b/development/source.html
index ca6377d..a7d4154 100644
--- a/development/source.html
+++ b/development/source.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../sitemap.xml">Sitemap</a></li>
-						<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="../sitemap.xml">Sitemap</a></li>
+			<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,95 +128,129 @@
 				<h1>Apache Tamaya: Source code repositories</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-19</em></p>
 
-			<p><div id="preamble"> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Apart from the ASF source code repositories we do provide read-only mirrors at GitHub. In case you want to contribute file an issue in our <a href="https://issues.apache.org/jira/browse/TAMAYA">bugtracker</a>. At the moment we cannot integrate any GitHub pull requests directly.</p> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_contributions">1. Contributions</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>If you would like to contribute to Apache Tamaya please also refer also to our <a href="../devguide.html#contributing-workflow">section on contributing to Apache Tamaya</a>.</p> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_repository_locations">2. Repository locations</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_apache_tamaya">2.1. Apache Tamaya</h3> 
-   <div class="paragraph"> 
-    <p>The repository locations are:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p><a href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git" class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git</a> (read-only)</p> </li> 
-     <li> <p><a href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git" class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git</a></p> </li> 
-     <li> <p><a href="https://github.com/apache/incubator-tamaya" target="_blank" rel="noopener">https://github.com/apache/incubator-tamaya</a> GitHub read-only mirror</p> </li> 
-     <li> <p>Current build status is <span class="image"><img src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Master-branch&amp;style=plastic" alt="icon?job=Tamaya Master branch&amp;style=plastic"></span> - <a href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Master-branch" target="_blank" rel="noopener">Jenkins</a></p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The GitHub mirror also provides the project as a downloadable zip archive.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_apache_tamaya_extensions">2.2. Apache Tamaya Extensions</h3> 
-   <div class="paragraph"> 
-    <p>The repository locations are:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p><a href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git" class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git</a> (read-only)</p> </li> 
-     <li> <p><a href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git" class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions.git</a></p> </li> 
-     <li> <p><a href="https://github.com/apache/incubator-tamaya-extensions" target="_blank" rel="noopener">https://github.com/apache/incubator-tamaya-extensions</a> GitHub read-only mirror</p> </li> 
-     <li> <p>Current build status is <span class="image"><img src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Extensions-Master&amp;style=plastic" alt="icon?job=Tamaya Extensions Master&amp;style=plastic"></span> - <a href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Extensions-Master" target="_blank" rel="noopener">Jenkins</a></p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The GitHub mirror also provides the project as a downloadable zip archive.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_apache_tamaya_sandbox">2.3. Apache Tamaya Sandbox</h3> 
-   <div class="paragraph"> 
-    <p>The repository locations are:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p><a href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git" class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git</a> (read-only)</p> </li> 
-     <li> <p><a href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git" class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox.git</a></p> </li> 
-     <li> <p><a href="https://github.com/apache/incubator-tamaya-sandbox" target="_blank" rel="noopener">https://github.com/apache/incubator-tamaya-sandbox</a> GitHub read-only mirror</p> </li> 
-     <li> <p>Current build status is <span class="image"><img src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Sandbox-Master&amp;style=plastic" alt="icon?job=Tamaya Sandbox Master&amp;style=plastic"></span> - <a href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Sandbox-Master" target="_blank" rel="noopener">Jenkins</a></p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The GitHub mirror also provides the project as a downloadable zip archive.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_apache_tamaya_website">2.4. Apache Tamaya Website</h3> 
-   <div class="paragraph"> 
-    <p>The website is build with <a href="http://jbake.org/" target="_blank" rel="noopener">jBake</a>. Its contents is located in the master branch of:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p><a href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git" class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git</a> (read-only)</p> </li> 
-     <li> <p><a href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git" class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya-site.git</a></p> </li> 
-     <li> <p><a href="https://github.com/apache/incubator-tamaya-site" target="_blank" rel="noopener">https://github.com/apache/incubator-tamaya-site</a> GitHub read-only mirror</p> </li> 
-     <li> <p>Current build status is <span class="image"><img src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Site-jBake-Master&amp;style=plastic" alt="icon?job=Tamaya Site jBake Master&amp;style=plastic"></span> - <a href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Site-jBake-Master" target="_blank" rel="noopener">Jenkins</a></p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The generated page is in the asf-site branch of above project.</p> 
-   </div> 
-  </div> 
- </div> 
+			<p><div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>Apart from the ASF source code repositories we do provide read-only mirrors at GitHub.
+In case you want to contribute file an issue in our <a href="https://issues.apache.org/jira/browse/TAMAYA">bugtracker</a>. At the moment we cannot integrate any GitHub pull requests directly.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_contributions">1. Contributions</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>If you would like to contribute to Apache Tamaya please also refer also to our
+<a href="../devguide.html#contributing-workflow">section on contributing to Apache Tamaya</a>.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_repository_locations">2. Repository locations</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_apache_tamaya">2.1. Apache Tamaya</h3>
+<div class="paragraph">
+<p>The repository locations are:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://gitbox.apache.org/repos/asf/incubator-tamaya.git" class="bare">http://gitbox.apache.org/repos/asf/incubator-tamaya.git</a> (read-only)</p>
+</li>
+<li>
+<p><a href="https://gitbox.apache.org/repos/asf/incubator-tamaya.git" class="bare">https://gitbox.apache.org/repos/asf/incubator-tamaya.git</a></p>
+</li>
+<li>
+<p><a href="https://github.com/apache/incubator-tamaya" target="_blank" rel="noopener">https://github.com/apache/incubator-tamaya</a> GitHub mirror</p>
+</li>
+<li>
+<p>Current build status is <span class="image"><img src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Master-branch&amp;style=plastic" alt="icon?job=Tamaya Master branch&amp;style=plastic"></span> - <a href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Master-branch" target="_blank" rel="noopener">Jenkins</a></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The GitHub mirror also provides the project as a downloadable zip archive.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_apache_tamaya_extensions">2.2. Apache Tamaya Extensions</h3>
+<div class="paragraph">
+<p>The repository locations are:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git" class="bare">http://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git</a> (read-only)</p>
+</li>
+<li>
+<p><a href="https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git" class="bare">https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git</a></p>
+</li>
+<li>
+<p><a href="https://github.com/apache/incubator-tamaya-extensions" target="_blank" rel="noopener">https://github.com/apache/incubator-tamaya-extensions</a> GitHub mirror</p>
+</li>
+<li>
+<p>Current build status is <span class="image"><img src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Extensions-Master&amp;style=plastic" alt="icon?job=Tamaya Extensions Master&amp;style=plastic"></span> - <a href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Extensions-Master" target="_blank" rel="noopener">Jenkins</a></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The GitHub mirror also provides the project as a downloadable zip archive.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_apache_tamaya_sandbox">2.3. Apache Tamaya Sandbox</h3>
+<div class="paragraph">
+<p>The repository locations are:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://gitbox.apache.org/repos/asf/incubator-tamaya-sandbox.git" class="bare">http://gitbox.apache.org/repos/asf/incubator-tamaya-sandbox.git</a> (read-only)</p>
+</li>
+<li>
+<p><a href="https://gitbox.apache.org/repos/asf/incubator-tamaya-sandbox.git" class="bare">https://gitbox.apache.org/repos/asf/incubator-tamaya-sandbox.git</a></p>
+</li>
+<li>
+<p><a href="https://github.com/apache/incubator-tamaya-sandbox" target="_blank" rel="noopener">https://github.com/apache/incubator-tamaya-sandbox</a> GitHub mirror</p>
+</li>
+<li>
+<p>Current build status is <span class="image"><img src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Sandbox-Master&amp;style=plastic" alt="icon?job=Tamaya Sandbox Master&amp;style=plastic"></span> - <a href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Sandbox-Master" target="_blank" rel="noopener">Jenkins</a></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The GitHub mirror also provides the project as a downloadable zip archive.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_apache_tamaya_website">2.4. Apache Tamaya Website</h3>
+<div class="paragraph">
+<p>The website is build with <a href="http://jbake.org/" target="_blank" rel="noopener">jBake</a>. Its contents is located in the master branch of:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://gitbox.apache.org/repos/asf/incubator-tamaya-site.git" class="bare">http://gitbox.apache.org/repos/asf/incubator-tamaya-site.git</a> (read-only)</p>
+</li>
+<li>
+<p><a href="https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git" class="bare">https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git</a></p>
+</li>
+<li>
+<p><a href="https://github.com/apache/incubator-tamaya-site" target="_blank" rel="noopener">https://github.com/apache/incubator-tamaya-site</a> GitHub mirror</p>
+</li>
+<li>
+<p>Current build status is <span class="image"><img src="https://builds.apache.org/buildStatus/icon?job=Tamaya-Site-jBake-Master&amp;style=plastic" alt="icon?job=Tamaya Site jBake Master&amp;style=plastic"></span> - <a href="https://builds.apache.org/view/S-Z/view/Tamaya/job/Tamaya-Site-jBake-Master" target="_blank" rel="noopener">Jenkins</a></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The generated page is in the asf-site branch of above project.</p>
+</div>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -224,9 +261,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/development/team.html b/development/team.html
index 2e857c1..3a2ed59 100644
--- a/development/team.html
+++ b/development/team.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../sitemap.xml">Sitemap</a></li>
-						<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="../sitemap.xml">Sitemap</a></li>
+			<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,176 +128,170 @@
 				<h1>Apache Tamaya: Project Team</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div id="preamble"> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p> 
-  </div> 
-  <div class="paragraph"> 
-   <p>The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.</p> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_members">Members</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.</p> 
-  </div> 
-  <table class="tableblock frame-topbot grid-all" style="width: 60%;"> 
-   <caption class="title">
-    Table 1. Members
-   </caption> 
-   <colgroup> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-   </colgroup> 
-   <thead> 
-    <tr> 
-     <th class="tableblock halign-left valign-top">Id</th> 
-     <th class="tableblock halign-left valign-top">Name</th> 
-     <th class="tableblock halign-left valign-top">E-Mail</th> 
-     <th class="tableblock halign-left valign-top">Role(s)</th> 
-     <th class="tableblock halign-left valign-top">Time Zone</th> 
-    </tr> 
-   </thead> 
-   <tbody> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">anatole</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Anatole Tresch</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">anatole[at]apache.org</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td> 
-    </tr> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">johndament</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">John D. Ament</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">johndament[at]apache.org</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">-5</p></td> 
-    </tr> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">plexus</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Oliver B. Fischer</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">plexus[at]apache.org</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td> 
-    </tr> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">pottlinger</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Phil Ottlinger</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">pottlinger[at]apache.org</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td> 
-    </tr> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">wkeil</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Werner Keil</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">wkeil[at]apache.org</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td> 
-    </tr> 
-   </tbody> 
-  </table> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_contributors">Contributors</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>The following people are active contributors:</p> 
-  </div> 
-  <table class="tableblock frame-topbot grid-all" style="width: 60%;"> 
-   <caption class="title">
-    Table 2. Contributors
-   </caption> 
-   <colgroup> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-   </colgroup> 
-   <thead> 
-    <tr> 
-     <th class="tableblock halign-left valign-top">Id</th> 
-     <th class="tableblock halign-left valign-top">Name</th> 
-     <th class="tableblock halign-left valign-top">E-Mail</th> 
-     <th class="tableblock halign-left valign-top">Role(s)</th> 
-     <th class="tableblock halign-left valign-top">Time Zone</th> 
-    </tr> 
-   </thead> 
-   <tbody> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">yourname</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">can be here :-)</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">you[at]example.org</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Contributor</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td> 
-    </tr> 
-   </tbody> 
-  </table> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_emeritus">Emeritus</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>These people used to help with the development of the project but are not active anymore:</p> 
-  </div> 
-  <table class="tableblock frame-topbot grid-all" style="width: 60%;"> 
-   <caption class="title">
-    Table 3. Members (alphabetically ordered)
-   </caption> 
-   <colgroup> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-    <col style="width: 20%;"> 
-   </colgroup> 
-   <thead> 
-    <tr> 
-     <th class="tableblock halign-left valign-top">Id</th> 
-     <th class="tableblock halign-left valign-top">Name</th> 
-     <th class="tableblock halign-left valign-top">E-Mail</th> 
-     <th class="tableblock halign-left valign-top">Role(s)</th> 
-     <th class="tableblock halign-left valign-top">Time Zone</th> 
-    </tr> 
-   </thead> 
-   <tbody> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">gpetracek</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Gerhard Petracek</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">gpetracek[at]apache.org</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td> 
-    </tr> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">struberg</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Mark Struberg</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">struberg[at]apache.org</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td> 
-    </tr> 
-    <tr> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">rmannibucau</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">Romain Manni-Bucau</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">rmannibucau[at]apache.org</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td> 
-     <td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td> 
-    </tr> 
-   </tbody> 
-  </table> 
-  <div class="paragraph"> 
-   <p>Thanks for all your help!</p> 
-  </div> 
- </div> 
+			<p><div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p>
+</div>
+<div class="paragraph">
+<p>The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_members">Members</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.</p>
+</div>
+<table class="tableblock frame-topbot grid-all" style="width: 60%;">
+<caption class="title">Table 1. Members</caption>
+<colgroup>
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Id</th>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">E-Mail</th>
+<th class="tableblock halign-left valign-top">Role(s)</th>
+<th class="tableblock halign-left valign-top">Time Zone</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">anatole</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Anatole Tresch</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">anatole[at]apache.org</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">johndament</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">John D. Ament</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">johndament[at]apache.org</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">-5</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">plexus</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Oliver B. Fischer</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">plexus[at]apache.org</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">pottlinger</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Phil Ottlinger</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">pottlinger[at]apache.org</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">wkeil</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Werner Keil</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">wkeil[at]apache.org</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_contributors">Contributors</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The following people are active contributors:</p>
+</div>
+<table class="tableblock frame-topbot grid-all" style="width: 60%;">
+<caption class="title">Table 2. Contributors</caption>
+<colgroup>
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Id</th>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">E-Mail</th>
+<th class="tableblock halign-left valign-top">Role(s)</th>
+<th class="tableblock halign-left valign-top">Time Zone</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">yourname</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">can be here :-)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">you[at]example.org</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Contributor</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_emeritus">Emeritus</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>These people used to help with the development of the project but are not active anymore:</p>
+</div>
+<table class="tableblock frame-topbot grid-all" style="width: 60%;">
+<caption class="title">Table 3. Members (alphabetically ordered)</caption>
+<colgroup>
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Id</th>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">E-Mail</th>
+<th class="tableblock halign-left valign-top">Role(s)</th>
+<th class="tableblock halign-left valign-top">Time Zone</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">gpetracek</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Gerhard Petracek</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">gpetracek[at]apache.org</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">struberg</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Mark Struberg</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">struberg[at]apache.org</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">rmannibucau</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Romain Manni-Bucau</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">rmannibucau[at]apache.org</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
+</tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>Thanks for all your help!</p>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -305,9 +302,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/devguide.html b/devguide.html
index 892b54e..2fc11c1 100644
--- a/devguide.html
+++ b/devguide.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="sitemap.xml">Sitemap</a></li>
-						<li><a href="feed.xml">Subscribe</a></li>
+			<li><a href="sitemap.xml">Sitemap</a></li>
+			<li><a href="feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,219 +128,250 @@
 				<h1>Apache Tamaya: Development Guide</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-19</em></p>
 
-			<p><div class="sect1"> 
- <h2 id="_suggested_git_workflows">1. Suggested Git Workflows</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_avoid_git_pull">1.1. Avoid git pull!</h3> 
-   <div class="paragraph"> 
-    <p><code>git pull</code> should never get invoked if you have dirty files lying around or if your branch is ahead of master. This will always lead to some dirty artifacts in the commit history:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>Merge branch 'master' of http://git-wip-us.apache.org/tamaya into master</pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_use_git_pull_rebase">1.2. Use git pull --rebase</h3> 
-   <div class="paragraph"> 
-    <p>An easy version for getting rid of the auto-merges is using</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git pull --rebase</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Please note that this sometimes trashes your working tree if there are unmergeable files around. Cleaning this up with a forced manual rebase is not something we would recommend for a git beginner.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_working_in_an_own_branch">1.3. Working in an own branch</h3> 
-   <div class="paragraph"> 
-    <p>This is actually the suggested way to prevent auto-merges. Create an own branch where you do your feature work. Either do all your work in one branch or create one branch per feature you are working on.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git branch mybranch</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>After you finished your feature, first add (<code>git add</code>) and commit (<code>git commit</code>) your work. Check with <code>git status</code> that you don’t have any dirty files and uncommitted changes around. You can use <code>git stash</code> to 'backup' unfinished work.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Then switch back to the master branch and pull changes done by other committers in the meantime.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git checkout master
-$ git pull --rebase</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>You should now get all the changes done by other committers and the will get applied to your local master branch. Now go back to your private branch and rebase your locally performed work to the HEAD of master.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git checkout mybranch
-$ git rebase master</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>If you got conflicts, you will get lines with "&gt;&gt;&gt;&gt;" added to those files. Resolve those conflicts manually, add them and finish the rebase.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Check with <code>git-status</code> and <code>gitk</code> if the merge went well and the history now contains your changes. If all is well, go back to the master branch and merge your changes in.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git pull --rebase     // (just for safety, you should see no changes)
+			<p><div class="sect1">
+<h2 id="_suggested_git_workflows">1. Suggested Git Workflows</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_avoid_git_pull">1.1. Avoid git pull!</h3>
+<div class="paragraph">
+<p><code>git pull</code> should never get invoked if you have dirty files lying around
+or if your branch is ahead of master. This will always lead to
+some dirty artifacts in the commit history:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>Merge branch 'master' of http://gitbox.apache.org/tamaya into master</pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_use_git_pull_rebase">1.2. Use git pull --rebase</h3>
+<div class="paragraph">
+<p>An easy version for getting rid of the auto-merges is using</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git pull --rebase</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Please note that this sometimes trashes your working tree if there
+are unmergeable files around. Cleaning this up with a forced manual
+rebase is not something we would recommend for a git beginner.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_working_in_an_own_branch">1.3. Working in an own branch</h3>
+<div class="paragraph">
+<p>This is actually the suggested way to prevent auto-merges. Create an own
+branch where you do your feature work. Either do all your work in one
+branch or create one branch per feature you are working on.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git branch mybranch</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>After you finished your feature, first add (<code>git add</code>) and commit (<code>git commit</code>) your work.
+Check with <code>git status</code> that you don&#8217;t have any dirty files and uncommitted
+changes around. You can use <code>git stash</code> to 'backup' unfinished work.</p>
+</div>
+<div class="paragraph">
+<p>Then switch back to the master branch and pull changes
+done by other committers in the meantime.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout master
+$ git pull --rebase</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>You should now get all the changes done by other committers and
+the will get applied to your local master branch. Now go back to
+your private branch and rebase your locally performed work to the HEAD of master.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout mybranch
+$ git rebase master</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If you got conflicts, you will get lines with "&gt;&gt;&gt;&gt;" added to those
+files. Resolve those conflicts manually, add them and finish the rebase.</p>
+</div>
+<div class="paragraph">
+<p>Check with <code>git-status</code> and <code>gitk</code> if the merge went well and the history now contains your changes.
+If all is well, go back to the master branch and merge your changes in.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git pull --rebase     // (just for safety, you should see no changes)
 $ git checkout master
-$ git merge mybranch</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Finally you can push your changes to the ASF git repo</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git push</pre> 
-    </div> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="contributing-workflow">2. Contribution workflow</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_creating_patches">2.1. Creating patches</h3> 
-   <div class="paragraph"> 
-    <p>You should use the following workflow, if you plan to contribute patches or new features to Tamaya.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>First update you local copy of the repository:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git checkout master
-$ git pull --rebase</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Then create a new local branch for your work. It’s good practice to name it after the corresponding JIRA issue.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git checkout -b TAMAYA-XXX</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Now you can start to work on your patch. When you are finished, commit your changes. But don’t forget to <strong>add the name of the JIRA issue to the commit message</strong>.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git add -am "TAMAYA-XXX: Fixed some issue"</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>For small patches we recommend to do a single commit containing your changes. For larger contributions you should try to group your work into separate sub-tasks that you can commit one by one.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Before you create your patch you should make sure that your local repository is up to date with the master repository. This is very important especially if you work on your branch for a long time. Use the following commands to pull the latest changes from the upstream repository and rebase your branch against the current master.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git checkout master
+$ git merge mybranch</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Finally you can push your changes to the ASF git repo</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git push</pre>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="contributing-workflow">2. Contribution workflow</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_creating_patches">2.1. Creating patches</h3>
+<div class="paragraph">
+<p>You should use the following workflow, if you plan to contribute
+patches or new features to Tamaya.</p>
+</div>
+<div class="paragraph">
+<p>First update you local copy of the repository:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout master
+$ git pull --rebase</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Then create a new local branch for your work. It&#8217;s good practice to name
+it after the corresponding JIRA issue.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout -b TAMAYA-XXX</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now you can start to work on your patch. When you are finished, commit your changes. But don&#8217;t forget to <strong>add the name
+of the JIRA issue to the commit message</strong>.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git add -am "TAMAYA-XXX: Fixed some issue"</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>For small patches we recommend to do a single commit containing your changes. For larger contributions you should try
+to group your work into separate sub-tasks that you can commit one by one.</p>
+</div>
+<div class="paragraph">
+<p>Before you create your patch you should make sure that your local repository is up to date with the master repository.
+This is very important especially if you work on your branch for a long time. Use the following commands to pull the
+latest changes from the upstream repository and rebase your branch against the current master.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout master
 $ git pull --rebase
 $ git checkout TAMAYA-XXX
-$ git rebase master</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Now you are ready to create your patch:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git checkout TAMAYA-XXX
-$ git format-patch --stdout master &gt; ../TAMAYA-XXX.patch</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Please attach the resulting patch file to the correspoding JIRA issue.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_applying_patches">2.2. Applying patches</h3> 
-   <div class="paragraph"> 
-    <p>If you are a committer and want to apply a patch you should do so in a separate branch.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git checkout -b TAMAYA-XXX</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Then apply the patch using <code>git am</code> and rebase it against the master branch.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git am &lt; ../TAMAYA-XXX.patch
-$ git rebase master</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>After reviewing the changes and testing the code, the changes are ready to be merged into the master branch:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git checkout master
+$ git rebase master</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now you are ready to create your patch:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout TAMAYA-XXX
+$ git format-patch --stdout master &gt; ../TAMAYA-XXX.patch</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Please attach the resulting patch file to the correspoding JIRA issue.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_applying_patches">2.2. Applying patches</h3>
+<div class="paragraph">
+<p>If you are a committer and want to apply a patch you should do so in a separate branch.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout -b TAMAYA-XXX</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Then apply the patch using <code>git am</code> and rebase it against the master branch.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git am &lt; ../TAMAYA-XXX.patch
+$ git rebase master</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>After reviewing the changes and testing the code, the changes are ready to
+be merged into the master branch:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout master
 $ git merge TAMAYA-XXX
-$ git branch -d TAMAYA-XXX</pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_discussion_workflow_optional">2.3. Discussion workflow (optional)</h3> 
-   <div class="paragraph"> 
-    <p>All discussions which lead to a decision take place on the mailing list. Sometimes it’s required to show-case an idea esp. if the solution is more than few lines. As shown above it makes sense to use local branches for developing new parts. Git allows to push such local branches to a public repository. So it’s easier to share it with the community for discussing it. The following listings show an example in combination with GitHub - for sure it works with any hosting platform like [...]
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_initial_setup">2.4. Initial setup</h3> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git clone https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git
+$ git branch -d TAMAYA-XXX</pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_discussion_workflow_optional">2.3. Discussion workflow (optional)</h3>
+<div class="paragraph">
+<p>All discussions which lead to a decision take place on the mailing list.
+Sometimes it&#8217;s required to show-case an idea esp. if the solution is
+more than few lines. As shown above it makes sense to use local branches
+for developing new parts. Git allows to push such local branches to a
+public repository. So it&#8217;s easier to share it with the community
+for discussing it. The following listings show an example in combination
+with GitHub - for sure it works with any hosting platform like BitBucket,
+Google-Code,&#8230;&#8203; The only important part here is that such branches
+<strong>NEVER</strong> get pushed to the main Apache repository to keep the commit history
+as clean as possible.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_initial_setup">2.4. Initial setup</h3>
+<div class="listingblock">
+<div class="content">
+<pre>$ git clone https://gitbox.apache.org/repos/asf/incubator-tamaya.git
 $ git remote add discuss https://[username]@github.com/[username]/[repo-name].git
-$ git push -u discuss master</pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_branches_for_discussions">2.5. Branches for discussions</h3> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git checkout -b TAMAYA-XXX # 1-n commits
-$ git push discuss TAMAYA-XXX # share the link to the branch for the discussions</pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p><strong>If the community agrees on the suggested change, the implementation will be applied to the origin master. A committer has to follow the steps described above for the basic workflow to keep the commit history simple, clean and straight. A contributor has to follow the steps described above for creating a patch.</strong></p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_delete_the_branch_again">2.6. Delete the branch again</h3> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>$ git push discuss :TAMAYA-XXX
-$ git branch -d TAMAYA-XXX</pre> 
-    </div> 
-   </div> 
-  </div> 
- </div> 
+$ git push -u discuss master</pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_branches_for_discussions">2.5. Branches for discussions</h3>
+<div class="listingblock">
+<div class="content">
+<pre>$ git checkout -b TAMAYA-XXX # 1-n commits
+$ git push discuss TAMAYA-XXX # share the link to the branch for the discussions</pre>
+</div>
+</div>
+<div class="paragraph">
+<p><strong>If the community agrees on the suggested change, the implementation will be applied to the origin master. A committer
+has to follow the steps described above for the basic workflow to keep the commit history simple, clean and straight.
+A contributor has to follow the steps described above for creating a patch.</strong></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_delete_the_branch_again">2.6. Delete the branch again</h3>
+<div class="listingblock">
+<div class="content">
+<pre>$ git push discuss :TAMAYA-XXX
+$ git branch -d TAMAYA-XXX</pre>
+</div>
+</div>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -348,9 +382,9 @@ $ git branch -d TAMAYA-XXX</pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/documentation/api.html b/documentation/api.html
index 4872bea..b25f9f4 100644
--- a/documentation/api.html
+++ b/documentation/api.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../sitemap.xml">Sitemap</a></li>
-						<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="../sitemap.xml">Sitemap</a></li>
+			<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,179 +128,380 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
-
-			<p><div class="sect1"> 
- <h2 id="CoreDesign">Apache Tamaya: API</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Though Tamaya is a very powerful and flexible solution there are basically only a few simple core concepts required. Everything else uses or extends these basic mechanisms. As a starting point we recommend you read the corresponding <a href="../highleveldesign.html">High Level Design Documentation</a></p> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="API">The Tamaya API</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>The API provides the artifacts as described in the <a href="../highleveldesign.html">High Level Design Documentation</a>, which are:</p> 
-  </div> 
-  <div class="ulist"> 
-   <ul> 
-    <li> <p>The package org.apache.tamaya defines a simple but complete SE <strong>API</strong> for accessing key/value based <em>Configuration</em>:</p> 
-     <div class="ulist"> 
-      <ul> 
-       <li> <p>Configuration hereby models <em>configuration</em>, the main interface of Tamaya. Configuration provides</p> 
-        <div class="ulist"> 
-         <ul> 
-          <li> <p>access to literal key/value pairs.</p> </li> 
-          <li> <p>functional extension points (with, query) using a unary ConfigOperator or a function ConfigurationQuery&lt;T&gt;.</p> </li> 
-         </ul> 
-        </div> </li> 
-       <li> <p>ConfigurationProvider provides with getConfiguration() the static entry point for accessing configuration.</p> </li> 
-       <li> <p>ConfigException defines a runtime exception for usage by the configuration system.</p> </li> 
-       <li> <p>TypeLiteral provides a possibility to type safely define the target type to be returned in case non-String types are accessed.</p> </li> 
-       <li> <p>PropertyConverter, which defines conversion of configuration values (String) into any required target type.</p> </li> 
-      </ul> 
-     </div> </li> 
-    <li> <p>The package org.apache.tamaya.spi provides interfaces used for extending and/or adapting Tamaya’s core functionality, as well as artifacts for creating Configuration instances programmatically:</p> 
-     <div class="ulist"> 
-      <ul> 
-       <li> <p><em>PropertySource:</em> is the the interface to be implemented for adding configuration entries. A PropertySource hereby</p> 
-        <div class="ulist"> 
-         <ul> 
-          <li> <p>is minimalistic and can be implemented in any way. E.g. there is no distiction that the configuration data provided is managed locally, remotedely. There is even no requirement that the configuration data is always fully available. Summarizing a PropertySource</p> </li> 
-          <li> <p>provides property access for single key/value pairs in <em>raw</em> format (meaning no postprocessing is applied yet). A single property hereby is modelled as PropertyValue, which also includes its source and additional arbitrary metadata entries.</p> </li> 
-          <li> <p>can <em>optionally</em> provide access to a Map&lt;String,PropertyValue&gt;, providing all its properties at once.</p> </li> 
-          <li> <p>defines the default ordinal to be used for establishing the order of significance among all auto-discovered property sources.</p> </li> 
-         </ul> 
-        </div> </li> 
-       <li> <p><em>PropertySourceProvider:</em> allows to automatically register multiple property sources, e.g. all config files found in a file system folder..</p> </li> 
-       <li> <p>ConfigurationProviderSpi defines the interface to be implemented by the delegating bean that is implementing the ConfigurationProvider singleton.</p> </li> 
-       <li> <p>PropertyFilter allows filtering of property values prior getting returned to the caller. Filters by default are registered as global filters, filtering <em>raw</em> values. The final String value of a configuration entry is the final value after all registered filters have been applied.</p> </li> 
-       <li> <p>A PropertyValueCombinationPolicy optionally can be registered to change the logic how key/value pairs from subsequent property sources in the property source chain are combined to calculate the final <em>raw</em> value passed over to the filters registered.</p> </li> 
-       <li> <p>A ConfigurationContext is the container of all inner components (PropertySource, PropertyFilter, PropertyValueCombinationPolicy, PropertyConverter) required to implement a Configuration. Also the ordering of the property sources, filters and converters is defined by the context. A ConfigurationContext is automatically created on startup collecting and adding all registered artifacts. Based on this ConfigurationContext the <em>default</em> Configuration is created, which ca [...]
-       <li> <p>Finally Tamaya also supports <em>programmatically</em> creating Configuration instances and using them in your code as needed. This can be achieved most easily by building a custom ConfigurationContext using a ConfigurationContextBuilder. This builder can be obtained calling ConfigurationProvider.getConfigurationContextBuilder();.</p> </li> 
-       <li> <p>Finally ServiceContext and ServiceContextManager provide an abstraction to the underlying runtime environment, allowing different component loading and lifecycle strategies to be used. This is very useful since component (service) loading in Java SE, Java EE, OSGI and other runtime environments may be differ significantly. In most cases even extension programmers will not have to deal with these two artifacts.</p> </li> 
-      </ul> 
-     </div> </li> 
-   </ul> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="APIKeyValues">Key/Value Pairs</h3> 
-   <div class="paragraph"> 
-    <p>Basically configuration is a very generic concept. Therefore it should be modelled in a generic way. The most simple and most commonly used approach are simple literal key/value pairs. So the core building block of {name} are key/value pairs. You can think of a common .properties file, e.g.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     A simple properties file
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">a.b.c=cVal
+			<p><em>2018-12-17</em></p>
+
+			<p><div class="sect1">
+<h2 id="CoreDesign">Apache Tamaya: API</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Though Tamaya is a very powerful and flexible solution there are basically only a few simple core concepts required.
+Everything else uses or extends these basic mechanisms. As a starting point we recommend you read the corresponding
+<a href="../highleveldesign.html">High Level Design Documentation</a></p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="API">The Tamaya API</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The API provides the artifacts as described in the <a href="../highleveldesign.html">High Level Design Documentation</a>, which are:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The package org.apache.tamaya defines a simple but complete SE <strong>API</strong> for accessing <em>Configuration</em>:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Configuration hereby models <em>configuration</em>, the main interface of Tamaya. Configuration provides</p>
+<div class="ulist">
+<ul>
+<li>
+<p>access to literal key/value pairs.</p>
+</li>
+<li>
+<p>functional extension points (with, query) using a unary ConfigOperator or
+a function ConfigurationQuery&lt;T&gt;.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Configuration also provides with current() and current(ClassLoader) static access point for
+obtaining the current configuration.</p>
+</li>
+<li>
+<p>ConfigurationSnapshot declares an immutable configuration instance, which supports consistent property access.</p>
+</li>
+<li>
+<p>ConfigException defines a runtime exception for usage by the configuration system.</p>
+</li>
+<li>
+<p>TypeLiteral provides a possibility to type safely define the target type to be returned in case non-String types
+are accessed. It is especially useful when accessing collections from Tamaya.</p>
+</li>
+<li>
+<p>PropertyConverter, which defines conversion of configuration values (one or multiple Strings) into any
+required target type.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>The package org.apache.tamaya.spi provides interfaces used for extending and/or
+adapting Tamaya&#8217;s core functionality, as well as artifacts for creating
+Configuration instances programmatically:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><em>PropertySource:</em> is the the interface to be implemented for adding configuration entries. A PropertySource hereby</p>
+<div class="ulist">
+<ul>
+<li>
+<p>is minimalistic and can be implemented in any way. E.g. there is no distiction that
+the configuration data provided is managed locally, remotely. There is even no
+requirement that the configuration data is always fully available. Summarizing a
+PropertySource</p>
+</li>
+<li>
+<p>provides property access for property values. A single property value hereby is modelled as PropertyValue,
+which by default contains a single literal value. Nevertheles Tamaya also supports more complex scenarios
+by allowing property values to have children either as array/list type or as named fields. These children
+themselves are recursively also modelled by property values. This makes it possible to map also complex
+structures such as JSON, XML or YAML data. Finally a property value also may contain additional metadata entries.</p>
+</li>
+<li>
+<p>can <em>optionally</em> provide access to a Map&lt;String,PropertyValue&gt;, providing all its properties at once.</p>
+</li>
+<li>
+<p>defines the default ordinal to be used for establishing the order of significance among all
+auto-discovered property sources.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p><em>PropertySourceProvider:</em> allows to automatically register multiple property sources, e.g. all config files found in
+a file system folder..</p>
+</li>
+<li>
+<p>ConfigurationProviderSpi defines the interface to be implemented by the delegating bean that is implementing the
+ConfigurationProvider singleton.</p>
+</li>
+<li>
+<p>PropertyFilter allows filtering of property values prior getting returned to the caller. Filters by default are
+registered as global filters. The final value of a configuration entry is the final value after all registered
+filters have been applied.</p>
+</li>
+<li>
+<p>A ConfigurationContext is the container of all components that make up a configuration (PropertySource,
+PropertyFilter, PropertyConverter, MetadataProvider) required to implement a Configuration. Also the ordering
+of the property sources, filters and converters is defined by the context.
+By default a ConfigurationContext is automatically created on first use for each classloader collecting and
+adding all registered artifacts. Based on a ConfigurationContext a Configuration can be created.
+Summarizing a ConfigurationContext contains the ordered property sources, property filters, converters and combination
+policy used. Once a ConfigurationContext is instanciated a corresponding Configuration instance can be
+created easily using ConfigurationBuilder.</p>
+</li>
+<li>
+<p>Whereas the Tamaya&#8217;s API provides access to automatic configuration resources, it also allows to create
+<em>programmatically</em> Configuration instances. This can be achieved using a
+ConfigurationContextBuilder. This builder can be obtained calling Configuration.createConfigurationBuilder();.</p>
+</li>
+<li>
+<p>Finally ServiceContext and ServiceContextManager provide an abstraction to the underlying runtime environment,
+allowing different component loading and lifecycle strategies to be used. This is very useful since component (service)
+loading in Java SE, Java EE, OSGI and other runtime environments may be differ significantly. In most cases even
+extension programmers will not have to deal with these internals.</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+<div class="sect2">
+<h3 id="APIKeyValues">Key/Value Pairs and More</h3>
+<div class="paragraph">
+<p>Basically configuration is a very generic concept. Therefore it should be modelled in a generic way. The most simple
+and most commonly used approach are simple literal key/value pairs. So the core building block of {name} are key/value
+pairs. You can think of a common .properties file, e.g.</p>
+</div>
+<div class="listingblock">
+<div class="title">A simple properties file</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">a.b.c=cVal
 a.b.c.1=cVal1
 a.b.c.2=cVal2
 a=aVal
 a.b=abVal
-a.b2=abVal</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Now you can use java.util.Properties to read this file and access the corresponding properties, e.g.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">Properties props = new Properties();
+a.b2=abVal</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now you can use java.util.Properties to read this file and access the corresponding properties, e.g.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">Properties props = new Properties();
 props.readProperties(...);
 String val = props.getProperty("a.b.c");
 val = props.getProperty("a.b.c.1");
-...</code></pre> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_why_using_strings_only">Why Using Strings Only</h4> 
-    <div class="paragraph"> 
-     <p>There are good reason to keep of non String-values as core storage representation of configuration. Mostly there are several huge advantages:</p> 
-    </div> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>Strings are simple to understand</p> </li> 
-      <li> <p>Strings are human readable and therefore easy to prove for correctness</p> </li> 
-      <li> <p>Strings can easily be used within different language, different VMs, files or network communications.</p> </li> 
-      <li> <p>Strings can easily be compared and manipulated</p> </li> 
-      <li> <p>Strings can easily be searched, indexed and cached</p> </li> 
-      <li> <p>It is very easy to provide Strings as configuration, which gives much flexibility for providing configuration in production as well in testing.</p> </li> 
-      <li> <p>and more…​</p> </li> 
-     </ul> 
-    </div> 
-    <div class="paragraph"> 
-     <p>On the other side there are also disadvantages:</p> 
-    </div> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>Strings are inherently not type safe, they do not provide validation out of the box for special types, such as numbers, dates etc.</p> </li> 
-      <li> <p>In many cases you want to access configuration in a typesafe way avoiding conversion to the target types explicitly throughout your code.</p> </li> 
-      <li> <p>Strings are neither hierarchical nor multi-valued, so mapping hierarchical and collection structures requires some extra efforts.</p> </li> 
-     </ul> 
-    </div> 
-    <div class="paragraph"> 
-     <p>Nevertheless most of these advantages can be mitigated easily, hereby still keeping all the benefits from above:</p> 
-    </div> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>Adding type safe adapters on top of String allow to add any type easily, that can be directly mapped out of Strings. This includes all common base types such as numbers, dates, time, but also timezones, formatting patterns and more.</p> </li> 
-      <li> <p>Also multi-valued, complex and collection types can be defined as a corresponding PropertyAdapter knows how to parse and create the target instance required.</p> </li> 
-      <li> <p>String s also can be used as references pointing to other locations and formats, where configuration is accessible.</p> </li> 
-     </ul> 
-    </div> 
-    <div class="paragraph"> 
-     <p>[[API Configuration]]</p> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_configuration">Configuration</h3> 
-   <div class="paragraph"> 
-    <p>Configuration is the main artifact provided by Tamaya. It allows reading of single property values or all known properties, but also supports type safe access:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     Interface Configuration
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface Configuration{
+...</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>But we also have more complex configuration mechanism today. For example YAML is widely used format, which also
+supports lists and maps. Basically these can be mapped also as key/value pairs. Unfortunately this is not very
+useful in some cases:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>a configuration client want to access a list of server configurations</p>
+</li>
+<li>
+<p>a configuration client wants to map structures with named fields.</p>
+</li>
+<li>
+<p>both of the above.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>As an example think of a server, which wants to extract a list of all members in the current cluster. Hereby:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>A owner is modelled by a MembeConfigr class, with the fields serverId, serverName, serverURL.</p>
+</li>
+<li>
+<p>The current members should be accessed as list, as follows:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">List&lt;MemberConfig&gt; members = configuration.get("cluster.members", new TypeLiteral&lt;List&lt;MemberConfig&gt;&gt;();</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This coud be modelled as property as well, but it is more convenient to let Tamaya have a more flexible model
+to represent a configuration internally. This is why a PropertyValue can have one of three flavors:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>it is a simple literal value.</p>
+</li>
+<li>
+<p>it is an object containing none to many child property values as named fields.</p>
+</li>
+<li>
+<p>it is an array containing none to many child properties as unnamed array instances.</p>
+</li>
+</ol>
+</div>
+<div class="paragraph">
+<p>Summarizing Tamaya is capable of fully represent the structures described by widely used configuration file formats.</p>
+</div>
+<div class="sect3">
+<h4 id="_why_using_strings_only">Why Using Strings Only</h4>
+<div class="paragraph">
+<p>There are good reason to keep of non String-values as core storage representation of configuration. Mostly
+there are several advantages:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Strings are simple to understand</p>
+</li>
+<li>
+<p>Strings are human readable and therefore easy to prove for correctness</p>
+</li>
+<li>
+<p>Strings can easily be used within different language, different VMs, files or network communications.</p>
+</li>
+<li>
+<p>Strings can easily be compared and manipulated</p>
+</li>
+<li>
+<p>Strings can easily be searched, indexed and cached</p>
+</li>
+<li>
+<p>It is very easy to provide Strings as configuration, which gives much flexibility for providing configuration in
+production as well in testing.</p>
+</li>
+<li>
+<p>and more&#8230;&#8203;</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>On the other side there are also disadvantages:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Strings are inherently not type safe, they do not provide validation out of the box for special types, such as
+numbers, dates etc.</p>
+</li>
+<li>
+<p>In many cases you want to access configuration in a typesafe way avoiding conversion to the target types explicitly
+throughout your code.</p>
+</li>
+<li>
+<p>Strings are neither hierarchical nor multi-valued, so mapping hierarchical and collection structures requires some
+extra efforts.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Nevertheless most of these advantages can be mitigated easily, hereby still keeping all the benefits from above:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Adding type safe adapters on top of String allow to add any type easily, that can be directly mapped out of Strings.
+This includes all common base types such as numbers, dates, time, but also timezones, formatting patterns and more.</p>
+</li>
+<li>
+<p>Also multi-valued, complex and collection types can be defined as a corresponding PropertyAdapter knows how to
+parse and create the target instance required.</p>
+</li>
+<li>
+<p>String s also can be used as references pointing to other locations and formats, where configuration is
+accessible.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>[[API Configuration]]</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_configuration">Configuration</h3>
+<div class="paragraph">
+<p>Configuration is the main artifact provided by Tamaya. It allows reading of single property values or all known
+properties, but also supports type safe access:</p>
+</div>
+<div class="listingblock">
+<div class="title">Interface Configuration</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface Configuration{
     String get(String key);
     String getOrDefault(String key, String value);
     &lt;T&gt; T get(String key, Class&lt;T&gt; type);
     &lt;T&gt; T getOrDefault(String key, Class&lt;T&gt; type, T defaultValue);
     &lt;T&gt; T get(String key, TypeLiteral&lt;T&gt; type);
     &lt;T&gt; T getOrDefault(String key, TypeLiteral&lt;T&gt; type, T defaultValue);
+    &lt;T&gt; Optional&lt;T&gt; getOptional(String key, TypeLiteral&lt;T&gt; type);
+    &lt;T&gt; Optional&lt;T&gt; getOptional(String key, Class&lt;T&gt; type);
     Map&lt;String,String&gt; getProperties();
 
     // extension points
-    Configuration with(ConfigOperator operator);
-    &lt;T&gt; T query(ConfigQuery&lt;T&gt; query);
+    Configuration map(UnaryOperator&lt;Configuration&gt; operator);
+    &lt;T&gt; T adapt(Function&lt;Configuration,T&gt; adapter);
+
+    // Snapshots for consistent config access
+    ConfigurationSnapshot getSnapshot(Iterable&lt;String&gt; keys);
+    ConfigurationSnapshot getSnapshot(String... keys);
 
     ConfigurationContext getContext();
-}</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Hereby</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>&lt;T&gt; T get(String, Class&lt;T&gt;) provides type safe accessors for all basic wrapper types of the JDK.</p> </li> 
-     <li> <p>with, query provide the extension points for adding additional functionality.</p> </li> 
-     <li> <p>getProperties() provides access to all key/values, whereas entries from non scannable property sources may not be included.</p> </li> 
-     <li> <p>getOrDefault allows to pass default values as needed, returned if the requested value evaluated to null.</p> </li> 
-     <li> <p>getConfigurationContext() allows access to the underlying components of a Configuration instance.</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The class TypeLiteral is basically similar to the same class provided with CDI:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public class TypeLiteral&lt;T&gt; implements Serializable {
+    ConfigurationBuilder toBuilder();
+    static Configuration current();
+    static Configuration current(ClassLoader classsLoader);
+    static void setCurrent(Configuration config);
+    static void setCurrent(Configuration config, ClassLoader classLoader);
+    static ConfigurationBuilder createConfigurationBuilder();
+
+    // the deault EMPTY configuration
+    static Configuration EMPTY{}
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Hereby</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>&lt;T&gt; T get(String, Class&lt;T&gt;) provides type safe accessors for all basic wrapper types of the JDK.</p>
+</li>
+<li>
+<p>map, adapt provide the extension points for adding additional functionality.</p>
+</li>
+<li>
+<p>getProperties() provides access to all key/values, whereas entries from non scannable property sources may not
+be included.</p>
+</li>
+<li>
+<p>getOrDefault allows to pass default values as needed, returned if the requested value evaluated to null.</p>
+</li>
+<li>
+<p>getConfigurationContext() allows access to the underlying components of a Configuration instance.</p>
+</li>
+<li>
+<p>the static methods allow access for obtaining or changing Configuration.</p>
+</li>
+<li>
+<p>getSnapshot allows to create a configuration snapshot, which guarantees consistent and immutable access to
+a Configuration. It can optionally be constraint to a set of keys, by default a full snapshot is created.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Accessor methods also support multi-key access, where an Iterable of keys can be provided. This basically
+is equivalent to multiple calls to this method, where the result of the first successful call (returning
+configuration data) will end the evaluation chain.</p>
+</div>
+<div class="paragraph">
+<p>The class TypeLiteral is basically similar to the same class provided with CDI:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public class TypeLiteral&lt;T&gt; implements Serializable {
 
     [...]
 
@@ -317,647 +521,870 @@ val = props.getProperty("a.b.c.1");
     public static Type getTypeParameter(Class&lt;?&gt; clazz, Class&lt;?&gt; interfaceType){...}
 
     [...]
-}</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Instances of Configuration can be accessed from the ConfigurationProvider singleton:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     Accessing Configuration
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ConfigurationProvider.getConfiguration();</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Hereby the singleton is backed up by an instance of ConfigurationProviderSpi, which is managed by the ServiceContextManager (see later).</p> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="PropertyConverter">Property Type Conversion</h4> 
-    <div class="paragraph"> 
-     <p>As illustrated in the previous section, Configuration also allows access of typed values. Internally all properties are strictly modelled as Strings. As a consequence non String values must be derived by converting the String values into the required target type. This is achieved with the help of PropertyConverters:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface PropertyConverter&lt;T&gt;{
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Instances of Configuration can be accessed using the Configuration.current() or Configuration.current(ClassLoader)
+singleton:</p>
+</div>
+<div class="listingblock">
+<div class="title">Accessing Configuration</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = Configuration.current();</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Hereby the singleton is backed up by an instance of ConfigurationProviderSpi, which is managed by the
+ServiceContextManager (see later).</p>
+</div>
+<div class="sect3">
+<h4 id="PropertyConverter">Property Type Conversion</h4>
+<div class="paragraph">
+<p>As illustrated in the previous section, Configuration also allows access of typed values. Internally
+all properties are strictly modelled as Strings. As a consequence non String values must be derived by converting the
+String values into the required target type. This is achieved with the help of PropertyConverters:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface PropertyConverter&lt;T&gt;{
     T convert(String value, ConversionContext context);
-}</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>The ConversionContext contains additional meta-information about the key accessed, including the key’a name and additional metadata. This can be very useful, e.g. when the implementation of a PropertyConverter requires additional metadata for determining the correct conversion to be applied.</p> 
-    </div> 
-    <div class="paragraph"> 
-     <p>PropertyConverter instances can be implemented and registered by default using the Java ServiceLoader. The ordering of the registered converters, by default, is based on the annotated @Priority values (priority 0 is assumed if the annotation is missing). The first non-null result of a converter is returned as the final configuration value.</p> 
-    </div> 
-    <div class="paragraph"> 
-     <p>Access to converters is provided by the current ConfigurationContext, which is accessible calling Configuration.getConfigurationContext().</p> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="ExtensionPoints">Extension Points</h3> 
-   <div class="paragraph"> 
-    <p>We are well aware of the fact that this library will not be able to cover all kinds of use cases. Therefore we have added <em>functional</em> extension mechanisms to Configuration that were used in other areas of the Java eco-system (e.g. Java Time API and JSR 354) as well:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>with(ConfigOperator operator) allows to pass arbitrary unary functions that take and return instances of Configuration. Operators can be used to cover use cases such as filtering, configuration views, security interception and more.</p> </li> 
-     <li> <p>query(ConfigQuery query) allows to apply a function returning any kind of result based on a Configuration instance. Queries are used for accessing/deriving any kind of data based on of a Configuration instance, e.g. accessing a Set&lt;String&gt; of root keys present.</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Both interfaces hereby are functional interfaces. Because of backward compatibility with Java 7 we did not use UnaryOperator and Function from the java.util.function package. Nevertheless usage is similar, so you can use Lambdas and method references in Java 8:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     Applying a ConfigurationQuery using a method reference
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigSecurity securityContext = ConfigurationProvider.getConfiguration().query(ConfigSecurity::targetSecurityContext);</code></pre> 
-    </div> 
-   </div> 
-   <div class="admonitionblock note"> 
-    <table> 
-     <tbody>
-      <tr> 
-       <td class="icon"> 
-        <div class="title">
-         Note
-        </div> </td> 
-       <td class="content"> ConfigSecurity is an arbitrary class only for demonstration purposes. </td> 
-      </tr> 
-     </tbody>
-    </table> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Operator calls basically look similar:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     Applying a ConfigurationOperator using a lambda expression:
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration secured = ConfigurationProvider.getConfiguration()
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The ConversionContext contains additional meta-information about the key accessed, including the key&#8217;a name and
+additional metadata. This can be very useful, e.g. when the implementation of a PropertyConverter requires additional
+metadata for determining the correct conversion to be applied.</p>
+</div>
+<div class="paragraph">
+<p>PropertyConverter instances can be implemented and registered by default using the Java ServiceLoader. The ordering
+of the registered converters, by default, is based on the annotated @Priority values (priority 0 is assumed if the
+annotation is missing). The first non-null result of a converter is returned as the final configuration value.</p>
+</div>
+<div class="paragraph">
+<p>Access to converters is provided by the current ConfigurationContext, which is accessible calling Configuration.getConfigurationContext().</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="ExtensionPoints">Extension Points</h3>
+<div class="paragraph">
+<p>We are well aware of the fact that this library will not be able to cover all kinds of use cases. Therefore
+we have added <em>functional</em> extension mechanisms to Configuration that were used in other areas of the
+Java eco-system (e.g. Java Time API and JSR 354) as well:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>map(UnaryOperator&lt;Configuration&gt; operator) allows to pass arbitrary unary functions that take and return instances of
+Configuration. Operators can be used to cover use cases such as filtering, configuration views, security
+interception and more.</p>
+</li>
+<li>
+<p>adapt(Function&lt;Configuration,T) allows to apply a function returning any kind of result based on a
+Configuration instance. Queries are used for accessing/deriving any kind of data based on of a Configuration
+instance, e.g. accessing a Set&lt;String&gt; of root keys present.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Both interfaces hereby are functional interfaces. Because of backward compatibility with Java 7 we did not use
+UnaryOperator and Function from the java.util.function package. Nevertheless usage is similar, so you can
+use Lambdas and method references in Java 8:</p>
+</div>
+<div class="listingblock">
+<div class="title">Applying an Adapter using a method reference</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigSecurity securityContext = Configuration.current().adapt(ConfigSecurity::targetSecurityContext);</code></pre>
+</div>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+ConfigSecurity is an arbitrary class only for demonstration purposes.
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>Operator calls basically look similar:</p>
+</div>
+<div class="listingblock">
+<div class="title">Applying a ConfigurationOperator using a lambda expression:</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration secured = Configuration.current()
                            .with((config) -&gt;
                                  config.get("foo")!=null?;
                                  FooFilter.apply(config):
-                                 config);</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="ConfigException">ConfigException</h3> 
-   <div class="paragraph"> 
-    <p>The class ConfigException models the base <strong>runtime</strong> exception used by the configuration system.</p> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="SPI">SPI</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="PropertyValue">PropertyValue, PropertyValueBuilder</h3> 
-   <div class="paragraph"> 
-    <p>On the API properties are represented as Strings only, whereas in the SPI value are represented as ProeprtyValue, which contain</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>the property’s <em>key</em> (String)</p> </li> 
-     <li> <p>the property’s <em>value</em> (String)</p> </li> 
-     <li> <p>the property’s <em>source</em> (String, typically equals to the property source’s name)</p> </li> 
-     <li> <p>any additional meta-data represented as <em>Map&lt;String,String&gt;</em></p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>This helps to kepp all value relevant data together in one place and also allows to choose any kind of representation for meta-data entries. The PropertyValue itself is a final and <em>serializable</em> data container, which also has a powerful builder API (e.g. for using within filters):</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public final class PropertyValue implements Serializable{
+                                 config);</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="ConfigException">ConfigException</h3>
+<div class="paragraph">
+<p>The class ConfigException models the base <strong>runtime</strong> exception used by the configuration system.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="SPI">SPI</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="PropertyValue">PropertyValue</h3>
+<div class="paragraph">
+<p>On the API properties are represented as Strings only, whereas in the SPI value are represented as ProeprtyValue,
+which contain</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>the property&#8217;s <em>key</em> (String)</p>
+</li>
+<li>
+<p>the property&#8217;s <em>value</em> (String)</p>
+</li>
+<li>
+<p>the property&#8217;s <em>source</em> (String, typically equals to the property source&#8217;s name)</p>
+</li>
+<li>
+<p>any additional meta-data represented as <em>Map&lt;String,String&gt;</em></p>
+</li>
+<li>
+<p>named or unnamed child objects, arrays or text filters.s</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>This helps to kepp all value relevant data together in one place and also allows to choose any kind of
+representation for meta-data entries. The PropertyValue itself is a final and <em>serializable</em> data container,
+which also has a powerful builder API (e.g. for using within filters):</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public final class PropertyValue implements Serializable{
     [...]
 
-    public static PropertyValue of(String key, String value, String source);
+    public static ObjectValue createObject(){
+    public static ListValue createList(){
+    public static PropertyValue createValue(String key, String value){
+    public static ListValue createList(String key){
+    public static ObjectValue createObject(String key)
+
+    public final boolean isImmutable();
+    public PropertyValue immutable();
+    public PropertyValue mutable();
+    public final ValueType getValueType();
 
     public String getKey();
+    public String getQualifiedKey();
     public String getSource();
     public String getValue();
+    public PropertyValue setValue(String value);
     public Map&lt;String, String&gt; getMetaEntries();
     public String getMetaEntry(String key);
-    public PropertyValueBuilder toBuilder();
 
-    public static PropertyValueBuilder builder(String key, String source);
-    public static PropertyValueBuilder builder(String key, String value, String source);
-
-    /**
-     * Maps a map of {@code Map&lt;String,String&gt;} to a {@code Map&lt;String,PropertyValue&gt;}.
-     * @param config the String based map, not null.
-     * @param source the source name, not null.
-     * @return the corresponding value based map.
-     */
+    public final PropertyValue getParent();
+    public final int getVersion();
+    public final boolean isRoot();
+    public final boolean isLeaf();
     public static Map&lt;String,PropertyValue&gt; map(Map&lt;String, String&gt; config, String source);
-
-    /**
-     * Maps a map of {@code Map&lt;String,String&gt;} to a {@code Map&lt;String,PropertyValue&gt;}.
-     * @param config the String based map, not null.
-     * @param source the source name, not null.
-     * @param metaData additional metadata, not null.
-     * @return the corresponding value based map.
-     */
     public static Map&lt;String,PropertyValue&gt; map(Map&lt;String, String&gt; config, String source,
-                                                Map&lt;String,String&gt; metaData);
-}</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>When writing your own datasource you can easily create your own PropertyValues:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertyValue val = PropertyValue.of("key","value","source");</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>If you want to add additional metadata in most cases you would use the builder API:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertyValue val = PropertyValue.builder("key","value","source")
-                     .addMetaEntry("figured", "true")
-                     .build();</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>PropertyValues are type safe value objects. To change a value you have to create a new instance using a builder:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertyValue val = PropertyValue.builder("key","value","source")
-                     .addMetaEntry("figured", "true")
-                     .build();
-PropertyValue newVal = val.toBuilder().setValue("anotehrValue")
-                     .addMetaEntry("remote", "true")
-                     .removeMetaEntry("figured")
-                     .build();</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="PropertySource">Interface PropertySource</h3> 
-   <div class="paragraph"> 
-    <p>We have seen that constraining configuration aspects to simple literal key/value pairs provides us with an easy to understand, generic, flexible, yet extensible mechanism. Looking at the Java language features a java.util.Map&lt;String, String&gt; and java.util.Properties basically model these aspects out of the box.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Though there are advantages in using these types as a model, there are some drawbacks. Notably implementation of these types is far not trivial and the collection API offers additional functionality not useful when aiming for modelling simple property sources.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>To render an implementation of a custom PropertySource as convenient as possible only the following methods were identified to be necessary:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface PropertySource{
-      int getOrdinal();
+                                                Map&lt;String,String&gt; metaData);</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>When writing your own datasource you can easily create your own PropertyValues:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertyValue val = PropertyValue.createValue("key","value");</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>You can also add additional metadata:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">val.addMetaEntry("figured", "true");</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>PropertyValues are type safe value objects. To render a value
+immutable just call the corresponding method:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">//mutable instance
+PropertyValue val = ...;
+
+// immutable instance
+PropertyValue newVal = val.immutable();</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Changing an immutable value will result in a IllegalStateException. The process also works the other way
+round, so an immutable instance can be rendered into a mutable as follows:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">//immutable instance
+PropertyValue val = ...;
+
+// mutable instance
+PropertyValue newVal = val.mutable();</code></pre>
+</div>
+</div>
+<div class="sect3">
+<h4 id="ObjectValue">ObjectValue and ListValue</h4>
+<div class="paragraph">
+<p>In many cases using PropertyValues is sufficient. Nevertheless when handling more complex configuration sources, such
+as file sources mapping hierarchical structures helps a lot. This is what ObjectValue and listValue are for:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>ObjectValue defines a PropertyValue that has an arbitrary number of child values, identified by a unique text key.</p>
+</li>
+<li>
+<p>ListValue defines a PropertyValue that has an arbitrary number of child values, organized as a list of
+values.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>When rendered to Map&lt;String,String&gt; generated keys look very familiar:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">a.a=valA
+a.b=valB
+a.list[0]=val0
+a.list[1]=val1
+a.c=valC</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Hereby</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>a can be mapped as an ObjectValue, with a,b,c being normale PropertyValue instances.</p>
+</li>
+<li>
+<p>list is also a child of a, but of type ListValue containing two PropertyValue instances.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="PropertySource">Interface PropertySource</h3>
+<div class="paragraph">
+<p>We have seen that constraining configuration aspects to simple literal key/value pairs provides us with an easy to
+understand, generic, flexible, yet extensible mechanism. Looking at the Java language features a java.util.Map&lt;String,
+String&gt; and java.util.Properties basically model these aspects out of the box.</p>
+</div>
+<div class="paragraph">
+<p>Though there are advantages in using these types as a model, there are some drawbacks. Notably implementation
+of these types is far not trivial and the collection API offers additional functionality not useful when aiming
+for modelling simple property sources.</p>
+</div>
+<div class="paragraph">
+<p>To render an implementation of a custom PropertySource as convenient as possible only the following methods were
+identified to be necessary:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface PropertySource{
+
+      default int getOrdinal();
       String getName();
       PropertyValue get(String key);
-      boolean isScannable();
       Map&lt;String,PropertyValue&gt; getProperties();
-}</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Hereby</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>get looks similar to the methods on Map. It may return null in case no such entry is available.</p> </li> 
-     <li> <p>getProperties allows to extract all property data to a Map&lt;String,PropertyValue&gt;. Other methods like containsKey, keySet as well as streaming operations then can be applied on the returned Map instance.</p> </li> 
-     <li> <p>But not in all scenarios a property source is able to provide all values at once (aka to be <em>scannable</em>), e.g. when looking up keys is very inefficient, it may not make sense to iterate over all keys to collect the corresponding properties. If a PropertySource is defined as non scannable accesses to getProperties() may not return all key/value pairs that would be available when accessed directly using the PropertyValue get(String) method. The fact if a PropertySource  [...]
-     <li> <p>int getOrdinal() defines the ordinal of the PropertySource. Property sources are managed in an ordered chain, where property sources with higher ordinals override ones with lower ordinals. If the ordinal of two property sources is the same, the natural ordering of the fully qualified class names of the property source implementations is used. The reason for not using @Priority annotations is that property sources can define dynamically their ordinals, e.g. based on a propert [...]
-     <li> <p>Finally getName() returns a (unique) name that identifies the PropertySource within its containing ConfigurationContext.</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>This interface can be implemented by any kind of logic. It could be a simple in memory map, a distributed configuration provided by a data grid, a database, the JNDI tree or other resources. Or it can be a combination of multiple property sources with additional combination/aggregation rules in place.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>PropertySources to be picked up automatically and be added to the <em>default</em> Configuration, must be registered using the Java +ServiceLoader (or the mechanism provided by the current active ServiceContext, see later in this document for further details).</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="PropertySourceProvider">Interface PropertySourceProvider</h3> 
-   <div class="paragraph"> 
-    <p>Instances of this type can be used to register multiple instances of PropertySource.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">// @FunctionalInterface in Java 8
+
+      ...
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Hereby</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>get looks similar to the methods on Map. It may return null in case no such entry is available.</p>
+</li>
+<li>
+<p>getProperties allows to extract all property data to a Map&lt;String,PropertyValue&gt;. Other methods like containsKey,
+keySet as well as streaming operations then can be applied on the returned Map instance.</p>
+</li>
+<li>
+<p>int getOrdinal() defines the ordinal of the PropertySource. Property sources are managed in an ordered chain, where
+property sources with higher ordinals override ones with lower ordinals. If the ordinal of two property sources is
+the same, the natural ordering of the fully qualified class names of the property source implementations is used.
+The reason for not using @Priority annotations is that property sources can define dynamically their ordinals,
+e.g. based on a property contained with the configuration itself.
+Implementations of this API may provide additional functionality to adapt the default ordinal of auto-discovered
+property sources.</p>
+</li>
+<li>
+<p>Finally getName() returns a (unique) name that identifies the PropertySource within its containing ConfigurationContext.</p>
+</li>
+</ul>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+Not in all scenarios a property source is able to provide all values at once, e.g.
+      when looking up keys is very inefficient. In this case
+      getProperties() may not return all key/value pairs that would be available when accessed directly using the
+      PropertyValue get(String) method.
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>This interface can be implemented by any kind of logic. It could be a simple in memory map, a distributed configuration
+provided by a data grid, a database, the JNDI tree or other resources. Or it can be a combination of multiple
+property sources with additional combination/aggregation rules in place.</p>
+</div>
+<div class="paragraph">
+<p>PropertySources to be picked up automatically and be added to the <em>default</em> Configuration, must be registered
+using the Java +ServiceLoader (or the mechanism provided by the current active ServiceContext, see later in this
+document for further details).</p>
+</div>
+<div class="sect3">
+<h4 id="_consistent_configuration_access">Consistent Configuration Access</h4>
+<div class="paragraph">
+<p>For consistent configuration access using Snapshots property sources may provide additional services:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface PropertySource{
+
+      ...
+
+      // Method for consistent configuration access
+
+      default ChangeSupport getChangeSupport();
+      default String getVersion();
+      default void addChangeListener(BiConsumer&lt;Set&lt;String&gt;, PropertySource&gt; l);
+      default void removeChangeListener(BiConsumer&lt;Set&lt;String&gt;, PropertySource&gt; l);
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>These methods allow to determine Tamaya if all values accessed are consistent. The idea behind is that a
+PropertySource may change during a configuration evaluation. Providing a version allows the configuration system
+to detect such a change and restart the evaluation. Additionally registering of change listeners allow actively
+listening for changes. Since not all implementations may support versioning the may declare their capabilities:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>getChangeSupport() declares the versioning capabilities, possible values are UNSUPPORTED,SUPPORTED,IMMUTABLE.</p>
+</li>
+<li>
+<p>getVersion() returns a version. Returning a new String value signals c change in the property source.</p>
+</li>
+<li>
+<p>add/removeChangeListener allows to add or remove listeners.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="PropertySourceProvider">Interface PropertySourceProvider</h3>
+<div class="paragraph">
+<p>Instances of this type can be used to register multiple instances of PropertySource.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@FunctionalInterface
 public interface PropertySourceProvider{
     Collection&lt;PropertySource&gt; getPropertySources();
-}</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>This allows to evaluate the property sources to be read/that are available dynamically. All property sources are read out and added to the current chain of PropertySource instances within the current ConfigurationContext, refer also to <a id="ConfigurationContext"></a>.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>PropertySourceProviders are by default registered using the Java ServiceLoader or the mechanism provided by the current active ServiceContext.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="PropertyFilter">Interface PropertyFilter</h3> 
-   <div class="paragraph"> 
-    <p>Also PropertyFilters can be added to a Configuration. They are evaluated each time before a configuration value is passed to the user. Filters can be used for multiple purposes, such as</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>resolving placeholders</p> </li> 
-     <li> <p>masking sensitive entries, such as passwords</p> </li> 
-     <li> <p>constraining visibility based on the current active user</p> </li> 
-     <li> <p>…​</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>For PropertyFilters to be picked up automatically and added to the <em>default</em> Configuration must be,by default, registered using the Java ServiceLoader (or the mechanism provided by the current active ServiceContext). Similar to property sources they are managed in an ordered filter chain, based on the class level @Priority annotations (assuming 0 if none is present).</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>A PropertyFilter is defined as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">// Functional Interface
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This allows to evaluate the property sources to be read/that are available dynamically. All property sources
+are read out and added to the current chain of PropertySource instances within the current ConfigurationContext,
+refer also to <a id="ConfigurationContext"></a>.</p>
+</div>
+<div class="paragraph">
+<p>PropertySourceProviders are by default registered using the Java ServiceLoader or the mechanism provided by the
+current active ServiceContext.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="PropertyFilter">Interface PropertyFilter</h3>
+<div class="paragraph">
+<p>Also PropertyFilters can be added to a Configuration. They are evaluated each time before a configuration value
+is passed to the user. Filters can be used for multiple purposes, such as</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>resolving placeholders</p>
+</li>
+<li>
+<p>masking sensitive entries, such as passwords</p>
+</li>
+<li>
+<p>constraining visibility based on the current active user</p>
+</li>
+<li>
+<p>&#8230;&#8203;</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>For PropertyFilters to be picked up automatically and added to the <em>default</em> Configuration must be,by default,
+registered using the Java ServiceLoader (or the mechanism provided by the current active ServiceContext).
+Similar to property sources they are managed in an ordered filter chain, based on the
+class level @Priority annotations (assuming 0 if none is present).</p>
+</div>
+<div class="paragraph">
+<p>A PropertyFilter is defined as follows:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@FunctionalInterface
 public interface PropertyFilter{
     PropertyValue filterProperty(PropertyValue value, FilterContext context);
-}</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Hereby:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>returning null will remove the key from the final result.</p> </li> 
-     <li> <p>non null values are used as the current value of the key. Nevertheless for resolving multi-step dependencies filter evaluation has to be continued as long as filters are still changing some of the values to be returned. To prevent possible endless loops after a defined number of loops evaluation is stopped.</p> </li> 
-     <li> <p>FilterContext provides additional metdata, including the property accessed, which is useful in many use cases.</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>This method is called each time a single entry is accessed, and for each property in a full properties result.</p> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="PropertyValueCombinationPolicy">Interface PropertyValueCombinationPolicy</h4> 
-    <div class="paragraph"> 
-     <p>This interface is purely optional and can be used to adapt the way how property key/value pairs are combined to build up the final configuration <em>raw</em> value to be passed over to the PropertyFilters. The default implementation is just overriding all values read before with the new value read. Nevertheless for collections and other use cases more intelligent logic is required.</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">// FunctionalInterface
-public interface PropertyValueCombinationPolicy{
-
-   PropertyValueCombinationPolicy DEFAULT_OVERRIDING_COLLECTOR =
-     new PropertyValueCombinationPolicy(){
-       @Override
-       public PropertyValue collect(PropertyValue currentValue, String key,
-                                         PropertySource propertySource) {
-           PropertyValue value = propertySource.get(key);
-           return value!=null?value:currentValue;
-       }
-   };
-
-   PropertyValue collect(PropertyValue currentValue, String key,
-                  PropertySource propertySource);
-
-}</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>Looking at the collect method’s signature, returning a PropertyValue allows also to filter/combine/use meta entries.</p> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="ConfigurationContext">The Configuration Context</h4> 
-    <div class="paragraph"> 
-     <p>A Configuration is created from a ConfigurationContext. Each Configuration instance provides it’s underlying context by Configuration.getContext():</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="title">
-      Accessing the current ConfigurationContext
-     </div> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ...;
-ConfigurationContext context = config.getContext();</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>The ConfigurationContext provides access to the internal artifacts that determine the Configuration and also defines the ordering of the property sources, filters and converters contained:</p> 
-    </div> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>PropertySources registered (including the PropertySources provided from PropertySourceProvider instances).</p> </li> 
-      <li> <p>PropertyFilters registered, which filter values before they are returned to the client</p> </li> 
-      <li> <p>PropertyConverter instances that provide conversion functionality for converting String values to any other types.</p> </li> 
-      <li> <p>the current PropertyValueCombinationPolicy that determines how property values from different PropertySources are combined to the final property value returned to the client.</p> </li> 
-     </ul> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="Mutability">Changing the current Configuration Context</h4> 
-    <div class="paragraph"> 
-     <p>A ConfigurationContext is not mutable once it is created. In many cases mutability is also not needed. Nevertheless there are use cases where the current ConfigurationContext (and consequently Configuration) must be adapted:</p> 
-    </div> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>New configuration files where detected in a folder observed by Tamaya.</p> </li> 
-      <li> <p>Remote configuration, e.g. stored in a database or alternate ways has been updated and the current system must be adapted to these changes.</p> </li> 
-      <li> <p>The overall configuration context is manually setup by the application logic.</p> </li> 
-      <li> <p>Within unit testing alternate configuration setup should be setup to meet the configuration requirements of the tests executed.</p> </li> 
-     </ul> 
-    </div> 
-    <div class="paragraph"> 
-     <p>In such cases the ConfigurationContext may change, meaning it must be possible:</p> 
-    </div> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>to add or remove PropertySource instances</p> </li> 
-      <li> <p>to add or remove PropertyFilter instances</p> </li> 
-      <li> <p>to add or remove PropertyConverter instances</p> </li> 
-      <li> <p>to redefine the current PropertyValueCombinationPolicy instances.</p> </li> 
-     </ul> 
-    </div> 
-    <div class="paragraph"> 
-     <p>This is nothing new, a ConfigurationContextBuilder already allows us to achive this. So we must only ensure that we can easily create a new ConfigurationContextBuilder using a given ConfigurationContext as input. This can be done by</p> 
-    </div> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>calling ConfigurationContext.toBuilder(), hereby returning a builder instance preinitialized with the values from the current ConfigurationContext.</p> </li> 
-      <li> <p>calling ConfigurationProvider.getConfigurationContextBuilder() and then applying the current ConfigurationContext by calling setContext(ConfigurationContext) on the ConfigurationContextBuilder instance.</p> </li> 
-     </ul> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="title">
-      Accessing a ConfigurationContextBuilder
-     </div> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationContextBuilder preinitializedContextBuilder = ConfigurationProvider.getConfiguration().getContext().toBuilder();
-ConfigurationContextBuilder emptyContextBuilder = ConfigurationProvider.getConfigurationContextBuilder();</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>Finally when we are finished a new ConfigurationContext can be created:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="title">
-      Creating and applying a new ConfigurationContext
-     </div> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationContext context = ConfigurationProvider.getConfiguration().getContext()
-                                    .toBuilder();
-                                    .addPropertySources(new MyPropertySource())
-                                    .addPropertyFilter(new MyFilter())
-                                    .build();</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>But let’s also have a deeper look at what functionality a ConfigurationContextBuilder provides. Basically such a builder allows to add, remove or reorder property sources, converters and filters or changing any other aspect of a ConfigurationContext:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="title">
-      Chain manipulation using ConfigurationContextBuilder
-     </div> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertySource propertySource = builder.getPropertySource("sourceId");
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Hereby:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>returning null will remove the key from the final result.</p>
+</li>
+<li>
+<p>non null values are used as the current value of the key. Nevertheless for resolving multi-step dependencies
+filter evaluation has to be continued as long as filters are still changing some of the values to be returned.
+To prevent possible endless loops after a defined number of loops evaluation is stopped.</p>
+</li>
+<li>
+<p>FilterContext provides additional metdata, including the property accessed, which is useful in many use cases.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>This method is called each time a single entry is accessed, and for each property in a full properties result.</p>
+</div>
+<div class="sect3">
+<h4 id="ConfigurationContext">The Configuration Context</h4>
+<div class="paragraph">
+<p>A Configuration is created based on a ConfigurationContext, which ia accessible calling
+configuration.getContext():</p>
+</div>
+<div class="listingblock">
+<div class="title">Accessing the ConfigurationContext of a configuration</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ...;
+ConfigurationContext context = config.getContext();</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The ConfigurationContext provides access to the internal artifacts that determine the Configuration.
+Similarly the context also defines the ordering and significance of property sources, filters and
+converters:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>PropertySources registered (including the PropertySources provided from PropertySourceProvider instances).</p>
+</li>
+<li>
+<p>PropertyFilters registered, which filter values before they are returned to the client</p>
+</li>
+<li>
+<p>PropertyConverter instances that provide conversion functionality for converting String values to any other types.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="Mutability">Changing a Configuration</h4>
+<div class="paragraph">
+<p>A Configuration is basically not mutable. Nevertheless when the containing property sources provide different
+values, e.g. because a  configuration file has been updated, also the configuration values may change
+(dependiing on the significance of the changed property source).</p>
+</div>
+<div class="paragraph">
+<p>Nevertheless it is also possible to create a new ConfigurationBuilder based on an existing configuration
+and add/remove property sources, filters or converters as needed.</p>
+</div>
+<div class="paragraph">
+<p>A new configuration builder can be easily accessed from an existing configuration as follows:</p>
+</div>
+<div class="listingblock">
+<div class="title">Accessing a ConfigurationContextBuilder</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ...;
+ConfigurationBuilder preinitializedConfigBuilder = config.toBuilder();</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>It is also possible to builkd up a configuration completely from scratch, having full control on the
+resources included:</p>
+</div>
+<div class="listingblock">
+<div class="title">Accessing a ConfigurationContextBuilder</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationBuilder emptyConfigBuilder = Configuration.createConfigurationBuilder();</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Using the builder we then can change the configuration as needed:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationBuilder builder = Configuration.crteateConfigurationBuilder();
+builder.addPropertySources(new MyPropertySource())
+       .addPropertyFilter(new MyFilter())
+       .setMeta("a.b.c.collectionType", "List")
+       .build();</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Let&#8217;s have a short look at the ConfigurationBuilder. Basically such a
+builder allows to add, remove or reorder property sources, converters and filters or changing any other aspect
+of a Configuration. Finally a new Configuration instance can be built.</p>
+</div>
+<div class="listingblock">
+<div class="title">Chain manipulation using ConfigurationContextBuilder</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertySource propertySource = builder.getPropertySource("sourceId");
 
 // changing the priority of a property source. The ordinal value hereby is not considered.
 // Instead the position of the property source within the chain is changed.
 builder.decreasePriority(propertySource);
 
 // Alternately a comparator expression can be passed to establish the defined ordering...
-builder.sortPropertyFilters(MyFilterComparator::compare);</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>Finally if the new ConfigurationContext is ready a new Configuration can be created. Optionally the new Configuration can also be installed as the new <em>default</em> Configuration instace as illustrated below:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="title">
-      Creating and applying a new ConfigurationContext
-     </div> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationContext context = builder.build();
-
-// Creates a new matching Configuration instance
-Configuration newConfig = ConfigurationProvider.createConfiguration(context);
+builder.sortPropertyFilters(MyFilterComparator::compare);</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Finally if a new Configuration can be built. Optionally the new Configuration can also be installed as
+the <em>default</em> Configuration instance as illustrated below:</p>
+</div>
+<div class="listingblock">
+<div class="title">Creating and applying a new Configuration</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">// Creates a new matching Configuration instance
+Configuration config = builder.build();
 
 // Apply the new context to replace the current configuration:
-ConfigurationProvider.setConfiguration(newConfig);</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>Hereby ConfigurationProvider.setConfiguration(Configuration) can throw an UnsupportedOperationException. This can be checked by calling the method boolean ConfigurationProvider.isConfigurationSettable().</p> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="ConfigurationProviderSpi">Implementing and Managing Configuration</h4> 
-    <div class="paragraph"> 
-     <p>One of the most important SPI in Tamaya is the ConfigurationProviderSpi interface, which is backing up the ConfigurationProvider singleton. Implementing this class allows</p> 
-    </div> 
-    <div class="ulist"> 
-     <ul> 
-      <li> <p>to fully determine the implementation class for Configuration</p> </li> 
-      <li> <p>to manage the current Configuration in the scope and granularity required.</p> </li> 
-      <li> <p>to provide access to the right Configuration based on the current runtime context.</p> </li> 
-      <li> <p>Performing changes as set with the current ConfigurationContextBuilder.</p> </li> 
-     </ul> 
-    </div> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<h1 id="_interface_configurationcontextbuilder" class="sect0">Interface ConfigurationContextBuilder</h1> 
-<div class="sect1"> 
- <h2 id="BuilderCore">Interface ConfigurationContextBuilder</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_overview">Overview</h3> 
-   <div class="paragraph"> 
-    <p>The Tamaya builder module provides a generic (one time) builder for creating Configuration instances, e.g. as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationBuilder builder = new ConfigurationBuilder();
+Configuration.setCurrent(newConfig);</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Hereby Configuration.setCurrent(Configuration) can throw an UnsupportedOperationException.
+This can be checked by calling the method boolean Configuration.isConfigurationSettable().</p>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_spi">SPI</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="ConfigurationProviderSpi">Implementing and Managing Configuration</h3>
+<div class="paragraph">
+<p>One of the most important SPI in Tamaya is the ConfigurationProviderSpi interface, which is backing up the
+Configuration static accessor methods. Implementing this interface allows</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>to fully determine the implementation class for Configuration, ConfigurationBuilder, ConfigurationContext</p>
+</li>
+<li>
+<p>to manage Configurations in the scope and granularity required.</p>
+</li>
+<li>
+<p>to provide access to the right Configuration based on the current runtime context (e.g. classloader).</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="BuilderCore">Interface ConfigurationBuilder</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_overview">Overview</h3>
+<div class="paragraph">
+<p>The Tamaya builder module provides a generic (one time) builder for creating Configuration instances,
+e.g. as follows:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationBuilder builder = Configuration.createConfigurationBuilder();
 // do something
-Configuration config = builder.build();</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Basically the builder allows to create configuration instances completely independent of the current configuration setup. This gives you full control how and when Configuration is created.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_supported_functionality">Supported Functionality</h3> 
-   <div class="paragraph"> 
-    <p>The builder allows you to add PropertySource instances:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationContextBuilder builder = ConfigurationProvider.getConfigurationContextBuilder();
+Configuration config = builder.build();</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Basically a builder allows to create configuration instances completely independent of the current configuration
+setup. This gives you full control how and when Configuration is created.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_supported_functionality">Supported Functionality</h3>
+<div class="paragraph">
+<p>The builder allows you to add PropertySource instances:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationBuilder builder = Configuration.createConfigurationBuilder();
 builder.addPropertySources(sourceOne, sourceTwo, sourceThree
-Configuration config = ConfigurationProvider.createConfiguration(builder.build());</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Hereby the ordering of the propertysources is not changed, regardless of the ordinals provided by the property sources. This allows alternate ordering policies easily being implemented because creating a configuration based on a configuration context is already implemented and provided by the core API.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Similarly you can add PropertyFilters:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">builder.addPropertyFilters(new MyConfigFilter());</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>…​or PropertySourceProvider instances:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">builder.addPropertySourceProvider(new MyPropertySourceProvider());</code></pre> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="ServiceContext">The ServiceContext</h4> 
-    <div class="paragraph"> 
-     <p>The ServiceContext allows to define how components are loaded in Tamaya. It is the glue layer, which interacts with the underlying runtime system such as Java SE, Java EE, OSGI, VertX etc. The ServiceContext hereby defines access methods to obtain components, whereas itself it is available from the ServiceContextManager singleton:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="title">
-      Accessing the ServiceContext
-     </div> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">ServiceContext serviceContext = ServiceContextManager.getServiceContext();
+Configuration config = builder.build();</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Hereby the ordering of the property sources is not changed, regardless of the ordinals provided
+by the property sources. This allows alternate ordering policies easily being implemented because
+creating a configuration based on a configuration context is already implemented and provided by the core
+API.</p>
+</div>
+<div class="paragraph">
+<p>Similarly you can add PropertyFilters:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">builder.addPropertyFilters(new MyConfigFilter());</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>&#8230;&#8203;or PropertySourceProvider instances:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">builder.addPropertySourceProvider(new MyPropertySourceProvider());</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>&#8230;&#8203;and of course converters and other artifacts.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="ServiceContext">The ServiceContext</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The ServiceContext allows to define how components are loaded in Tamaya. It is the glue layer, which interacts
+with the underlying runtime system such as Java SE, Java EE, OSGI, VertX etc.
+The ServiceContext hereby defines access methods to obtain components, whereas itself it is available from the
+ServiceContextManager singleton:</p>
+</div>
+<div class="listingblock">
+<div class="title">Accessing the ServiceContext</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">// using an explicit classloader (recommended)
+ClassLoader classloader = ...;
+ServiceContext serviceContext = ServiceContextManager.getServiceContext(classloader);
+
+// using the default classloader
+ServiceContext serviceContext = ServiceContextManager.getServiceContext();
 
 public interface ServiceContext{
     int ordinal();
     &lt;T&gt; T getService(Class&lt;T&gt; serviceType);
+    &lt;T&gt; T getService(Class&lt;T&gt; serviceType, Supplier&lt;T&gt; serviceSupplier);
+    &lt;T&gt; T createService(Class&lt;T&gt; serviceType);
+    &lt;T&gt; T createService(Class&lt;T&gt; serviceType, Supplier&lt;T&gt; serviceSupplier);
     &lt;T&gt; List&lt;T&gt; getServices(Class&lt;T&gt; serviceType);
-}</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>With the ServiceContext a component can be accessed in two different ways:</p> 
-    </div> 
-    <div class="olist arabic"> 
-     <ol class="arabic"> 
-      <li> <p>access as as a single property. Hereby the registered instances (if multiple) are sorted by priority and then finally the most significant instance is returned only.</p> </li> 
-      <li> <p>access all items given a type. This will return (by default) all instances loadedable from the current runtime context, ordered by priority (the most significant components added first).</p> </li> 
-     </ol> 
-    </div> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="_examples">Examples</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_accessing_configuration">Accessing Configuration</h3> 
-   <div class="paragraph"> 
-    <p><em>Configuration</em> is obtained from the ConfigurationProvider singleton:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     Accessing Configuration
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ConfigurationProvider.getConfiguration();</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Many users in a SE context will probably only work with <em>Configuration</em>, since it offers all functionality needed for basic configuration with a very lean memory and runtime footprint. In Java 7 access to the keys is very similar to <strong>Map&lt;String,String&gt;</strong>, whereas in Java 8 additionally usage of <em>Optional</em> is supported:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ConfigurationProvider.getConfiguration();
-String myKey = config.get("myKey");                         // may return null
-int myLimit = config.get("all.size.limit", int.class);</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_environment_and_system_properties">Environment and System Properties</h3> 
-   <div class="paragraph"> 
-    <p>By default environment and system properties are included into the <em>Configuration</em>. So we can access the current <em>PROMPT</em> environment variable as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">String prompt = ConfigurationProvider.getConfiguration().get("PROMPT");</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Similary the system properties are directly applied to the <em>Configuration</em>. So if we pass the following system property to our JVM:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">java ... -Duse.my.system.answer=yes</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>we can access it as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">boolean useMySystem = ConfigurationProvider.getConfiguration().get("use.my.system.answer", boolean.class);</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_adding_a_custom_configuration">Adding a Custom Configuration</h3> 
-   <div class="paragraph"> 
-    <p>Adding a classpath based configuration is simply as well: just implement an according <em>PropertySource</em>. With the <em>tamaya-spi-support</em> module you just have to perform a few steps:</p> 
-   </div> 
-   <div class="olist arabic"> 
-    <ol class="arabic"> 
-     <li> <p>Define a PropertySource as follows:</p> </li> 
-    </ol> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">  public class MyPropertySource extends PropertiesResourcePropertySource{
+    &lt;T&gt; List&lt;T&gt; getServices(Class&lt;T&gt; serviceType, Supplier&lt;List&lt;T&gt;&gt; serviceSupplier);
+    &lt;T&gt; T register(Class&lt;T&gt; type, T instance, boolean force);
+    &lt;T&gt; List&lt;T&gt; register(Class&lt;T&gt; type, List&lt;T&gt; instances, boolean force);
+
+    Enumeration&lt;URL&gt; getResources(String resource) throws IOException;
+    URL getResource(String resource);
+
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>With the ServiceContext a component can be accessed in two different ways:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>access as as a single service. Hereby the detected services (if multiple) are sorted by priority and then finally
+the most significant instance (the one with the highest priority value) is selected and cached.</p>
+</li>
+<li>
+<p>access all items given a type. This will return (by default) all service instances loadedable from the current
+runtime context (classloader), ordered by priority (the most significant components added first).</p>
+</li>
+<li>
+<p>service lookup can be further customized by passing suppliers. The supplier is called if no default services
+could be auto-detected. The supplied instance(s) are registered and cached for subsequent accesses.</p>
+</li>
+<li>
+<p>the <em>register</em> methods allow to explcitly register (and optionally override) a service or services
+registered.</p>
+</li>
+<li>
+<p>Finally the methods <code>getResource(s)</code> allow to load resources from the classpath. This is especially useful
+when running in an OSGI context, where loading of resources from the classloaders will fail.</p>
+</li>
+</ol>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_examples">Examples</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_accessing_configuration">Accessing Configuration</h3>
+<div class="paragraph">
+<p><em>Configuration</em> is obtained from the <code>Configuration</code> interface using static accessors:</p>
+</div>
+<div class="listingblock">
+<div class="title">Accessing Configuration</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = Configuration.current();
+Configuration config = Configuration.current(Thread.currentThread().getContextClassLoader());</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Many users in a SE context will probably only work with <em>Configuration</em>, since it offers all functionality
+needed for basic configuration with a very lean memory and runtime footprint. In Java 7 access to the keys is
+very similar to <strong>Map&lt;String,String&gt;</strong>, whereas in Java 8 additionally usage of <em>Optional</em> is supported:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = Configuration.current();
+String myValue = config.get("myKey");                  // access as (raw) String value.
+int myLimit = config.get("all.size.limit", int.class); // access a value using type conversion.
+List&lt;URL&gt; urls = config.get("all.urls", new TypeLiteral&lt;List&lt;URL&gt;&gt;(); // access a value using advanced type conversion.</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_environment_and_system_properties">Environment and System Properties</h3>
+<div class="paragraph">
+<p>By default environment and system properties are included into the <em>Configuration</em>. So we can access the current
+<em>PROMPT</em> environment variable as follows:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">String prompt = ConfigurationProvider.getConfiguration().get("PROMPT");</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Similary the system properties are directly applied to the <em>Configuration</em>. Let&#8217;s assume, we pass the following system
+property to our JVM:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">java ... -Duse.my.system.answer=yes</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>We can then access the value from the configuration:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">boolean useMySystem = Configuration.current().get("use.my.system.answer", boolean.class);</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_adding_additional_configuration_entries">Adding additional configuration entries</h3>
+<div class="paragraph">
+<p>Adding additional configuration entries is simple: just implement an according <code>PropertySource</code> and register
+it with the Java <code>ServiceLoader</code>. Using the <em>tamaya-spi-support</em> extension library you just have to perform a few steps:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Define a PropertySource as follows:</p>
+</li>
+</ol>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">  public class MyPropertySource extends PropertiesResourcePropertySource{
 
     public MyPropertySource(){
         super(ClassLoader.getSystemClassLoader().getResource("META-INF/cfg/myconfig.properties"), DEFAULT_ORDINAL);
     }
-  }</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Then register MyPropertySource using the ServiceLoader by adding the following file:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">META-INF/services/org.apache.tamaya.spi.PropertySource</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>…​containing the following line:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">com.mypackage.MyPropertySource</code></pre> 
-    </div> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="APIImpl">API Implementation</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>The API is implemented by the tamaya-core module. Refer to the <a href="core.html">Core documentation</a> for further details.</p> 
-  </div> 
- </div> 
+  }</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Then register MyPropertySource using the ServiceLoader by adding the following file:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">META-INF/services/org.apache.tamaya.spi.PropertySource</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>&#8230;&#8203;containing the following line:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">com.mypackage.MyPropertySource</code></pre>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="APIImpl">API Implementation</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The Tamaya configuration API is implemented by the tamaya-core module. Refer to the <a href="core.html">Core documentation</a> for
+further details.</p>
+</div>
+<div class="paragraph">
+<p>Furhtermore Tamaya also implements or supports</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>the API as defined by JSR 310 (Config JSR)</p>
+</li>
+<li>
+<p>the Microprofile API</p>
+</li>
+<li>
+<p>the Spring Configuration Mechanism</p>
+</li>
+<li>
+<p>integration with the OSGI <code>ConfigAdmin</code> API.</p>
+</li>
+<li>
+<p>the Apache Camel Configuration SPI</p>
+</li>
+</ul>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -968,9 +1395,9 @@ int myLimit = config.get("all.size.limit", int.class);</code></pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/documentation/core.html b/documentation/core.html
index 1fdbf31..c1614fb 100644
--- a/documentation/core.html
+++ b/documentation/core.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../sitemap.xml">Sitemap</a></li>
-						<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="../sitemap.xml">Sitemap</a></li>
+			<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,349 +128,457 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div class="sect1"> 
- <h2 id="Core">Tamaya Core Implementation</h2> 
- <div class="sectionbody"> 
-  <div class="sect2"> 
-   <h3 id="_overview">Overview</h3> 
-   <div class="paragraph"> 
-    <p>Tamaya Core provides an implementation of the <a href="api.html">Tamaya Configuration API</a> and adds additional functionality and building blocks for supporting SPI implementations.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Tamaya Core contains the following artifacts:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p><strong>tamaya-spisupport</strong> provides implementations and base classes for different API artifacts such as Configuration, ConfigurationContext, ConfigurationContextBuilder, ConfigurationProviderSpi, BasePropertySource and more. It is built as an independent core module, which also can be used with other implementations. The <strong>tamaya-core</strong> implementation leverages these base classes to build up a full API implementation.</p> </li> 
-     <li> <p>A java.util.ServiceLoader based ServiceContext implementation. This allows component priorization based on the @Priority annotations.</p> </li> 
-     <li> <p>A PropertyConverterManager that loads and stores references to all the preconfigured PropertyConverter instances, thus providing type conversion for all important types.</p> </li> 
-     <li> <p>A simple default configuration setup using the current classpath and an optional staging variable.</p> </li> 
-     <li> <p>It collects all PropertySource and PropertySourceProvider instances registered with the ServiceLoader and registers them in the global ConfigurationContext</p> </li> 
-     <li> <p>It provides a ConfigurationContextBuilder implementation (DefaultConfigurationContextBuilder) and allows to change the current ConfigurationContext.</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The overall size of the library is very small. All required components are implemented and registered, so basically the Core module is a complete configuration solution. Nevertheless it is also very minimalistic, but fortunately is flexible enough to be extended/accommodated with additional features as needed, such as</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>placeholder and resolution mechanisms (org.apache.tamaya.ext:tamaya-resolver)</p> </li> 
-     <li> <p>dynamic resource path lookup, e.g. with ant styled patterns (org.apache.tamaya.ext:tamaya-resources)</p> </li> 
-     <li> <p>configuration injection and configuration templates (org.apache.tamaya.ext:tamaya-injcetion-api)</p> </li> 
-     <li> <p>abstraction for reusable formats (org.apache.tamaya.ext:tamaya-formats)</p> </li> 
-     <li> <p>integration with other existing solutions (e.g. org.apache.tamaya.ext:tamaya-spring)</p> </li> 
-     <li> <p>configuration and configuration isolation targeting Java EE (org.apache.tamaya.ext:tamaya-injection-ee)</p> </li> 
-     <li> <p>dynamic configuration and configuration updates (org.apache.tamaya.ext:tamaya-events)</p> </li> 
-     <li> <p>remote configuration (org.apache.tamaya.ext:tamaya-etcd, org.apache.tamaya.ext:tamaya-consul, org.apache.tamaya.ext:tamaya-hazelcast)</p> </li> 
-     <li> <p>and more</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>For details about the extension modules available and their functionality refer to the <a href="extensions.html">extension user guide</a>.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="CorePropertyConverters">Default PropertyConverters</h3> 
-   <div class="paragraph"> 
-    <p>The <em>SPI</em> base module provides several PropertyConverter implementations, which are automatically registered by the <em>Core</em> module. Find below the listing of converters automatically registered with the Core module:</p> 
-   </div> 
-   <table class="tableblock frame-1 grid-all spread"> 
-    <colgroup> 
-     <col style="width: 33.3333%;"> 
-     <col style="width: 33.3333%;"> 
-     <col style="width: 33.3334%;"> 
-    </colgroup> 
-    <thead> 
-     <tr> 
-      <th class="tableblock halign-left valign-top"><em>Target Type</em></th> 
-      <th class="tableblock halign-left valign-top"><em>Class Name</em></th> 
-      <th class="tableblock halign-left valign-top"><em>Supported Formats</em></th> 
-     </tr> 
-    </thead> 
-    <tbody> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.math.BigDecimal</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">BigDecimalConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">1.2345, 0xFF</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.math.BigInteger</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">BigIntegerConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">0xFF, 1234</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Boolean</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">BooleanConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">true, false, T, F, 1 ,0</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Byte</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">ByteConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">0xFF, MIN_VALUE, MAX_VALUE, 123</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Character</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">CharConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">0xFF, 'a', 'H', 123</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Class</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">ClassConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">&lt;fully qualified class name&gt;</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.util.Currency</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">CurrencyConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">CHF, 123</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Double</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">DoubleConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY, MIN_VALUE, MAX_VALUE</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><em>Enums</em></p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">EnumConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">&lt;Enum item name&gt;</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Float</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">FloatConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY, MIN_VALUE, MAX_VALUE</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Integer</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">IntegerConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xD3, MIN_VALUE, MAX_VALUE</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">LocalDate</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">LocalDateConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">&lt;Date as defined by LocalDate.parse(String)</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">LocalTime</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">LocalTimeConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">&lt;Time as defined by LocalTime.parse(String)</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">LocalDateTime</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">LocalDateTimeConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">&lt;LocalDateTime as defined by LocalDateTime.parse(String)&gt;</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Long</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">LongConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xD3, MIN_VALUE, MAX_VALUE</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Number</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">NumberConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Short</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">ShortConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xD3, MIN_VALUE, MAX_VALUE</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.net.URI</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">URIConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://localhost:2020/testresource?api=true" class="bare">http://localhost:2020/testresource?api=true</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">java.net.URL</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">URLConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://localhost:2020/testresource?api=true" class="bare">http://localhost:2020/testresource?api=true</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">ZoneId</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">ZoneIdConverter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Europe/Zurich</p></td> 
-     </tr> 
-    </tbody> 
-   </table> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_registering_propertyconverters">Registering PropertyConverters</h3> 
-   <div class="paragraph"> 
-    <p>Additional PropertyConverters can be implemented easily. It is recommended to register them using the java.util.ServiceLoader, meaning you add a file under META-INF/service/org.apache.tamaya.spi.PropertyConverter containing the fully qualified class names of the converters to be registered (one line each) to enable auto-discovery.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Alternatively you can also use a ConfigurationContextBuilder to add additional converters programmatically.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="ComponentLoadingAndPriorization">Component Loading and Priorization</h3> 
-   <div class="paragraph"> 
-    <p>Tamaya <em>Core</em> in general loads all components by default using the java.util.ServiceLoader mechanism. This means that new components must be registered by adding a file under META-INF/service/&lt;myInterfaceName&gt; containing the fully qualified implementation class names of the components to be registered (one line per each). The ServiceLoader itself does not provide any functionality for overriding or ordering of components. Tamaya <em>Core</em> adds such a functionality [...]
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>if a <em>singleton</em> component is accessed from the current ServiceContext the component with the higher value effectively <em>overrides/replaces</em> any component with lower values.</p> </li> 
-     <li> <p>if a <em>collection</em> of components is obtained from the ServiceContext the components are <em>ordered</em> based on their priorities, where the ones with higher priority are before components with lower priority.</p> </li> 
-     <li> <p>if priorities <em>match</em> Tamaya <em>Core</em> additionally sorts them using the <em>simple class name</em>. This ensures that ordering is still defined and predictable in all scenarios.</p> </li> 
-    </ul> 
-   </div> 
-   <div class="admonitionblock note"> 
-    <table> 
-     <tbody>
-      <tr> 
-       <td class="icon"> 
-        <div class="title">
-         Note
-        </div> </td> 
-       <td class="content"> Sorting the property sources based on their ordinal value is only the default ordering principle applied. By implementing your own implementation of ConfigurationProviderSpi you can apply a different logic: </td> 
-      </tr> 
-     </tbody>
-    </table> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="RegisteringPropertySources">Registering Property Sources</h3> 
-   <div class="paragraph"> 
-    <p>PropertySource implementations that provide configuration properties are registered as components as described in the previous section. Hereby the precedence (ordering) of property sources is not hard-coded. Instead a Comparator&lt;PropertySource&gt; can be passed to a ConfigurationContextBuilder to perform automatic ordering of the property sources registered. The default implementation hereby implements the following logic:</p> 
-   </div> 
-   <div class="olist arabic"> 
-    <ol class="arabic"> 
-     <li> <p>It checks for an property entry tamaya.ordinal if present the value is parsed into an int value and used as the ordinal val value.</p> </li> 
-     <li> <p>It checks for an explicit method int getOrdinal(), if found its value is taken as an ordinal.</p> </li> 
-     <li> <p>It checks for a @Priority annotation, if present the priority value is used as an ordinal.</p> </li> 
-     <li> <p>If none of the above works, 0 is assumed as ordinal value.</p> </li> 
-     <li> <p>If multiple PropertySource instances share the same ordinal value, they are ordered based on their fully qualified class names.</p> </li> 
-    </ol> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Custom implementations of the property source comparator can be applied by calling ConfigurationContextBuilder.sortPropertySources(Comparator&lt;PropertySource&gt;). The default comparator can be replaced by passing the fully qualified comparator class name as system property:</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>-Dproperty-source-comparator=a.b.c.MyComparatorClass</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The ladder allows to adapt the ordering of auto-discovered property sources, even if the value returned by int getOrdinal() cannot be changed.</p> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="CorePropertySources">Configuration Setup in Core</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Tamaya Core provides a minimal configuration setting, that allows you to configure SE applications already easily. Basically configuration is built up by default as follows:</p> 
-  </div> 
-  <div class="olist arabic"> 
-   <ol class="arabic"> 
-    <li> <p>Read environment properties and add them prefixed with env.</p> </li> 
-    <li> <p>Read all files found at META-INF/javaconfiguration.properties and META-INF/javaconfiguration.xml</p> </li> 
-   </ol> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_overview_of_registered_default_property_sources_and_providers">Overview of Registered Default Property Sources and Providers</h3> 
-   <div class="paragraph"> 
-    <p>The Tamaya Core implementation provides a couple of default PropertySource implementations, which are automatically registered. They are all in the package org.apache.tamaya.spisupport.propertysource and org.apache.tamaya.core.provider:</p> 
-   </div> 
-   <table class="tableblock frame-1 grid-all spread"> 
-    <colgroup> 
-     <col style="width: 33.3333%;"> 
-     <col style="width: 33.3333%;"> 
-     <col style="width: 33.3334%;"> 
-    </colgroup> 
-    <thead> 
-     <tr> 
-      <th class="tableblock halign-left valign-top"><em>Type</em></th> 
-      <th class="tableblock halign-left valign-top"><em>Class Name</em></th> 
-      <th class="tableblock halign-left valign-top"><em>Ordinal Used</em></th> 
-     </tr> 
-    </thead> 
-    <tbody> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">META-INF/javaconfiguration.properties</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">JavaConfigurationProvider</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">100</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">META-INF/javaconfiguration.xml</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">JavaConfigurationProvider</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">100</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">JNDI Entries</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">JNDIPropertySource</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Environment Properties</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">EnvironmentPropertySource</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">300</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">System Properties</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">SystemPropertySource</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">1000</p></td> 
-     </tr> 
-    </tbody> 
-   </table> 
-   <div class="admonitionblock note"> 
-    <table> 
-     <tbody>
-      <tr> 
-       <td class="icon"> 
-        <div class="title">
-         Note
-        </div> </td> 
-       <td class="content"> Similarly to property converters the property sources shown here are defined within the "tamaya-spisupport* module and automatically registered with the <strong>tamaya-core</strong> implementation using Tamaya’s auto-discovery mechanisms. </td> 
-      </tr> 
-     </tbody>
-    </table> 
-   </div> 
-   <div class="admonitionblock note"> 
-    <table> 
-     <tbody>
-      <tr> 
-       <td class="icon"> 
-        <div class="title">
-         Note
-        </div> </td> 
-       <td class="content"> JNDIPropertySource is provided by the <code>tamaya-jndi</code> extension module. </td> 
-      </tr> 
-     </tbody>
-    </table> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_abstract_class_propertiesfilepropertysource">Abstract Class PropertiesFilePropertySource</h3> 
-   <div class="paragraph"> 
-    <p>The abstract class PropertiesFilePropertySource can be used for implementing a PropertySource based on a URL instance that points to a .properites file. It requires a URL to be passed on the constructor:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertiesFilePropertySource(URL url);</code></pre> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_abstract_class_propertiespropertysource">Abstract Class PropertiesPropertySource</h4> 
-    <div class="paragraph"> 
-     <p>The abstract class PropertiesPropertySource can be used for implementing a PropertySource based on a Properties instance. It requires a PropertySource to be passed on the constructor:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertiesPropertySource(Properties properties);</code></pre> 
-     </div> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_abstract_class_basepropertysource">Abstract Class BasePropertySource</h4> 
-    <div class="paragraph"> 
-     <p>The abstract class BasePropertySource can be used for implementing custom PropertySource classes. It requires only one method to implemented:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="title">
-      Implementing a PropertySource using BasePropertySource
-     </div> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public class MyPropertySource extends BasePropertySource{
+			<p><div class="sect1">
+<h2 id="Core">Apache Tamaya: Core Implementation</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_overview">Overview</h3>
+<div class="paragraph">
+<p><code>tamaya-core</code> provides an implementation of the <a href="api.html">Tamaya Configuration API</a> and adds additional functionality
+and building blocks for supporting SPI implementations.</p>
+</div>
+<div class="paragraph">
+<p>Tamaya Core contains the following artifacts:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>A service loader implementation, configurations and further logic required to run
+in an OSGI environment.</p>
+</li>
+<li>
+<p>Numerous <strong>converters</strong>, including an EnumConverter, that is a converter implementation that can automatically select
+the currect enumeration values based on a configured entry.</p>
+</li>
+<li>
+<p>A configurable `BannerManager`to print Tamaya&#8217;s start logo on load.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Basically <code>tamaya-core</code> leverages the base implementations contained in Tamaya&#8217;s SPI support module, so it is quite
+small in size. All required components are implemented and registered, so basically the
+Core module with its trasitive dependencies (API and spi-support) is a complete configuration solution. Nevertheless
+it is also very minimalistic, but fortunately it can be easily extended/accommodated with additional features as needed.</p>
+</div>
+<div class="paragraph">
+<p>These extensions are managed in the extensions repository of the Tamaya project. Some of the most commonly used
+extensions are</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>placeholder and resolution mechanisms (org.apache.tamaya.ext:tamaya-resolver)</p>
+</li>
+<li>
+<p>dynamic resource path lookup, e.g. with ant styled patterns (org.apache.tamaya.ext:tamaya-resources)</p>
+</li>
+<li>
+<p>configuration injection and configuration templates (org.apache.tamaya.ext:tamaya-injcetion-api)</p>
+</li>
+<li>
+<p>abstraction for reusable formats (org.apache.tamaya.ext:tamaya-formats)</p>
+</li>
+<li>
+<p>integration with other existing solutions (e.g. org.apache.tamaya.ext:tamaya-spring)</p>
+</li>
+<li>
+<p>configuration and configuration isolation targeting Java EE (org.apache.tamaya.ext:tamaya-injection-ee)</p>
+</li>
+<li>
+<p>dynamic configuration and configuration updates (org.apache.tamaya.ext:tamaya-events)</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>For details about the extension modules available and  their functionality refer to the <a href="extensions.html">extension
+user guide</a>.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="CorePropertyConverters">Default PropertyConverters</h3>
+<div class="paragraph">
+<p>The <code>tamaya-core</code> module provides several PropertyConverter implementations, which are automatically registered:</p>
+</div>
+<table class="tableblock frame-1 grid-all stretch">
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top"><em>Target Type</em></th>
+<th class="tableblock halign-left valign-top"><em>Class Name</em></th>
+<th class="tableblock halign-left valign-top"><em>Supported Formats</em></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.math.BigDecimal</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">BigDecimalConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1.2345, 0xFF</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.math.BigInteger</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">BigIntegerConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">0xFF, 1234</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Boolean</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">BooleanConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">true, false, T, F, 1 ,0</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Byte</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ByteConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">0xFF, MIN_VALUE, MAX_VALUE, 123</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Character</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">CharConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">0xFF, 'a', 'H', 123</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Class</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ClassConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">&lt;fully qualified class name&gt;</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.util.Currency</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">CurrencyConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">CHF, 123</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Double</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">DoubleConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY, MIN_VALUE, MAX_VALUE</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.time.Duration</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">DurationConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">&lt;Duration as defined by Duration.parse(String)&gt;</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.io.File</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">FileConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">value &#8594; new File(value)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Float</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">FloatConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY, MIN_VALUE, MAX_VALUE</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.time.Instant</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">InstantConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">&lt;Instant as defined by Instant.parse(String)&gt;</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Integer</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">IntegerConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xD3, MIN_VALUE, MAX_VALUE</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.time.LocalDate</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LocalDateConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">&lt;Date as defined by LocalDate.parse(String)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.time.LocalDateTime</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LocalDateTimeConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">&lt;LocalDateTime as defined by LocalDateTime.parse(String)&gt;</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.time.LocalTime</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LocalTimeConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">&lt;Time as defined by LocalTime.parse(String)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Long</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LongConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xD3, MIN_VALUE, MAX_VALUE</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Number</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">NumberConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xFF, 1.2334, NaN, NEGATIVE_INFITIY, POSITIVE_INFINITY</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.time.OffsetDateTime</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">OffsetDateTimeConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">&lt;OffsetDateTime as defined by OffsetDateTime.parse(String)&gt;</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.time.OffsetTime</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">OffsetTimeConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">&lt;OffsetTime as defined by OffsetTime.parse(String)&gt;</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.util.Optional</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">OptionalConverter</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.nio.Path</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">PathConverter</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.ui.lang.Short</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ShortConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1, 0xD3, MIN_VALUE, MAX_VALUE</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.util.Supplier</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">SupplierConverter</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.net.URI</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">URIConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://localhost:2020/testresource?api=true" class="bare">http://localhost:2020/testresource?api=true</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.net.URL</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">URLConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://localhost:2020/testresource?api=true" class="bare">http://localhost:2020/testresource?api=true</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><em>Enums</em></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">EnumConverter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">&lt;Enum item name&gt;</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_registering_propertyconverters">Registering PropertyConverters</h3>
+<div class="paragraph">
+<p>Additional PropertyConverter classes can be implemented easily. It is recommended to register them using
+the java.util.ServiceLoader, meaning you add a file under META-INF/service/org.apache.tamaya.spi.PropertyConverter
+containing the fully qualified class names of the converters to be registered (one line each) to enable
+auto-discovery.</p>
+</div>
+<div class="paragraph">
+<p>Alternatively you can also use a ConfigurationBuilder to add additional converters
+programmatically.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="ComponentLoadingAndPriorization">Component Loading and Priorization</h3>
+<div class="paragraph">
+<p>Tamaya <em>Core</em> in general loads all components by default using the java.util.ServiceLoader mechanism. This means that
+new components must be registered by adding a file under META-INF/service/&lt;myInterfaceName&gt; containing the fully
+qualified implementation class names of the components to be registered (one line per each).
+The ServiceLoader itself does not provide any functionality for overriding or ordering of
+components. Tamaya <em>Core</em> adds such a functionality with the possibility to add @Priority
+annotations to the components registered. By default, and if no annotation is added 0 is assumed
+as priority. Hereby higher values preceed lower values, meaning</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>if a <em>singleton</em> component is accessed from the current ServiceContext the component with the
+higher value effectively <em>overrides/replaces</em> any component with lower values.</p>
+</li>
+<li>
+<p>if a <em>collection</em> of components is obtained from the ServiceContext the components are <em>ordered</em>
+based on their priorities, where the ones with higher priority are before components with lower
+priority.</p>
+</li>
+<li>
+<p>if priorities <em>match</em> Tamaya <em>Core</em> additionally sorts them using the <em>simple class name</em>.
+This ensures that ordering is still defined and predictable in all scenarios.</p>
+</li>
+</ul>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+Sorting the property sources based on their ordinal value is only the default ordering
+      principle applied. By implementing your own implementation of ConfigurationProviderSpi
+      you can apply a different logic:
+</td>
+</tr>
+</table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="RegisteringPropertySources">Registering Property Sources</h3>
+<div class="paragraph">
+<p>PropertySource implementations that provide configuration properties are registered as components as described in the
+previous section. Hereby the precedence (ordering) of property sources is not hard-coded. Instead a Comparator&lt;PropertySource&gt;
+can be passed to a ConfigurationBuilder to perform automatic ordering of the property sources
+registered. The default implementation hereby implements the following logic:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>It checks for an property entry tamaya.ordinal if present the value is parsed into an int value and used as
+the ordinal val value.</p>
+</li>
+<li>
+<p>It checks for an explicit method int getOrdinal(), if found its value is taken as an ordinal.</p>
+</li>
+<li>
+<p>It checks for a @Priority annotation, if present the priority value is used as an ordinal.</p>
+</li>
+<li>
+<p>If none of the above works, 0 is assumed as ordinal value.</p>
+</li>
+<li>
+<p>If multiple PropertySource instances share the same ordinal value, they are ordered based on their fully qualified
+class names.</p>
+</li>
+</ol>
+</div>
+<div class="paragraph">
+<p>Custom implementations of the property source comparator can be applied by calling
+ConfigurationContextBuilder.sortPropertySources(Comparator&lt;PropertySource&gt;). The default comparator can be replaced
+by passing the fully qualified comparator class name as system property:</p>
+</div>
+<div class="paragraph">
+<p>-Dproperty-source-comparator=a.b.c.MyComparatorClass</p>
+</div>
+<div class="paragraph">
+<p>The ladder allows to adapt the ordering of auto-discovered property sources, even if the value returned by
+int getOrdinal() cannot be changed.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="CorePropertySources">Configuration Setup in Core</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya Core provides a minimal configuration setting, that allows you to configure SE
+applications already easily. Basically configuration is built  up by default as follows:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Read environment properties and add them prefixed with env.</p>
+</li>
+<li>
+<p>Read all files found at META-INF/javaconfiguration.properties
+and META-INF/javaconfiguration.xml</p>
+</li>
+</ol>
+</div>
+<div class="sect2">
+<h3 id="_overview_of_registered_default_property_sources_and_providers">Overview of Registered Default Property Sources and Providers</h3>
+<div class="paragraph">
+<p>The Tamaya Core implementation provides a couple of default PropertySource implementations, which are automatically
+registered. They are all in the package org.apache.tamaya.spisupport.propertysource and
+org.apache.tamaya.core.provider:</p>
+</div>
+<table class="tableblock frame-1 grid-all stretch">
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top"><em>Type</em></th>
+<th class="tableblock halign-left valign-top"><em>Class Name</em></th>
+<th class="tableblock halign-left valign-top"><em>Ordinal Used</em></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">META-INF/javaconfiguration.properties</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">JavaConfigurationProvider</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">100</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">META-INF/javaconfiguration.xml</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">JavaConfigurationProvider</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">100</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">JNDI Entries</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">JNDIPropertySource</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Environment Properties</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">EnvironmentPropertySource</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">300</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">System Properties</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">SystemPropertySource</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1000</p></td>
+</tr>
+</tbody>
+</table>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+Similarly to property converters the property sources shown here are defined within the "tamaya-spisupport* module
+      and automatically registered with the <strong>tamaya-core</strong> implementation using Tamaya&#8217;s auto-discovery mechanisms.
+</td>
+</tr>
+</table>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+JNDIPropertySource is provided by the <code>tamaya-jndi</code> extension module.
+</td>
+</tr>
+</table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_abstract_class_propertiesfilepropertysource">Abstract Class PropertiesFilePropertySource</h3>
+<div class="paragraph">
+<p>The abstract class PropertiesFilePropertySource can be used for implementing a PropertySource based on a URL
+instance that points to a .properites file. It requires a URL to be passed on the constructor:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertiesFilePropertySource(URL url);</code></pre>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_abstract_class_propertiespropertysource">Abstract Class PropertiesPropertySource</h4>
+<div class="paragraph">
+<p>The abstract class PropertiesPropertySource can be used for implementing a PropertySource based on a Properties
+instance. It requires a PropertySource to be passed on the constructor:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertiesPropertySource(Properties properties);</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_abstract_class_basepropertysource">Abstract Class BasePropertySource</h4>
+<div class="paragraph">
+<p>The abstract class BasePropertySource can be used for implementing custom PropertySource classes. It requires only
+one method to implemented:</p>
+</div>
+<div class="listingblock">
+<div class="title">Implementing a PropertySource using BasePropertySource</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public class MyPropertySource extends BasePropertySource{
 
     public String getName(){
         // return a unique name for the property source, e.g. based on the underlying resource. This name also
@@ -481,28 +592,35 @@
         // by default property sources are assumed to be scannable.
     }
 
-}</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>By default the ordinal of the property sources will be 1000, unless the key tamaya.ordinal as defined in PropertySource.TAMAYA_ORDINAL is present in the current PropertySource. Of course it is also possible to override the inherited protected void initializeOrdinal(final int defaultOrdinal), or directly int getOrdinal().</p> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="CorePropertySourceProviders">Default PropertySourceProvider in Core</h3> 
-   <div class="paragraph"> 
-    <p>With org.apache.tamaya.core.provider.JavaConfigurationProvider there is also a default PropertySourceProvider present that loads all .properties files found at META-INF/javaconfiguration.properties and META-INF/javaconfiguration.xml.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_replacing_the_property_value_evaluation_policy">Replacing the property value evaluation policy</h3> 
-   <div class="paragraph"> 
-    <p>Tamaya’s core implementation allows to replace the complete logic how a configuration value or the current configuration properties are calculated from a given ConfigurationContext by implementing the ConfigValueEvaluator interface:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">/**
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>By default the ordinal of the property sources will be 1000, unless the key tamaya.ordinal
+as defined in PropertySource.TAMAYA_ORDINAL is present in the current PropertySource. Of course
+it is also possible to override the inherited protected void initializeOrdinal(final int defaultOrdinal),
+or directly int getOrdinal().</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="CorePropertySourceProviders">Default PropertySourceProvider in Core</h3>
+<div class="paragraph">
+<p>With org.apache.tamaya.core.provider.JavaConfigurationProvider there is also a default PropertySourceProvider
+present that loads all .properties files found at META-INF/javaconfiguration.properties
+and META-INF/javaconfiguration.xml.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_replacing_the_property_value_evaluation_policy">Replacing the property value evaluation policy</h3>
+<div class="paragraph">
+<p>Tamaya&#8217;s core implementation allows to replace the complete logic how a configuration value or the current configuration
+properties are calculated from a given ConfigurationContext by implementing the ConfigValueEvaluator
+interface:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">/**
  * Component SPI which encapsulates the evaluation of a single or full &lt;b&gt;raw&lt;/b&gt;value
  * for a {@link ConfigurationContext}.
  */
@@ -523,37 +641,42 @@ public interface ConfigValueEvaluator {
      */
     Iterable&lt;PropertyValue&gt; evaluateRawValues(ConfigurationContext context);
 
-}</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The default implementation DefaultConfigValueEvaluator implements the following logic:</p> 
-   </div> 
-   <div class="olist arabic"> 
-    <ol class="arabic"> 
-     <li> <p>Collect all PropertySources from the context.</p> </li> 
-     <li> <p>Access PropertyValue get(String) (single key access)/ Map&lt;String,PropertyValue&gt; getProperties() (config map access) from each property source and combine the previous with the next value using the PropertyValueCombinationPolicy in place.</p> </li> 
-    </ol> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The resulting <em>raw</em> value(s) are then finally handed over to the registered filters and finally converted to String/Map&lt;String,String&gt; as required by the user API.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>To replace this default behaviour you must register your implementation with the current ServiceContext.</p> 
-   </div> 
-  </div> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="Extensions">Adding Extensions</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Tamaya <em>Core</em> only implements the <a href="api.html">API</a>. Many users require/wish additional functionality from a configuration system. Fortunately there are numerous extensions available that add further functionality. Loading extensions hereby is trivial: you only are required to add the corresponding dependency to the classpath.</p> 
-  </div> 
-  <div class="paragraph"> 
-   <p>For detailed information on the extensions available refer to the <a href="extensions.html">extensions documentation</a>.</p> 
-  </div> 
- </div> 
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The default implementation DefaultConfigValueEvaluator implements the following logic:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Collect all PropertySources from the context.</p>
+</li>
+<li>
+<p>Access PropertyValue get(String) (single key access)/ Map&lt;String,PropertyValue&gt; getProperties()
+(config map access) from each property source and combines the previous with the next value.</p>
+</li>
+</ol>
+</div>
+<div class="paragraph">
+<p>The resulting <em>raw</em> value(s) are then finally handed over to the registered filters and finally
+converted to the target type as required by the user API.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="Extensions">Adding Extensions</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>Core</em> only implements the <a href="api.html">API</a>. Many users require/wish additional functionality from a
+configuration system. Fortunately there are numerous extensions available that add further functionality.
+Loading extensions hereby is trivial: you only are required to add the corresponding dependency to the classpath.</p>
+</div>
+<div class="paragraph">
+<p>For detailed information on the extensions available refer to the <a href="extensions.html">extensions documentation</a>.</p>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -564,9 +687,9 @@ public interface ConfigValueEvaluator {
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/documentation/extensions.html b/documentation/extensions.html
index 343b76d..d5c3965 100644
--- a/documentation/extensions.html
+++ b/documentation/extensions.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../sitemap.xml">Sitemap</a></li>
-						<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="../sitemap.xml">Sitemap</a></li>
+			<li><a href="../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,268 +128,234 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div class="sect1"> 
- <h2 id="_apache_tamaya_extension_modules">Apache Tamaya: Extension Modules</h2> 
- <div class="sectionbody"> 
-  <!-- toc disabled --> 
-  <div class="sect2"> 
-   <h3 id="_mature_extensions">Mature Extensions</h3> 
-   <div class="paragraph"> 
-    <p>Mature extensions have a stable API and SPI, similar to the API and Implementations provided.</p> 
-   </div> 
-   <table class="tableblock frame-1 grid-all spread"> 
-    <colgroup> 
-     <col style="width: 33.3333%;"> 
-     <col style="width: 33.3333%;"> 
-     <col style="width: 33.3334%;"> 
-    </colgroup> 
-    <thead> 
-     <tr> 
-      <th class="tableblock halign-left valign-top"><em>Artifact</em></th> 
-      <th class="tableblock halign-left valign-top"><em>Description</em></th> 
-      <th class="tableblock halign-left valign-top"><em>Links</em></th> 
-     </tr> 
-    </thead> 
-    <tbody> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">N/A: currently no extensions have reached that maturity level.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">-</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-collections</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Collections support.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_collections.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-events</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides support for publishing configuration changes</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_events.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-filter</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides a programmatic filter for config entries.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_filter.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-features</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides a simple feature check for loaded extensions.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_features.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-formats</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides an abstract model for configuration formats</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_formats.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-functions</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides several functional extension points.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_functions.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-injection-api</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides Tamaya’s injection annotations API.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_injection.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-injection</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides configuration injection services and configuration template support.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_injection.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-injection-cdi</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Java EE/standalone compliant CDI integration using CDI for injection.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_cdi.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-jndi</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides a JNDI based PropertySource.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_jndi.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-json</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides format support for JSON based configuration.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_json.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-microprofile</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Implemenation and Integration with the Microprofile API.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_microprofile.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-mutable-config</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides API/SPI for writing configuration</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_mutable_config.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-optional</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Lets a Tamaya configuration to be used as an optional project extension only.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_optional.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-osgi</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Integration with OSGI containers.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_osgi.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-resolver</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides placeholder and dynamic resolution functionality for configuration values.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_resolver.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-resources</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides ant-style resource path resolution</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_resources.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-spring</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Integration for Spring / Spring Boot.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_spring.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-yaml</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Support for using yaml as a configuration format.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_yaml.html">Documentation</a></p></td> 
-     </tr> 
-    </tbody> 
-   </table> 
-   <div class="admonitionblock note"> 
-    <table> 
-     <tbody>
-      <tr> 
-       <td class="icon"> 
-        <div class="title">
-         Note
-        </div> </td> 
-       <td class="content"> The former Tamaya <em>Builder</em> extension module has been removed. The corresponding methods were integrated into Tamaya’s main API’s ConfigurationContextBuilder interface. </td> 
-      </tr> 
-     </tbody>
-    </table> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_extensions_sandbox">Extensions Sandbox</h3> 
-   <div class="paragraph"> 
-    <p>Extensions in <em>draft state</em> rather experimental or not yet very mature. API changes may occurr at any time and the may also have severe issues or even not work at all. So use at your own risk or join and help us getting them stable and well tested!</p> 
-   </div> 
-   <div class="admonitionblock note"> 
-    <table> 
-     <tbody>
-      <tr> 
-       <td class="icon"> 
-        <div class="title">
-         Note
-        </div> </td> 
-       <td class="content"> All extensions currently require Java 8. </td> 
-      </tr> 
-     </tbody>
-    </table> 
-   </div> 
-   <table class="tableblock frame-1 grid-all spread"> 
-    <colgroup> 
-     <col style="width: 33.3333%;"> 
-     <col style="width: 33.3333%;"> 
-     <col style="width: 33.3334%;"> 
-    </colgroup> 
-    <thead> 
-     <tr> 
-      <th class="tableblock halign-left valign-top"><em>Artifact</em></th> 
-      <th class="tableblock halign-left valign-top"><em>Description</em></th> 
-      <th class="tableblock halign-left valign-top"><em>Links</em></th> 
-     </tr> 
-    </thead> 
-    <tbody> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-camel_beta</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Integration with Apache Camel.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_camel.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-classloader-support</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Configuration services considering classloaderas.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_classloader_support.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-commons_beta</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Integration Support for Apache Commons.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">-</p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-configured-sysprops_beta</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Tamaya configuration to be provided as System.getProperties().</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_sysprops.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-consul_beta</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Integration with consul clusters.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_consul.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-etcd_beta</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Integration with etcd clusters.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_etcd.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-hazelcast_beta</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Integration with Hazelcast datagrids.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_hazelcast.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-jodatime_beta</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides support for JodaTime.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_jodatime.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-management_alpha</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides JMX support for inspecting configuration.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_management.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-metamodel_alpha</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides an XML API for building configuration.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_metamodel-staged.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-remote_alpha</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Remote configuration support using the server API.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_remote.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-server_alpha</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Publishes configuration as a REST service.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_server.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-ui_alpha</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides a web UI for a VM running Tamaya.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_ui.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-uom_beta</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides additional converters based on the Units of Measurement JSR.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_uom.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-usagetracker_beta</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Allows tracking of configuration usage.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_usagetracker.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-validation-alpha</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides an XML API for validating configuration.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_validation.html">Documentation</a></p></td> 
-     </tr> 
-     <tr> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-vertx-alpha</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock">Provides Vertx integration.</p></td> 
-      <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_vertx.html">Documentation</a></p></td> 
-     </tr> 
-    </tbody> 
-   </table> 
-  </div> 
- </div> 
+			<p><div class="sect1">
+<h2 id="_apache_tamaya_extension_modules">Apache Tamaya: Extension Modules</h2>
+<div class="sectionbody">
+<!-- toc disabled -->
+<div class="sect2">
+<h3 id="_mature_extensions">Mature Extensions</h3>
+<div class="paragraph">
+<p>Mature extensions have a stable API and SPI, similar to the API and Implementations provided.</p>
+</div>
+<table class="tableblock frame-1 grid-all stretch">
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top"><em>Artifact</em></th>
+<th class="tableblock halign-left valign-top"><em>Description</em></th>
+<th class="tableblock halign-left valign-top"><em>Links</em></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-collections</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Collections support.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_collections.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-consul</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Integration with consul clusters.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_consul.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-etcd</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Integration with etcd clusters.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_etcd.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-events</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides support for publishing configuration changes</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_events.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-filter</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides a programmatic filter for config entries.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_filter.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-features</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides a simple feature check for loaded extensions.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_features.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-formats</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides an abstract model for configuration formats</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_formats.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-functions</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides several functional extension points.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_functions.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-hazelcast</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Integration with Hazelcast datagrids.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_hazelcast.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-injection-api</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides Tamaya&#8217;s injection annotations API.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_injection.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-injection</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides configuration injection services and configuration template support.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_injection.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-injection-cdi</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Java EE/standalone compliant CDI integration using CDI for injection.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_cdi.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-jndi</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides a JNDI based PropertySource.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_jndi.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-json</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides format support for JSON based configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_json.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-microprofile</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Implemenation and Integration with the Microprofile API.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_microprofile.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-mutable-config</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides API/SPI for writing configuration</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_mutable_config.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-optional</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Lets a Tamaya configuration to be used as an optional project extension only.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_optional.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-osgi</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Integration with OSGI containers.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_osgi.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-resolver</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides placeholder and dynamic resolution functionality for configuration values.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_resolver.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-resources</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides ant-style resource path resolution</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_resources.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-spring</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Integration for Spring / Spring Boot.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_spring.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-yaml</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Support for using yaml as a configuration format.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_yaml.html">Documentation</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_extensions_sandbox">Extensions Sandbox</h3>
+<div class="paragraph">
+<p>Extensions in <em>draft state</em> rather experimental or not yet very mature. API changes may occurr at any time
+and the may also have severe issues or even not work at all. So use at your own risk or join and help
+us getting them stable and well tested!</p>
+</div>
+<table class="tableblock frame-1 grid-all stretch">
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top"><em>Artifact</em></th>
+<th class="tableblock halign-left valign-top"><em>Description</em></th>
+<th class="tableblock halign-left valign-top"><em>Links</em></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-camel_beta</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Integration with Apache Camel.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_camel.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-commons_beta</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Integration Support for Apache Commons.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">-</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-configured-sysprops_beta</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Tamaya configuration to be provided as System.getProperties().</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_sysprops.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-jodatime_beta</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides support for JodaTime.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_jodatime.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-management_alpha</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides JMX support for inspecting configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_management.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-metamodel_alpha</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides an XML API for building configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_metamodel-staged.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-remote_alpha</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Remote configuration support using the server API.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_remote.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-server_alpha</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Publishes configuration as a REST service.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_server.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-ui_alpha</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides a web UI for a VM running Tamaya.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_ui.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-uom_beta</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides additional converters based on the Units of Measurement JSR.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_uom.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-usagetracker_beta</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Allows tracking of configuration usage.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_usagetracker.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-validation-alpha</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides an XML API for validating configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_validation.html">Documentation</a></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-vertx-alpha</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Provides Vertx integration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_vertx.html">Documentation</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -397,9 +366,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/documentation/extensions/mod_camel.html b/documentation/extensions/mod_camel.html
index 9b1150e..9996202 100644
--- a/documentation/extensions/mod_camel.html
+++ b/documentation/extensions/mod_camel.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,87 +128,85 @@
 				<h1>Apache Tamaya - Extension: Integration with Apache Camel</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
-
-			<p><div id="preamble"> 
- <div class="sectionbody"> 
-  <!-- toc disabled --> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="Camel">Integration with Apache Camel (Extension Module)</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Tamaya <em>Camel</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3> 
-   <div class="paragraph"> 
-    <p>The Tamaya <em>Camel</em> module provides different artifacts which allow integration of Apache Tamaya configuration with Apache Camel.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_compatibility">Compatibility</h3> 
-   <div class="paragraph"> 
-    <p>The module is based on Java 8. {jbake-tamaya_version}</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_installation">Installation</h3> 
-   <div class="paragraph"> 
-    <p>To benefit from configuration builder support you only must add the corresponding dependency to your module:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">
-       <dependency>
-  
-        <groupid>
-         org.apache.tamaya.ext
-        </groupid>
-  
-        <artifactid>
-         tamaya-camel_beta
-        </artifactid>
-  
-        <version>
-         {jbake-tamaya_version}
-        </version>
+			<p><em>2018-12-17</em></p>
 
-       </dependency></code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_the_functionality_provided">The Functionality Provided</h3> 
-   <div class="paragraph"> 
-    <p>Tamaya Camel comes basically with three artifacts:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>A Camel ResolverFunction implementation adding explicit property resolution (org.apache.tamaya.camel.TamayaPropertyResolver).</p> </li> 
-     <li> <p>A Camel PropertiesComponent implementation, which allows implicitly preconfigures the resolvers from above and additionally allows using Tamaya configuration as Camel <em>overrides</em> (org.apache.tamaya.camel.TamayaPropertiesComponent).</p> </li> 
-    </ul> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_configuring_using_camel_java_dsl">Configuring using Camel Java DSL</h3> 
-   <div class="paragraph"> 
-    <p>Camel integration using Java DSL is basically simple:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">import org.apache.tamaya.camel.TamayaPropertiesComponent;
+			<p><div id="preamble">
+<div class="sectionbody">
+<!-- toc disabled -->
+</div>
+</div>
+<div class="sect1">
+<h2 id="Camel">Integration with Apache Camel (Extension Module)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>Camel</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+</div>
+<div class="sect2">
+<h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
+<div class="paragraph">
+<p>The Tamaya <em>Camel</em> module provides different artifacts which allow integration of Apache Tamaya
+configuration with Apache Camel.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_compatibility">Compatibility</h3>
+<div class="paragraph">
+<p>The module is based on Java 8.
+{jbake-tamaya_version}</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_installation">Installation</h3>
+<div class="paragraph">
+<p>To benefit from configuration builder support you only must add the corresponding dependency to your module:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml"><dependency>
+  <groupId>org.apache.tamaya.ext</groupId>
+  <artifactId>tamaya-camel_beta</artifactId>
+  <version>{jbake-tamaya_version}</version>
+</dependency></code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_the_functionality_provided">The Functionality Provided</h3>
+<div class="paragraph">
+<p>Tamaya Camel comes basically with three artifacts:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>A Camel ResolverFunction implementation adding explicit property resolution
+(org.apache.tamaya.camel.TamayaPropertyResolver).</p>
+</li>
+<li>
+<p>A Camel PropertiesComponent implementation, which allows implicitly preconfigures the resolvers from above and
+additionally allows using Tamaya configuration as Camel <em>overrides</em>
+(org.apache.tamaya.camel.TamayaPropertiesComponent).</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_configuring_using_camel_java_dsl">Configuring using Camel Java DSL</h3>
+<div class="paragraph">
+<p>Camel integration using Java DSL is basically simple:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">import org.apache.tamaya.camel.TamayaPropertiesComponent;
 
-camelContext.addComponent("properties", new TamayaPropertiesComponent());</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Given so you can then use cfg or tamaya as prefix for resolving entries with Tamaya as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">RouteBuilder builder = new RouteBuilder() {
+camelContext.addComponent("properties", new TamayaPropertiesComponent());</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Given so you can then use cfg or tamaya as prefix for resolving entries with Tamaya as follows:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">RouteBuilder builder = new RouteBuilder() {
     public void configure() {
         from("direct:hello1").transform().simple("{{cfg:message}}");
     }
@@ -216,27 +217,31 @@ builder = new RouteBuilder() {
         from("direct:hello2").transform().simple("{{tamaya:message}}");
     }
 };
-camelContext.addRoutes(builder);</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Optionally you can also configure TamayaPropertiesComponent that all currently known Tamaya properties are used as Camel overrides, meaning they are evaluated prior to all other available resolver functions in the Camel PropertiesComponent:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">TamayaPropertiesComponent props = new TamayaPropertiesComponent();
-props.setTamayaOverrides(true);</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_configuring_using_camel_xml_dsl">Configuring using Camel XML DSL</h3> 
-   <div class="paragraph"> 
-    <p>Camel integration using XML DSL is basically very similar. You just have to add the properties component as bean as well. All other configuration parameters (e.g. file URIs are similar supported). In the example code below we again use Tamaya as the main configuration solutions only using Camel’s default behaviour as a fallback:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;beans xmlns="http://www.springframework.org/schema/beans"
+camelContext.addRoutes(builder);</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Optionally you can also configure TamayaPropertiesComponent that all currently known Tamaya properties are used
+as Camel overrides, meaning they are evaluated prior to all other available resolver functions in the Camel
+PropertiesComponent:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">TamayaPropertiesComponent props = new TamayaPropertiesComponent();
+props.setTamayaOverrides(true);</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_configuring_using_camel_xml_dsl">Configuring using Camel XML DSL</h3>
+<div class="paragraph">
+<p>Camel integration using XML DSL is basically very similar. You just have to add the properties component as bean
+as well. All other configuration parameters (e.g. file URIs are similar supported). In the example code below we
+again use Tamaya as the main configuration solutions only using Camel&#8217;s default behaviour as a fallback:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
@@ -268,11 +273,11 @@ props.setTamayaOverrides(true);</code></pre>
         &lt;property name="tamayaOverrides" value="true"/&gt;
     &lt;/bean&gt;
 
-&lt;/beans&gt;</code></pre> 
-    </div> 
-   </div> 
-  </div> 
- </div> 
+&lt;/beans&gt;</code></pre>
+</div>
+</div>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -283,9 +288,9 @@ props.setTamayaOverrides(true);</code></pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/documentation/extensions/mod_cdi.html b/documentation/extensions/mod_cdi.html
index 8c765b6..621325f 100644
--- a/documentation/extensions/mod_cdi.html
+++ b/documentation/extensions/mod_cdi.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,130 +128,151 @@
 				<h1>Apache Tamaya - Extension: CDI Support</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div id="preamble"> 
- <div class="sectionbody"> 
-  <!-- toc disabled --> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="CDI">Tamaya CDI Integration (Extension Modules)</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Tamaya <em>CDI</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3> 
-   <div class="paragraph"> 
-    <p>Apache <em>CDI</em> provides integration with CDI:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>Loading of CDI managed SPI components as configuration extensions such as PropertySources, PropertySourceProviders, PropertyFilters, etc. This also includes SPI defined by any Tamaya submodules. This is useful when Tamaya is used as an application module managed by the CDI implementation.</p> </li> 
-     <li> <p>Implement and enable Tamaya’s configuration injection services (either using CDI injection or Tamaya’s standalone injection module.</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Hereby there are two implementations provided:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>tamaya-injection-cdi implements injection by using CDI’s injection mechanism to inject configuration values into the beans managed by the CDI systems.</p> </li> 
-     <li> <p>tamaya-injection-standalone implements injection by integrating the tamaya-injection SE based injection module (also used for Spring and OSGI injection) with CDI. Injection hereby is performed by the Tamaya SE module, whereas beans and injection control overall are still managed by CDI.</p> </li> 
-     <li> <p>One difference, of course, is that tamaya-injection-standalone also provides an SE compatible API (ConfigurationInjection, ConfigurationInjector), which is not available, when using the purely CDI based variant.</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The annotations used for all injection functionality in Tamaya is defined as a separate module. This allows you to code against the injection API without dependency on the concrete injection implementation. As a consequence your components will be compatible regardless if deployed in a pure SE or as Java EE (CDI) or Spring environment:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre>&lt;dependency&gt;
+			<p><div id="preamble">
+<div class="sectionbody">
+<!-- toc disabled -->
+</div>
+</div>
+<div class="sect1">
+<h2 id="CDI">Tamaya CDI Integration (Extension Modules)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>CDI</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+</div>
+<div class="sect2">
+<h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
+<div class="paragraph">
+<p>Apache <em>CDI</em> provides integration with CDI:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Loading of CDI managed SPI components as configuration extensions such as PropertySources, PropertySourceProviders,
+PropertyFilters, etc. This also includes SPI defined by any Tamaya submodules.
+This is useful when Tamaya is used as an application module managed by the CDI implementation.</p>
+</li>
+<li>
+<p>Implement and enable Tamaya&#8217;s configuration injection services (either using CDI injection or
+Tamaya&#8217;s standalone injection module.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Hereby there are two implementations provided:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>tamaya-injection-cdi implements injection by using CDI&#8217;s injection mechanism to inject configuration values into the
+beans managed by the CDI systems.</p>
+</li>
+<li>
+<p>tamaya-injection-standalone implements injection by integrating the tamaya-injection SE based injection module (also used
+for Spring and OSGI injection) with CDI. Injection hereby is performed by the Tamaya SE module, whereas
+beans and injection control overall are still managed by CDI.</p>
+</li>
+<li>
+<p>One difference, of course, is that tamaya-injection-standalone also provides an SE compatible API (ConfigurationInjection,
+ConfigurationInjector), which is not available, when using the purely CDI based variant.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The annotations used for all injection functionality in Tamaya is defined as a separate module. This allows you to
+code against the injection API without dependency on the concrete injection implementation. As a consequence your
+components will be compatible regardless if deployed in a pure SE or as Java EE (CDI) or Spring environment:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-injection-api&lt;/artifactId&gt;
   &lt;version&gt;{tamaya_version}&lt;/version&gt;
-&lt;/dependency&gt;</pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_compatibility">Compatibility</h3> 
-   <div class="paragraph"> 
-    <p>All modules are based on Java 7, so they will not run on Java 7 and beyond.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_installation">Installation</h3> 
-   <div class="paragraph"> 
-    <p>To benefit from Tamaya CDI integration you only must one of the following dependencies to your module. Ensure that you never have installed both CDI extensions at the same time because this may be lead to unforseen side-effects.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="title">
-     CDI Java EE Application Configuration
-    </div> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+&lt;/dependency&gt;</pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_compatibility">Compatibility</h3>
+<div class="paragraph">
+<p>All modules are based on Java 7, so they will not run on Java 7 and beyond.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_installation">Installation</h3>
+<div class="paragraph">
+<p>To benefit from Tamaya CDI integration you only must one of the following dependencies to your module. Ensure that
+you never have installed both CDI extensions at the same time because this may be lead to unforseen side-effects.</p>
+</div>
+<div class="listingblock">
+<div class="title">CDI Java EE Application Configuration</div>
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-cdi&lt;/artifactId&gt;
   &lt;version&gt;{tamaya_version}&lt;/version&gt;
-&lt;/dependency&gt;</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <div class="title">
-     To use Tamaya’s 
-     <em>standalone injection support</em>, you additionally should add the
-    </div> 
-    <p>following dependency. If this dependency is missing injection is purely based on CDI injection features.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+&lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">To use Tamaya&#8217;s <em>standalone injection support</em>, you additionally should add the</div>
+<p>following dependency. If this dependency is missing injection is purely based on
+CDI injection features.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-injection-standalone&lt;/artifactId&gt;
   &lt;version&gt;{tamaya_version}&lt;/version&gt;
-&lt;/dependency&gt;</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Both components will auto-register its components and override the default ServicceContext in use. Additionally they register CDI extensions that implement Configuration injection as described before.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>For working with a pure non Java EE environment have a look at the <a href="mod_injection-standalone.html">tamaya-injection-standalone module</a>.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Additionally you have to register Tamaya’s CDI extension modules into your <code>beans-xml</code>:</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Contents of <code>META-INF/services/javax.enterprise.inject.spi.Extension</code>:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># Register Tamaya to perform injection
+&lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Both components will auto-register its components and override the default ServicceContext in use. Additionally they
+register CDI extensions that implement Configuration injection as described before.</p>
+</div>
+<div class="paragraph">
+<p>For working with a pure non Java EE environment have a look at the <a href="mod_injection-standalone.html">tamaya-injection-standalone module</a>.</p>
+</div>
+<div class="paragraph">
+<p>Additionally you have to register Tamaya&#8217;s CDI extension modules into your <code>beans-xml</code>:</p>
+</div>
+<div class="paragraph">
+<p>Contents of <code>META-INF/services/javax.enterprise.inject.spi.Extension</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># Register Tamaya to perform injection
 # org.apache.tamaya.cdi.TamayaCDIInjectionExtension
 # org.apache.tamaya.cdi.TamayaSEInjectionExtension
-org.apache.tamaya.cdi.TamayaCDIAccessor</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>If you want to use CDI standard injection (using @Inject @Config), activate org.apache.tamaya.cdi.TamayaCDIInjectionExtension as a CDI extension.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>If you want to use SE based injection (using @Config <strong>without</strong> @Inject), activate org.apache.tamaya.cdi.TamayaSEInjectionExtension instead of.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Though not recommended, it is possible to activate both extension at the same time.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_annotating_your_classes">Annotating your Classes</h3> 
-   <div class="paragraph"> 
-    <p>Basically annotating your classes is straightforward. @Config defines an additional CDI qualifier that is, depending on the module deployed, handled by a CDI producer (tamaya-cdi-ee) or the Tamaya SE injection mechanism $ (tamaya-cdi-se). All types injected by this module are injected using <em>dependent scope</em>. Keep in mind that values injected into fields by Tamaya cannot be used within constructors because <a href="https://docs.jboss.org/weld/reference/latest/en-US/html/inj [...]
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">@RequestScoped
+org.apache.tamaya.cdi.TamayaCDIAccessor</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If you want to use CDI standard injection (using @Inject @Config), activate
+org.apache.tamaya.cdi.TamayaCDIInjectionExtension as a CDI extension.</p>
+</div>
+<div class="paragraph">
+<p>If you want to use SE based injection (using @Config <strong>without</strong> @Inject),
+activate org.apache.tamaya.cdi.TamayaSEInjectionExtension instead of.</p>
+</div>
+<div class="paragraph">
+<p>Though not recommended, it is possible to activate both extension at the same time.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_annotating_your_classes">Annotating your Classes</h3>
+<div class="paragraph">
+<p>Basically annotating your classes is straightforward. @Config defines an additional CDI qualifier that is, depending
+on the module deployed, handled by a CDI producer (tamaya-cdi-ee) or the Tamaya SE injection mechanism $
+(tamaya-cdi-se). All types injected by this module are injected using <em>dependent scope</em>. Keep in mind that values injected into fields by Tamaya cannot be used within constructors because <a href="https://docs.jboss.org/weld/reference/latest/en-US/html/injection.html">they will not yet have been injected</a>.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@RequestScoped
 public class ConfiguredClass{
 
     @Config
@@ -273,18 +297,21 @@ public class ConfiguredClass{
 
     ...
 
-}</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_registering_cdi_managed_components_into_the_application_s_configurationcontext">Registering CDI managed components into the Application’s ConfigurationContext</h3> 
-   <div class="paragraph"> 
-    <p>As mentioned both modules allow to provide Tamaya SPI extensions modules as ordinary CDI managed beans. By default extensions should be registered using @Singleton or @ApplicationScoped scope annotations. So you can define/deploy additional application specific PropertySources and other artifacts simply by defining a CDI managed bean implementing the required SPI interface:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Singleton
+}</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_registering_cdi_managed_components_into_the_applications_configurationcontext">Registering CDI managed components into the Application&#8217;s ConfigurationContext</h3>
+<div class="paragraph">
+<p>As mentioned both modules allow to provide Tamaya SPI extensions modules as ordinary CDI managed beans. By default
+extensions should be registered using @Singleton or @ApplicationScoped scope annotations. So you can define/deploy
+additional application specific PropertySources and other artifacts simply by defining a CDI managed bean implementing
+the required SPI interface:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Singleton
 public class TestPropertySource implements PropertySource{
 
     final Map&lt;String,String&gt; config = new HashMap&lt;&gt;();
@@ -319,81 +346,96 @@ public class TestPropertySource implements PropertySource{
     public boolean isScannable() {
         return true;
     }
-}</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>To enable this (optional) feature you must replace Tamaya’s ServiceContext with the CDI aware implementation:</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Contents of <code>META-INF/services/org.apache.tamaya.spi.ServiceContext</code>:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># Registering a CDI aware service context
-CDIAwareServiceContext</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_advanced_use_cases">Advanced Use Cases</h3> 
-   <div class="paragraph"> 
-    <p>Beside basic configuration Tamaya also covers additional requirements:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>_Reading multiple keys, where the first successful one is determining the value of the configuration, is simply possible, by adding multiple keys to the @Configy annotation. E.g. for trying first a.b and then new.b you would configure it as follows:</p> </li> 
-    </ul> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Config({"a.b", "new.b"}
-private String value;</code></pre> 
-    </div> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>When you must apply a ConfigOperator to your config, before reading the configuration, you can configure one as follows:</p> </li> 
-    </ul> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Config({"a.b", "new.b"}
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>To enable this (optional) feature you must replace Tamaya&#8217;s ServiceContext with the
+CDI aware implementation:</p>
+</div>
+<div class="paragraph">
+<p>Contents of <code>META-INF/services/org.apache.tamaya.spi.ServiceContext</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># Registering a CDI aware service context
+CDIAwareServiceContext</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_advanced_use_cases">Advanced Use Cases</h3>
+<div class="paragraph">
+<p>Beside basic configuration Tamaya also covers additional requirements:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>_Reading multiple keys, where the first successful one is determining the value of the configuration, is
+simply possible, by adding multiple keys to the @Configy annotation.
+E.g. for trying first a.b and then new.b you would configure it as follows:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Config({"a.b", "new.b"}
+private String value;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>When you must apply a ConfigOperator to your config, before reading the configuration, you can
+configure one as follows:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Config({"a.b", "new.b"}
 @WithConfigOperator(MyOperator.class)
-private String value;</code></pre> 
-    </div> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>When you must apply a some special conversion, or you use a type that is not registered for conversion, you can configure a custom converter to be applied as follows:</p> </li> 
-    </ul> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Config({"a.b", "new.b"}
+private String value;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>When you must apply a some special conversion, or you use a type that is not registered
+for conversion, you can configure a custom converter to be applied as follows:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@Config({"a.b", "new.b"}
 @WithPropertyConverter(MyConverter.class)
-private MySpecialFooType value;</code></pre> 
-    </div> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>Often multiple keys in a class belong to the same root section. So instead of copying this to every entry you can define the most common root sections in the type’s header:</p> </li> 
-    </ul> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">@ConfigDefaultSections({"aaaa", "new"});
+private MySpecialFooType value;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Often multiple keys in a class belong to the same root section. So instead of copying this to
+every entry you can define the most common root sections in the type&#8217;s header:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">@ConfigDefaultSections({"aaaa", "new"});
 public class MyType{
 
 @Config({"b", "[legacy.bKey]"} // lookups: "aaaa.b", "new.b", legacy.bKey
-private String value;</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>In the example above legacy.bKey defines an absolute key, which is not combined with any defined default section parts.</p> 
-   </div> 
-  </div> 
- </div> 
+private String value;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In the example above legacy.bKey defines an absolute key, which is not combined with any defined
+default section parts.</p>
+</div>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -404,9 +446,9 @@ private String value;</code></pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/documentation/extensions/mod_classloader_support.html b/documentation/extensions/mod_classloader_support.html
index 3f87c89..4865090 100644
--- a/documentation/extensions/mod_classloader_support.html
+++ b/documentation/extensions/mod_classloader_support.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,92 +128,137 @@
 				<h1>Apache Tamaya - Extension: Classloader Isolation Support</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div id="preamble"> 
- <div class="sectionbody"> 
-  <!-- toc disabled --> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="Classloader">Tamaya Classloader Aware ServiceContext (Extension Module)</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Tamaya <em>Classloader</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3> 
-   <div class="paragraph"> 
-    <p>The Tamaya <em>Classloader</em> support provides an alternative implementation of java.util.ServiceLoader, which is aware of classloaders, hereby preventing multiple loading of components within a classloader hierarchy.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_compatibility">Compatibility</h3> 
-   <div class="paragraph"> 
-    <p>The module is based on Java 7, so it will not run on Java 7 and beyond.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_installation">Installation</h3> 
-   <div class="paragraph"> 
-    <p>To benefit from configuration server support you only must add the corresponding dependency to your module:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+			<p><div id="preamble">
+<div class="sectionbody">
+<!-- toc disabled -->
+</div>
+</div>
+<div class="sect1">
+<h2 id="Classloader">Tamaya Classloader Aware ServiceContext (Extension Module)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>Classloader</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+</div>
+<div class="admonitionblock caution">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Caution</div>
+</td>
+<td class="content">
+Classloader support has been added into the main API and implementation module. This module probably is not
+         useful anymore and will be removed in the future.
+</td>
+</tr>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
+<div class="paragraph">
+<p>The Tamaya <em>Classloader</em> support provides an alternative implementation of java.util.ServiceLoader, which is aware
+of classloaders, hereby preventing multiple loading of components within a classloader hierarchy.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_compatibility">Compatibility</h3>
+<div class="paragraph">
+<p>The module is based on Java 7, so it will not run on Java 7 and beyond.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_installation">Installation</h3>
+<div class="paragraph">
+<p>To benefit from configuration server support you only must add the corresponding dependency to your module:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-classloader-support&lt;/artifactId&gt;
   &lt;version&gt;{tamaya_version}&lt;/version&gt;
-&lt;/dependency&gt;</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The component will auto.register its components and override the default ServiceContext in use by default with an instance of type org.apache.tamaya.clsupport.internal.CLAwareServiceContext with a precendence value (component priority) of 10.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_how_it_works">How it works</h3> 
-   <div class="paragraph"> 
-    <p>Basically the component manages a Map of all classloaders encountered. When services are accessed, the component will evaluate the services as follows:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>the component walks up the class loader hierarchy.</p> </li> 
-     <li> <p>in a next step the hierarchy is traversed down from the parent to the current classloader. Hereby it is checked if the service list for the required type has been loaded already. If not the service configuration files are evaluated.</p> </li> 
-     <li> <p>This configuration file evaluation will ignore all resources already loaded by any of the already traversed parent classloaders.</p> </li> 
-     <li> <p>For each configuration file newly visible to the classloader currently traversed, the corresponding services are loaded unleyy, the same service class already has been loaded by one its parent classloaders or another file loaded with this classloader.</p> </li> 
-     <li> <p>Finally all services found are returned as the full collection of services valid for the given context (classloader).</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>This ensures no service is loaded multiple times, even when it is referenced multiple times in several service configurations. Additionally every service is loaded on the classloader where it is also declared the first time.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_control_logging">Control Logging</h3> 
-   <div class="paragraph"> 
-    <p>The service component by default only logs errors. But it is possible to change this by reconfiguring the logging levels on the following logging names/path: org.apache.tamaya.clsupport.internal.CLAwareServiceContext</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p><em>INFO</em> logs additional info on the services accessed.</p> </li> 
-     <li> <p><em>FINEST</em> logs additional info on the services scanned and selected.</p> </li> 
-    </ul> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_classloader_aware_configuration">Classloader Aware Configuration</h3> 
-   <div class="paragraph"> 
-    <p>The mechanism above is used to provide a classloader aware implementation of ConfigurationContext (org.apache.tamaya.clsupport.internal.CLAwareConfigurationContext). Similarly to the service variants this class provides a context implementation that manages the core configuration aspects considering classloading hierarchies:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>PropertySource, PropertySourceProviders</p> </li> 
-     <li> <p>PropertyFilters, PropertyCombinationPolicy</p> </li> 
-    </ul> 
-   </div> 
-  </div> 
- </div> 
+&lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The component will auto.register its components and override the default ServiceContext in use by default
+with an instance of type org.apache.tamaya.clsupport.internal.CLAwareServiceContext with a precendence value
+(component priority) of 10.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_how_it_works">How it works</h3>
+<div class="paragraph">
+<p>Basically the component manages a Map of all classloaders encountered. When services are accessed, the component
+will evaluate the services as follows:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>the component walks up the class loader hierarchy.</p>
+</li>
+<li>
+<p>in a next step the hierarchy is traversed down from the parent to the current classloader. Hereby it is checked
+if the service list for the required type has been loaded already. If not the service configuration files are
+evaluated.</p>
+</li>
+<li>
+<p>This configuration file evaluation will ignore all resources already loaded by any of the already traversed parent
+classloaders.</p>
+</li>
+<li>
+<p>For each configuration file newly visible to the classloader currently traversed, the corresponding services are
+loaded unleyy, the same service class already has been loaded by one its parent classloaders or another file
+loaded with this classloader.</p>
+</li>
+<li>
+<p>Finally all services found are returned as the full collection of services valid for the given context (classloader).</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>This ensures no service is loaded multiple times, even when it is referenced multiple times in several service
+configurations. Additionally every service is loaded on the classloader where it is also declared the first time.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_control_logging">Control Logging</h3>
+<div class="paragraph">
+<p>The service component by default only logs errors. But it is possible to change this by reconfiguring the logging
+levels on the following logging names/path: org.apache.tamaya.clsupport.internal.CLAwareServiceContext</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><em>INFO</em> logs additional info on the services accessed.</p>
+</li>
+<li>
+<p><em>FINEST</em> logs additional info on the services scanned and selected.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_classloader_aware_configuration">Classloader Aware Configuration</h3>
+<div class="paragraph">
+<p>The mechanism above is used to provide a classloader aware implementation of ConfigurationContext
+(org.apache.tamaya.clsupport.internal.CLAwareConfigurationContext). Similarly to the service variants
+this class provides a context implementation that manages the core configuration aspects considering classloading
+hierarchies:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>PropertySource, PropertySourceProviders</p>
+</li>
+<li>
+<p>PropertyFilters, PropertyCombinationPolicy</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -221,9 +269,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/documentation/extensions/mod_collections.html b/documentation/extensions/mod_collections.html
index 8463591..cba3e3c 100644
--- a/documentation/extensions/mod_collections.html
+++ b/documentation/extensions/mod_collections.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,263 +128,453 @@
 				<h1>Apache Tamaya - Extension: Collection Support</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div id="preamble"> 
- <div class="sectionbody"> 
-  <!-- toc disabled --> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="Collections">Tamaya Collections Support (Extension Module)</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Tamaya <em>Collections</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3> 
-   <div class="paragraph"> 
-    <p>All configuration in Tamaya is expressed as simple key, value pairs. Nevertheless this concept allows similarly the modelling of collection typed values such as lists, sets, maps or simple collections of things. The Tamaya Collections extension adds this functionality to the Tamaya eco-system.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_compatibility">Compatibility</h3> 
-   <div class="paragraph"> 
-    <p>The module is based on Java 8, so it will not run on Java 7 and beyond.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_installation">Installation</h3> 
-   <div class="paragraph"> 
-    <p>To use Tamaya collection support you only must add the corresponding dependency to your module:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+			<p><div id="preamble">
+<div class="sectionbody">
+<!-- toc disabled -->
+</div>
+</div>
+<div class="sect1">
+<h2 id="Collections">Tamaya Collections Support (Extension Module)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>Collections</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+</div>
+<div class="sect2">
+<h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
+<div class="paragraph">
+<p>All configuration in Tamaya is expressed as simple key, value pairs. Nevertheless this concept allows similarly
+the modelling of collection typed values such as lists, sets, maps or simple collections of things. The Tamaya
+Collections extension adds this functionality to the Tamaya eco-system.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_compatibility">Compatibility</h3>
+<div class="paragraph">
+<p>The module requires Java 8.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_installation">Installation</h3>
+<div class="paragraph">
+<p>To use Tamaya collection support you only must add the corresponding dependency to your module:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-collections&lt;/artifactId&gt;
   &lt;version&gt;{tamaya_version}&lt;/version&gt;
-&lt;/dependency&gt;</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_overview">Overview</h3> 
-   <div class="paragraph"> 
-    <p>Tamaya Collections adds PropertyConverter implementations that are able to access configuration data as <em>lists, maps</em> or <em>sets</em>. By default this works out of the box as easy as accessing any other type of configuration data, e.g.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ConfigurationProvider.getConfiguration();
+&lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_overview">Overview</h3>
+<div class="paragraph">
+<p>Tamaya Collections adds PropertyConverter implementations that are able to access configuration data
+as <em>lists, maps</em> or <em>sets</em>. By default this works out of the box as easy as accessing any other type of
+configuration data, e.g.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ConfigurationProvider.getConfiguration();
 
 // Without any content specification, a list of String is returned.
 List&lt;String&gt; simpleList = config.get("my.list.config.entry", List.class);
 
 // Using a TypeLiteral allows to use every convertible sub type supported by the system.
-List&lt;Integer&gt; intList = config.get("my.list.config.entry", new TypeLiteral&lt;List&lt;Integer&gt;&gt;(){});</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Configuration in that case, by default, is a simple comma-separated list of entries, e.g.</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">my.list.config.entry=1,34454,23,344545,3445</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Additionally the module allows adding additional meta-entries, which allows to tweak some of the inner-workings, e.g.</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>using your own PropertyConverter implementation for parsing entries.</p> </li> 
-     <li> <p>specifying a custom separator to split the items (default is {{','}}.</p> </li> 
-     <li> <p>specifying a custom separator to split key/value pairs when parsing map entries.</p> </li> 
-     <li> <p>specifying the implementation type of the collection item to be returned.</p> </li> 
-     <li> <p>specifying the implementation type of the collection to be returned.</p> </li> 
-    </ul> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_supported_types">Supported Types</h3> 
-   <div class="paragraph"> 
-    <p>This module currently supports the following types:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>java.util.Collection</p> </li> 
-     <li> <p>java.util.List</p> </li> 
-     <li> <p>java.util.ArrayList</p> </li> 
-     <li> <p>java.util.LinkedList</p> </li> 
-     <li> <p>java.util.Set</p> </li> 
-     <li> <p>java.util.SortedSet</p> </li> 
-     <li> <p>java.util.TreeSet</p> </li> 
-     <li> <p>java.util.HashSet</p> </li> 
-     <li> <p>java.util.Map</p> </li> 
-     <li> <p>java.util.SortedMap</p> </li> 
-     <li> <p>java.util.HashMap</p> </li> 
-     <li> <p>java.util.TreeMap</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Hereby the collection type is determined by the parameter type accessed, e.g. config.get("mylist", ArrayList.class) will always return an ArrayList as result.</p> 
-   </div> 
-   <div class="admonitionblock note"> 
-    <table> 
-     <tbody>
-      <tr> 
-       <td class="icon"> 
-        <div class="title">
-         Note
-        </div> </td> 
-       <td class="content"> This means that depending on your use case you can access different collection types based on the same configuration values, as long as their is a PropertyConverter that can convert the <em>raw configuration value</em> to the required target type. </td> 
-      </tr> 
-     </tbody>
-    </table> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_configuring_the_target_implementation_type">Configuring the target implementation type</h4> 
-    <div class="paragraph"> 
-     <p>Tamaya Collections allows you to configure the <em>default</em> target collection type by adding the following meta-configuration entry (shown for the mylist entry). Hereby the package part java.util. can be ommitted:</p> 
-    </div> 
-    <div class="paragraph"> 
-     <p>[ source, properties]</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="content"> 
-      <pre>mylist=a,b,c
-_mylist.collection-type=LinkedList</pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>When calling config.get("mylist", ArrayList.class) this parameter does not have any effect, so you will still get an ArrayList as a result. However when you call config.get("mylist", List.class) you will get a LinkedList as implementation type.</p> 
-    </div> 
-    <div class="paragraph"> 
-     <p>This mechanism similarly applies to all kind of collections, so you can use it similarly to define the implementation type returned when accessing List, Map or Collection.</p> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_collecting_configuration_entries_instead_of_overriding">Collecting Configuration Entries instead of Overriding</h3> 
-   <div class="paragraph"> 
-    <p>By default Tamaya applies always an overriding CombinationPolicy, where only the configuration entry for the most significant configuration entry is used. In case of collections (and maybe also other use cases), overriding is not always the mechanism of choice. E.g. when you want to have all entries added to your configuration to be <strong>combined</strong> to a new entry containing all values provided by any property sources.</p> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Therefore <em>Tamaya Collections</em> also provides a more sophistiated CombinationPolicy (automatically configured) that allows to adapt the way how configuration entries are combined. All you must do is declaring the mechanism to be applied by an according <em>meta-configuration</em> parameter, e.g. for my.list your config may look as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># from PropertSource 1
+List&lt;Integer&gt; intList = config.get("my.list.config.entry", new TypeLiteral&lt;List&lt;Integer&gt;&gt;(){});</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Configuration in that case, by default, is a simple comma-separated list of entries, e.g.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">my.list.config.entry=1,34454,23,344545,3445</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Additionally the module allows adding additional meta-entries, which allows to tweak some of the
+inner-workings, e.g.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>item-converter</code>: using a custom PropertyConverter implementation for parsing collection entries.</p>
+</li>
+<li>
+<p><code>entry-separator</code>: specifying a custom separator to split the list and map items (default is {{','}}.</p>
+</li>
+<li>
+<p><code>map-entry-separator</code>: specifying a custom separator to split key/value pairs when parsing map entries.</p>
+</li>
+<li>
+<p><code>collection-type</code>: specifying the implementation type of the collection to be returned.</p>
+</li>
+<li>
+<p><code>mapping-type</code>: specifying the implementation type of the collection item to be returned.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_supported_types">Supported Types</h3>
+<div class="paragraph">
+<p>This module currently supports the following types:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>java.util.Iterable</p>
+</li>
+<li>
+<p>java.util.Collection</p>
+</li>
+<li>
+<p>java.util.List</p>
+</li>
+<li>
+<p>java.util.ArrayList</p>
+</li>
+<li>
+<p>java.util.ArrayList</p>
+</li>
+<li>
+<p>java.util.LinkedList</p>
+</li>
+<li>
+<p>java.util.Set</p>
+</li>
+<li>
+<p>java.util.SortedSet</p>
+</li>
+<li>
+<p>java.util.TreeSet</p>
+</li>
+<li>
+<p>java.util.HashSet</p>
+</li>
+<li>
+<p>java.util.Map</p>
+</li>
+<li>
+<p>java.util.SortedMap</p>
+</li>
+<li>
+<p>java.util.HashMap</p>
+</li>
+<li>
+<p>java.util.TreeMap</p>
+</li>
+</ul>
+</div>
+<div class="sect3">
+<h4 id="_default_collection_type_mapping">Default Collection Type Mapping</h4>
+<div class="paragraph">
+<p>The collection type is determined by the parameter type accessed, e.g.
+config.get("mylist", ArrayList.class) will always return an ArrayList
+as result.
+* if you have a generic type:
+  <strong> an <code>ArrayList</code> is returned for <code>Collection, List, ArrayList, Iterable</code>
+  </strong> a <code>HashSet</code> is returned for <code>Set, HashSet</code>
+  <strong> a <code>HashMap</code> is returned for <code>Map, HashMap</code>
+  </strong> a <code>TreeMap</code> is returned for <code>SortedMap, TreeMap</code>
+  ** a <code>TreeSet</code> is returned for <code>SortedSet, TreeSet</code>
+* in all other cases you have to explicitly define the collection type. Hereby you may
+  omit the <code>java.util</code> package. Collection types not contained in <code>java.util</code>
+  require adding an additional converter implementation.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+This means that depending on your use case you can access different
+collection types based on the same configuration values, as long as their is
+a PropertyConverter that can convert the <em>raw configuration value</em> to the
+required target type.
+</td>
+</tr>
+</table>
+</div>
+<div class="admonitionblock caution">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Caution</div>
+</td>
+<td class="content">
+If you do <strong>NOT</strong> use <code>TypeLiteral</code> to define your target type, the item target type will not
+         be available to Tamaya due to Java&#8217;s type erasure. In this case it will always return <code>String</code>
+         as item type.
+</td>
+</tr>
+</table>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_configuring_collection_type_mapping">Configuring Collection Type Mapping</h4>
+<div class="paragraph">
+<p>Tamaya Collections allows you to configure the <em>default</em> target collection type by adding the
+following meta-configuration entry (shown for the mylist entry). Hereby the package part java.util.
+can be ommitted:</p>
+</div>
+<div class="paragraph">
+<p>[ source, properties]</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>mylist=a,b,c
+[META]mylist.collection-type=LinkedList</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>When calling config.get("mylist", ArrayList.class) this parameter does not have any effect, so you will still
+get an ArrayList as a result. However when you call config.get("mylist", List.class) you will
+get a LinkedList as implementation type.</p>
+</div>
+<div class="paragraph">
+<p>This mechanism similarly applies to all kind of collections, so you can use it similarly to define the implementation
+type returned when accessing List, Map or Collection.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_evaluating_collection_entries">Evaluating Collection Entries</h3>
+<div class="paragraph">
+<p>Tamaya&#8217;s internal representation of configuration is a modelled by a <code>PropertyValue</code>. This class actually supports
+different models how configuration data can be represented:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>as simple literal key-value pair, or</p>
+</li>
+<li>
+<p>as map-like value object, or</p>
+</li>
+<li>
+<p>as list-like list object.</p>
+</li>
+</ol>
+</div>
+<div class="paragraph">
+<p>Tamaya&#8217;s <code>ConversionContext</code> actually provides all values matching a given target key. As a consequence there
+are four basic algorithms, how a collection can be mapped from entries given:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><em>value_all:</em> The list values are identiified by parsing the node value(s) into items, hereby
+the items of all values are combined.</p>
+</li>
+<li>
+<p><em>value:</em> The list values are identiified by parsing the node value(s) into items.
+Hereby only the items of the most significant config entry are considered.</p>
+</li>
+<li>
+<p><em>node:</em> The list values are identiified by using the node&#8217;s child value(s) as items.
+Hereby only the items of the most significant config entry are considered.</p>
+</li>
+<li>
+<p><em>node_all:</em> The list values are identiified by using the node&#8217;s child value(s) as items. Hereby
+the items of all values are combined.</p>
+</li>
+<li>
+<p><em>override:</em> This policy will try to guess the best <em>value</em> and <em>node</em> evaluation policy for most significant
+<code>PropertyValue</code>.</p>
+</li>
+<li>
+<p><em>combine:</em> This policy will try to guess the best <em>value</em> and <em>node</em> evaluation policy for each
+<code>PropertyValue</code> and combine the values to one collection. <strong>This is the default behaviour.</strong></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>As an example consider the following configuration for my.list:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># from PropertSource 1
 my.list=1,2,3
 
 # from PropertSource 2, with higher precedence
-my.list=4,5,6
-
-# without any additional meta-info these entries would be combined to
-my.list=4,5,6</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>With Tamaya Collections you can now configure the combination policy as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># use one of the default policies: override / collect
-_my.list.combination-policy=collect
+my.list=4,5,6</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Using the <em>value</em> evaluation policy this would result in the following final property:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">my.list=4,5,6</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Using the <em>value_all</em> evaluation policy this would result in the following final property:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties">my.list=1,2,3,4,5,6</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>For the _node_based evaluation policies consider the following YAML input data:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-yaml" data-lang="yaml"># from PropertSource 1
+my.list:
+  - 1
+  - 2
+  - 3
 
-# or use your own custom CombinationPolicy to combine the values
-_my.list.combination-policy=com.mycomp.app.MyCombincationPolicy</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>So declaring the collect policy the resulting raw output of the entry looks as follows:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># result when applying the collect policy:
-my.list=1,2,3,4,5,6</code></pre> 
-    </div> 
-   </div> 
-   <div class="paragraph"> 
-    <p>The customizable policy mechanism of Tamaya Collections also honors the item-separator meta-configuration parameter explained later in this document.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_format_of_collection_configuration">Format of Collection Configuration</h3> 
-   <div class="paragraph"> 
-    <p>By default collections are modelled as simple String values, that are tokenized into individual parts using a defined item-separator (by default ','). So a given configuration entry of 1,2,3 is mapped to "1","2","3". If the target context type is something different than String the smae conversion logic is used as when mapping configuration parameters directly to non-String target types (implemented as +PropertyConverter classes, manahed within the current ConfigurationContext. Th [...]
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a list, using the default format
+# from PropertSource 2, with higher precedence
+my.list:
+  - 4
+  - 5
+  - 6</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In this case the entries are mapped to <code>ListValue</code> instances with multiple children. Similar mappings would apply
+using JSON or XML configuration formats. In this case it is more useful to collect the child nodes, instead the
+values (which basically are <code>null</code> on the parent node level). This is excatly what the <em>node</em> and <em>node_all</em>
+evaluaion policies are doing.</p>
+</div>
+<div class="paragraph">
+<p>With Tamaya Collections you can now configure the evaluation policy using metadata, e.g. when using the default
+metadata format of Tamaya:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># use one of the policies: node, node_all, value, value_all, override or collect
+[META]my.list.collection-mapping=collect</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>So declaring the collect policy the resulting raw output of the entry looks as illustrated below. Hereby it is even
+possible to mix different representations. E.g. it is possible to add additional values in a simple property files,
+whereas other values are configured in YAML or other formats:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># result when applying the collect policy:
+my.list=1,2,3,4,5,6</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_item_value_splitting">Item Value Splitting</h3>
+<div class="paragraph">
+<p>When evaluating collections from literal values, these values have to be tokenized into individual parts using a
+defined item-separator (by default ','). So a given configuration entry of 1,2,3 is mapped to "1","2","3".
+If the target context type is something different than String the same conversion logic is used as when mapping
+configuration parameters directly to non-String target types (implemented as +PropertyConverter classes).
+The procedure is identical for all collection types, including Map types,
+with the difference that each token for a map is parsed additionally for separating it into a key and a value parts.
+The default separator for map entries hereby is "=". Map keys, as of now, are always of type String, whereas
+for values all convertible types are supported. All separator characters can be masked by prefixing them with a <code>\</code>
+character.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a list, using the default format
 list=1,2,3,4,5,6
 
 # a map, using the default format
-map=a::b, c::d</code></pre> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_trimming_of_entries">Trimming of entries</h4> 
-    <div class="paragraph"> 
-     <p>By default all tokens parsed are trimmed <em>before</em> adding them to the final collection. In case of map entries this is also the case for key/value entries. So the following configuration results in the identical values for list1,list2 and map1,map2:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a list, using the default format
-list1=1,2,3,4,5,6
+map=a=b, c=d</code></pre>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_trimming">Trimming</h4>
+<div class="paragraph">
+<p>By default all tokens parsed are trimmed <em>before</em> adding them to the final collection. In case of map entries this is
+also the case for key/value entries. So the following configuration results in the identical values for
+list1,list2 and map1,map2:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a list, using the default format
+list1=1, 2 ,3,4 , 5,6
 list2=1, 2, 3, 4, 5, 6
 
 # a map, using the default format
-map1=a::b, c::d
-map2=a :: b, c :: d</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>Nevertheless truncation can be controlled by the usage of brackets, e.g. the last list or map entry will have a single space character as value:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a list, with a ' ' value at the end
+map1=a =b, c= d
+map2=a=b, c = d</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Nevertheless trimming/truncation can be controlled by the usage of brackets, e.g. the last list or map entry will have a single
+space character as value:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a list, with a ' ' value at the end
 list3=1, 2, 3, 4, 5, [ ]
 
 # a map, with a ' ' value for key '0'
-map3=1 :: a, 2 :: b, 0::[ ]</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>Hereby \[ escapes the sequence.</p> 
-    </div> 
-   </div> 
-   <div class="sect3"> 
-    <h4 id="_customizing_the_format">Customizing the format</h4> 
-    <div class="paragraph"> 
-     <p>The item and entry separators (by default ',' and "::") can be customized by setting corresponding meta-data entries as follows, resulting in the same values as in the prevoius listing:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a list, with a ' ' value at the end
+map3=1 = a, 2 = b, 0=[ ]</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Hereby \[ escapes the sequence.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_customizing_the_format">Customizing the format</h4>
+<div class="paragraph">
+<p>The item and entry separators (by default ',' and "=") can be customized by setting corresponding meta-data
+entries, resulting in the same values as in the previous listing:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a list, with a ' ' value at the end
 list3=1__2__3__ 4__ 5__[ ]
-_list3.item-separator=__
+[META]list3.item-separator=__
 
 # a map, with a ' ' value for key '0'
 map3=1-&gt;a, 2-&gt;b, 0-&gt;[ ]
-_map3.map-entry-separator=-&gt;</code></pre> 
-     </div> 
-    </div> 
-    <div class="paragraph"> 
-     <p>Of course these settings also can be combined:</p> 
-    </div> 
-    <div class="listingblock"> 
-     <div class="content"> 
-      <pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a reformatted map
+[META]map3.map-entry-separator=-&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Of course these settings also can be combined:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a reformatted map
 redefined-map=0==none | 1==single | 2==any
-_redefined-map.map-entry-separator===
-_redefined-map.item-separator=|</code></pre> 
-     </div> 
-    </div> 
-   </div> 
-  </div> 
- </div> 
+[META]redefined-map.map-entry-separator===
+[META]redefined-map.item-separator=|</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_using_a_custom_converter">Using a custom Converter</h4>
+<div class="paragraph">
+<p>If configuring of item and map item separators as shown above is not sufficient, you still have an option: you can
+configure a custom converter to use for converting the given keys. This can be also configured by addinf a corresponding
+meta-configuration entry <code>item-converter</code>. As you would expect the converter must implement Tamaya&#8217;s <code>PropertyConverter</code>
+interface:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-properties" data-lang="properties"># a map using a custom converter
+server.0=server1, localhost:8001
+server.1.name=server2, localhost:8000, master=true
+server.2=server3, localhost:8003
+[META]server.item-converter=com.mycompany.config.ServerConverter</code></pre>
+</div>
+</div>
+</div>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -392,9 +585,9 @@ _redefined-map.item-separator=|</code></pre>
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/documentation/extensions/mod_consul.html b/documentation/extensions/mod_consul.html
index 087a421..f05f09f 100644
--- a/documentation/extensions/mod_consul.html
+++ b/documentation/extensions/mod_consul.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 	    <meta charset="utf-8"/>
-	    <title>Apache Tamaya - Extension: Integration with consul (Hashicorp)</title>
+	    <title>Apache Tamaya - Extension: Integration with Consul (Hashicorp)</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 	    <meta name="description" content=""/>
 	    <meta name="author" content=""/>
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -122,77 +125,115 @@
 		<div class="container">
 
 			<div class="page-header">
-				<h1>Apache Tamaya - Extension: Integration with consul (Hashicorp)</h1>
+				<h1>Apache Tamaya - Extension: Integration with Consul (Hashicorp)</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div id="preamble"> 
- <div class="sectionbody"> 
-  <!-- toc disabled --> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="Consul">Integration with consul (Extension Module)</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Tamaya <em>Consul</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3> 
-   <div class="paragraph"> 
-    <p>Tamaya <em>Consul</em> provides different artifacts which allows use of <a href="http://www.consul.io">Consul from Hashicorp</a> as configuration backend. Basically the module supports read-only integration (as a ConsulPropertySource as well as a writing configuration changes back (based on Tamaya’s MutableConfiguration API defined by the <a href="mod_mutable_config.html">tamaya-mutable-config</a> extension module.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_compatibility">Compatibility</h3> 
-   <div class="paragraph"> 
-    <p>The module is based on Java 7, so it will not run on Java 7 and beyond.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_installation">Installation</h3> 
-   <div class="paragraph"> 
-    <p>To use <em>tamaya-consul</em> you only must add the corresponding dependency to your module:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+			<p><div id="preamble">
+<div class="sectionbody">
+<!-- toc disabled -->
+</div>
+</div>
+<div class="sect1">
+<h2 id="Consul">Integration with consul (Extension Module)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>Consul</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+</div>
+<div class="sect2">
+<h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
+<div class="paragraph">
+<p>Tamaya <em>Consul</em> provides different artifacts which allows use of
+<a href="http://www.consul.io">Consul from Hashicorp</a> as configuration backend. Basically the
+module supports read-only integration (as a ConsulPropertySource as well
+as a writing configuration changes back (based on Tamaya&#8217;s MutableConfiguration API
+defined by the <a href="mod_mutable_config.html">tamaya-mutable-config</a> extension module.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_compatibility">Compatibility</h3>
+<div class="paragraph">
+<p>The module is based on Java 8.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_installation">Installation</h3>
+<div class="paragraph">
+<p>To use <em>tamaya-consul</em> you only must add the corresponding dependency to your module:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-consul&lt;/artifactId&gt;
   &lt;version&gt;{tamaya_version}&lt;/version&gt;
-&lt;/dependency&gt;</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_the_extensions_provided">The Extensions Provided</h3> 
-   <div class="paragraph"> 
-    <p>Consul integration comes basically with 2 artifacts:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>The org.apache.tamaya.etcd.ConsulPropertySource is a PropertySource with a default ordinal of 100 and the name 'consul', which is automatically registered.</p> </li> 
-     <li> <p>If the tamaya-mutable-config module is loaded it is possible to write property values back into the consul cluster, by accessing a MutableConfiguration using the URI config:consul.</p> </li> 
-    </ul> 
-   </div> 
-   <div class="paragraph"> 
-    <p>Access of consul key/value pairs is through the normal Tamaya API.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_the_consulpropertysource">The ConsulPropertySource</h3> 
-   <div class="paragraph"> 
-    <p>The ConsulPropertySource is automatically registered and allows the consul servers to be used to be configured. This enables to use e.g. in Docker environments the docker environment configuration mechanisms to configure Tamaya running in microservice containers to connect with the according consul cluster:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>The property source reads the tamaya.consul.urls system and environment property to evaluate possible consul servers (comma separated), which can be connected to. On failure the API just performs a Round-Robin through the list of configured servers. Without any configuration http://127.0.0.1:2400 is used. If no connection to any consul server can be established a warning will be logged, but deployment will not fail.</p> </li> 
-     <li> <p>The ConsulPropertySource finally also allows the values read from the consul cluster to be mapped to prefixed context. This can be activated by setting the <code>-Dtamaya.consul.prefix=&lt;PREFIX&gt;</code> system property. E.g. when the prefix is set to <code>cluster-config.</code> a consul key of <code>host:known/all</code> is mapped to <code>cluster-config.host:known/all</code>.</p> </li> 
-    </ul> 
-   </div> 
-  </div> 
- </div> 
+&lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_the_functionality_provided">The Functionality Provided</h3>
+<div class="paragraph">
+<p>Tamaya Consul provides two artifacts:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The org.apache.tamaya.consul.ConsulPropertySource is a PropertySource with a default
+ordinal of 100 and the name 'consul'.</p>
+</li>
+<li>
+<p>org.apache.tamaya.consul.ConsulPropertySource is based on org.apache.tamaya.consul.AbstractConsulPropertySource,
+which provides all required basic functionality to implement your own consul based property
+sources.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Access of consul key/value pairs is through the normal Tamaya API.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_the_consulpropertysource">The ConsulPropertySource</h3>
+<div class="paragraph">
+<p>The ConsulPropertySource allows the consul servers to be used as configuration backends. It provides:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>a Consul based property source implementation.</p>
+</li>
+<li>
+<p>configurable caching of key/values accessed (Consul does not provide reading all values out).</p>
+</li>
+<li>
+<p>configuring a optional key prefix for defining a namespace for Tamaya configuration within the consul key/value
+store.</p>
+</li>
+<li>
+<p>ConsulPropertySource reads the tamaya.consul.urls system and environment property to evaluate the consul servers
+to be used (comma separated). The API just performs a Round-Robin through the list of
+configured servers. Without any configuration http://127.0.0.1:2400 is used. If no connection to any consul
+server can be established a warning will be logged, but deployment will not fail.</p>
+</li>
+<li>
+<p>The ConsulPropertySource finally also allows the values read from the consul cluster to be mapped with a prefix.
+This allows to let all values stored in consul have their own namespace. E.g. the Tamaya key <code>a.b</code> is mapped
+to <code>foo.a.b</code>, when the prefix is set to <code>foo.</code>. The prefix can be activated by setting the
+<code>tamaya.consul.prefix</code> system or environment property.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_the_abstractconsulpropertysource">The AbstractConsulPropertySource</h3>
+<div class="paragraph">
+<p>The AbstractConsulPropertySource provides all features from ConsulPropertySource but does not define how the
+property source is exactly configured, so you have full control.</p>
+</div>
+</div>
+</div>
 </div></p>
 
 			<hr />
@@ -203,9 +244,9 @@
 
 		    <div id="footer">
 		      <div class="container">
-		        <p class="muted credit">&copy; 2014-<span>2018</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
-							| Baked with <a href="http://jbake.org">JBake <span>v2.6.1</span></a>
-							at <span>2018-11-02</span> |
+		        <p class="muted credit">&copy; 2014-<span>2019</span> Apache Software Foundation | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a>
+							| Baked with <a href="http://jbake.org">JBake <span>v2.6.3</span></a>
+							at <span>2019-01-05</span> |
 						<a class="twitter-follow-button" data-show-count="false" href="https://twitter.com/tamayaconf">Follow @tamayaconf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>
diff --git a/documentation/extensions/mod_etcd.html b/documentation/extensions/mod_etcd.html
index dabc431..121a02f 100644
--- a/documentation/extensions/mod_etcd.html
+++ b/documentation/extensions/mod_etcd.html
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+          <a class="navbar-brand" href="../../index.html">Tamaya Home</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -111,9 +111,12 @@
               </ul>
             </li>
 -->
-						<li><a href="../../sitemap.xml">Sitemap</a></li>
-						<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="../../sitemap.xml">Sitemap</a></li>
+			<li><a href="../../feed.xml">Subscribe</a></li>
+			<li><a href="https://incubator.apache.org/guides/website.html" style="border:0px;" target="_target">
+                                 <img class="incubator-logo" src="../../logos/apache-incubator.png"/></a></li>
           </ul>
+
         </div><!--/.nav-collapse -->
       </div>
     </div>
@@ -125,195 +128,106 @@
 				<h1>Apache Tamaya - Extension: Integration with etcd (Core OS)</h1>
 			</div>
 
-			<p><em>2018-09-06</em></p>
+			<p><em>2018-12-17</em></p>
 
-			<p><div id="preamble"> 
- <div class="sectionbody"> 
-  <!-- toc disabled --> 
- </div> 
-</div> 
-<div class="sect1"> 
- <h2 id="Etcd">Integration with etcd (Extension Module)</h2> 
- <div class="sectionbody"> 
-  <div class="paragraph"> 
-   <p>Tamaya <em>Etcd</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3> 
-   <div class="paragraph"> 
-    <p>Tamaya <em>Etcd</em> provides different artifacts which allows using <a href="https://github.com/coreos/etcd">etcd</a> as a configuration backend. Basically the module adds a read-only property source (EtcdPropertySource). If the <em>tamaya-mutable-config</em> extension is loaded it is alos possible to write configuration changes to <em>etcd</em> using MutableConfiguration.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_compatibility">Compatibility</h3> 
-   <div class="paragraph"> 
-    <p>The module is based on Java 7, so it will not run on Java 7 and beyond.</p> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_installation">Installation</h3> 
-   <div class="paragraph"> 
-    <p>To use <em>etcd</em> as a configuration backend you only must add the corresponding dependency to your module:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+			<p><div id="preamble">
+<div class="sectionbody">
+<!-- toc disabled -->
+</div>
+</div>
+<div class="sect1">
+<h2 id="Etcd">Integration with etcd (Extension Module)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>Etcd</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a> for further details.</p>
+</div>
+<div class="sect2">
+<h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
+<div class="paragraph">
+<p>Tamaya <em>Etcd</em> provides artifacts, which allow using <a href="https://github.com/coreos/etcd">etcd</a> as a
+configuration backend. Basically the module adds a read-only property source (EtcdPropertySource). If
+the <em>tamaya-mutable-config</em> extension is loaded it is alos possible to write configuration
+changes to <em>etcd</em> using MutableConfiguration.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_compatibility">Compatibility</h3>
+<div class="paragraph">
+<p>The module is based on Java 8.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_installation">Installation</h3>
+<div class="paragraph">
+<p>To use <em>etcd</em> as a configuration backend you only must add the corresponding dependency to
+your module:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.tamaya.ext&lt;/groupId&gt;
   &lt;artifactId&gt;tamaya-etcd&lt;/artifactId&gt;
   &lt;version&gt;{tamaya_version}&lt;/version&gt;
-&lt;/dependency&gt;</code></pre> 
-    </div> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_the_extensions_provided">The Extensions Provided</h3> 
-   <div class="paragraph"> 
-    <p>Tamaya’s <em>etcd</em> integration provides basically the following artifacts:</p> 
-   </div> 
-   <div class="ulist"> 
-    <ul> 
-     <li> <p>The org.apache.tamaya.etcd.EtcdAccessor can be configured with a an url targeting an etcd server’s REST endpoint root. The accessor basically provides a simple Java API for communicating with the <em>etcd</em> server. The accessor hereby allows reading of single properties, or whole subtrees. Also the basic non atomic write methods are implemented.</p> </li> 
-     <li> <p>The org.apache.tamaya.etcd.EtcdPropertySource is a PropertySource with a default ordinal of 100 and the name 'etcd', which is automatically registered.</p> </li> 
-     <li> <p>If the tamaya-mutable-config module is loaded it is possible to write property values back into the etcd cluster, by accessing a MutableConfiguration using the URI config:etcd.</p> </li> 
-    </ul> 
-   </div> 
-  </div> 
-  <div class="sect2"> 
-   <h3 id="_the_etcdaccessor">The EtcdAccessor</h3> 
-   <div class="paragraph"> 
-    <p>The accessor implements the basic read and write API for communicating with an <em>etcd</em> server. Hereby the accessor also provides <em>etcd</em> specific data such as createdIndex, modifiedIndex, ttl in the Map returned. Hereby the concept of <em>etcd</em> is used where keys starting with an '_' represent meta-configuration that will be hidden from the overall properties map, being only directly/explicitly accessible:</p> 
-   </div> 
-   <div class="listingblock"> 
-    <div class="content"> 
-     <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public class EtcdAccessor {
-
-    /**
-     * Creates a new instance with the basic access url.
-     * @param server server url, e.g. {@code http://127.0.0.1:4001}.
-     * @throws MalformedURLException
-     */
-    public EtcdAccessor(String server) throws MalformedURLException;
-
-    /**
-     * Get the etcd server version.
-     * @return the etcd server version, never null.
-     */
-    public String getVersion();
-
-    /**
-     * Ask etcd for s aingle key, value pair. Hereby the response returned from etcd:
-     * &lt;pre&gt;
-     *     key=value
-     *     _key.source=[etcd]http://127.0.0.1:4001
-     *     _key.createdIndex=12
-     *     _key.modifiedIndex=34    // optional
-     *     _key.ttl=300             // optional
-     *     _key.expiration=...      // optional
-     * &lt;/pre&gt;
-     * @param key the requested key
-     * @return the mapped result, including meta-entries.
-     */
-    public Map&lt;String,String&gt; get(String key);
-
-    /**
-     * Creates/updates an entry in etcd without any ttl set.
-     * The response is as follows:
-     * &lt;pre&gt;
-     *     key=value
-     *     _key.source=[etcd]http://127.0.0.1:4001
-     *     _key.createdIndex=12
-     *     _key.modifiedIndex=34             // optional
-     *     _key.prevNode.createdIndex=12     // optional
-     *     _key.prevNode.modifiedIndex=34    // optional
-     * &lt;/pre&gt;
-     * @param key the property key, not null
-     * @param value the value to be set
-     * @return the result map as described above.
-     */
-    public Map&lt;String,String&gt; set(String key, String value);
-
-    /**
-     * Creates/updates an entry in etcd. The response is as follows:
-     * &lt;pre&gt;
-     *     key=value
-     *     _key.source=[etcd]http://127.0.0.1:4001
-     *     _key.createdIndex=12
-     *     _key.modifiedIndex=34             // optional
-     *     _key.ttl=300                      // optional
-     *     _key.expiry=...                   // optional
-     *     _key.prevNode.createdIndex=12     // optional
-     *     _key.prevNode.modifiedIndex=34    // optional
-     *     _key.prevNode.ttl=300             // optional
-     *     _key.prevNode.expiration=...      // optional
-     * &lt;/pre&gt;
-     * @param key the property key, not null
-     * @param value the value to be set
-     * @param ttlSeconds the ttl in seconds (optional)
-     * @return the result map as described above.
-     */
-    public Map&lt;String,String&gt; set(String key, String value, Integer ttlSeconds);
-
-
-    /**
-     * Deletes a given key. The response is as follows:
-     * &lt;pre&gt;
-     *     _key.source=[etcd]http://127.0.0.1:4001
-     *     _key.createdIndex=12
-     *     _key.modifiedIndex=34
-     *     _key.ttl=300                       // optional
-     *     _key.expiry=...                    // optional
... 17380 lines suppressed ...