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 2017/03/07 20:54:04 UTC

[1/3] incubator-tamaya-site git commit: TAMAYA-255: Regenerate.

Repository: incubator-tamaya-site
Updated Branches:
  refs/heads/asf-site d22f8ed33 -> 637aaff62


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_server.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_server.html b/documentation/extensions/mod_server.html
index 1f284c0..97ad987 100644
--- a/documentation/extensions/mod_server.html
+++ b/documentation/extensions/mod_server.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Configuration Server</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -168,12 +168,16 @@ configuration properties.</p>
 <div class="sect2">
 <h3 id="_providing_configuration_using_the_tamaya_built_in_configuration_server">Providing configuration using the Tamaya Built-in Configuration Server</h3>
 <div class="paragraph">
-<p>THe most simple way for providing onfiguration ist to start the internal server:</p>
+<p>The most simple way for providing configuration is to start the internal server:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Server server = org.apache.tamaya.server.ConfigServer.createServer();
-server.start(port);</code></pre>
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">// using context path: '/', port 8085
+org.apache.tamaya.server.Server.start();
+
+// optionally pass the root context path and/or port:
+// org.apache.tamaya.server.Server.start(8088);
+// org.apache.tamaya.server.Server.start("/appconf", 7787);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -182,11 +186,11 @@ server.start(port);</code></pre>
 <div class="ulist">
 <ul>
 <li>
-<p>GET /config provides access to the full configuration tree.</p>
+<p>GET ${CONTEXT}/config provides access to the full configuration tree.</p>
 </li>
 <li>
-<p>GET /config/filtered/${path} let you filter the configuration returned using regular expression (comma separated).
-E.g. /config/filtered/java,sun will return all configuration entries starting with <em>java</em> and <em>sun</em>.</p>
+<p>GET ${CONTEXT}/config/filtered/${path} let you filter the configuration returned using regular expression (comma separated).
+E.g. ${CONTEXT}/config/filtered/java,sun will return all configuration entries starting with <em>java</em> and <em>sun</em>.</p>
 </li>
 </ul>
 </div>
@@ -198,9 +202,8 @@ parameters:</p>
 <ul>
 <li>
 <p>format allows to define the target format. By default the ACCEPT header of the http request is checked, but this
-setting can be explicitly controlled by passing tis parameter explicitly. The value is the expected MIME type to be
-returned. By default the service supports the following types (refer to the SPI section later in this document for
-options to adapt this):</p>
+setting can be explicitly controlled by passing this parameter explicitly. The value is the expected MIME type to be
+returned. By default the service supports the following types:</p>
 <div class="ulist">
 <ul>
 <li>
@@ -213,70 +216,34 @@ options to adapt this):</p>
 <p>application/xml</p>
 </li>
 <li>
-<p>text/json</p>
+<p>application/json</p>
 </li>
 </ul>
 </div>
 </li>
-<li>
-<p>scope,scopeId allows to use a server-side preconfigured filter/combination policy to be applied for
-evaluating the entries to be returned. Hereby the scopeId paramter allows to address a certain scope.
-As an example think of a scope ?scope=CLIENT&amp;scopeId=client1 to be passed as request parameters. This
-tells the server module to lookup a configured scope named 'CLIENT' and access a ConfigOperator for the
-given scopeId 'client1'. The returned operator then can filter and combine any kind of entries to the
-required client configuration (for client1). Refer to the scopes section for more details.</p>
-</li>
 </ul>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_using_the_configuration_servlets">Using the Configuration Servlets</h3>
 <div class="paragraph">
-<p>Additionally to the fully built-in solution, it is also possible to integrate the Tamaya server module with a standard
-Java EE servlet container. Tamaya provides 2 servlet implementations:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the servlet org.apache.tamaya.server.FilteredConfigServlet can be used to register access to configurations
-that also support filtering of the keys. The URL looks like</p>
-</li>
-</ul>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>http(s)://HOST/SERVLET_CONTEXT/PATHS?params
-
-where
-  HOST            = host name incl port, e.g. 127.0.0.2:234
-  SERVLET_CONTEXT = the base context and servlet context, e.g. /client/config/filtered
-  PATHS           = A comma separated number of key paths to be filtered for being returned, e.g.
-                    java,sun,client
-  params          = the optional parameters (scope, scopeId and format)</pre>
-</div>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the servlet org.apache.tamaya.server.FullConfigServlet can be used to register access to configurations
-that alwyas returns all items known. The URL looks like</p>
-</li>
-</ul>
+<p>You can also register a servlet, e.g. as follows;</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>http(s)://HOST/SERVLET_CONTEXT?params
-
-where
-  HOST            = host name incl port, e.g. 127.0.0.2:234
-  SERVLET_CONTEXT = the base context and servlet context, e.g. /client/config/filtered
-  params          = the optional parameters (scope, scopeId and format)</pre>
+<pre>&lt;servlet&gt;
+  &lt;servlet-name&gt;config-servlet&lt;/servlet-name&gt;
+  &lt;servlet-class&gt;org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet&lt;/servlet-class&gt;
+  &lt;init-params&gt;
+    &lt;init-param key="javax.ws.rs.Application"&gt;org.apache.tamaya.server.Server$ResourceLoader&lt;/init-param&gt;
+  &lt;/init-params&gt;
+&lt;/servlet&gt;</pre>
 </div>
 </div>
 <div class="sect3">
 <h4 id="_formatting_used_by_default">Formatting used by Default</h4>
 <div class="paragraph">
-<p>The server module formats the configuration returned by default in thw following variants:</p>
+<p>The server module formats the configuration returned by default in the following variants:</p>
 </div>
 <div class="listingblock">
 <div class="title">Formatting for text/json</div>
@@ -303,12 +270,12 @@ where
   "sun.jnu.encoding": "Cp1252",
   "sun.management.compiler": "HotSpot 64-Bit Tiered Compilers",
   "sun.os.patch.level": "",
-  "{meta}class": "org.apache.tamaya.functions.FilteredConfiguration",
-  "{meta}info.filter": "java.v,sun",
-  "{meta}info.format": "application/json",
-  "{meta}info.timestamp": "1441463200571",
-  "{meta}timestamp": "1441463200571",
-  "{meta}type": "Configuration"
+  "_class": "org.apache.tamaya.functions.FilteredConfiguration",
+  "_info.filter": "java.v,sun",
+  "_info.format": "application/json",
+  "_info.timestamp": "1441463200571",
+  "_timestamp": "1441463200571",
+  "_type": "Configuration"
 }</code></pre>
 </div>
 </div>
@@ -337,12 +304,12 @@ where
   &lt;entry key="sun.jnu.encoding"&gt;Cp1252&lt;/entry&gt;
   &lt;entry key="sun.management.compiler"&gt;HotSpot 64-Bit Tiered Compilers&lt;/entry&gt;
   &lt;entry key="sun.os.patch.level"&gt;&lt;/entry&gt;
-  &lt;entry key="{meta}class"&gt;org.apache.tamaya.functions.FilteredConfiguration&lt;/entry&gt;
-  &lt;entry key="{meta}info.filter"&gt;java.v,sun&lt;/entry&gt;
-  &lt;entry key="{meta}info.format"&gt;application/xml&lt;/entry&gt;
-  &lt;entry key="{meta}info.timestamp"&gt;1441463383687&lt;/entry&gt;
-  &lt;entry key="{meta}timestamp"&gt;1441463383687&lt;/entry&gt;
-  &lt;entry key="{meta}type"&gt;Configuration&lt;/entry&gt;
+  &lt;entry key="_class"&gt;org.apache.tamaya.functions.FilteredConfiguration&lt;/entry&gt;
+  &lt;entry key="_info.filter"&gt;java.v,sun&lt;/entry&gt;
+  &lt;entry key="_info.format"&gt;application/xml&lt;/entry&gt;
+  &lt;entry key="_info.timestamp"&gt;1441463383687&lt;/entry&gt;
+  &lt;entry key="_timestamp"&gt;1441463383687&lt;/entry&gt;
+  &lt;entry key="_type"&gt;Configuration&lt;/entry&gt;
 &lt;/configuration&gt;</code></pre>
 </div>
 </div>
@@ -371,12 +338,12 @@ where
   sun.jnu.encoding: Cp1252,
   sun.management.compiler: HotSpot 64-Bit Tiered Compilers,
   sun.os.patch.level: ,
-  {meta}class: org.apache.tamaya.functions.FilteredConfiguration,
-  {meta}info.filter: java.v,sun,
-  {meta}info.format: text/plain,
-  {meta}info.timestamp: 1441463082020,
-  {meta}timestamp: 1441463082021,
-  {meta}type: Configuration</code></pre>
+  _class: org.apache.tamaya.functions.FilteredConfiguration,
+  _info.filter: java.v,sun,
+  _info.format: text/plain,
+  _info.timestamp: 1441463082020,
+  _timestamp: 1441463082021,
+  _type: Configuration</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -409,13 +376,12 @@ Configuration:
   sun.jnu.encoding: Cp1252,
   sun.management.compiler: HotSpot 64-Bit Tiered Compilers,
   sun.os.patch.level: ,
-  {meta}class: org.apache.tamaya.functions.FilteredConfiguration,
-  {meta}info.filter: java.v,sun,
-  {meta}info.format: text/html,
-  {meta}info.timestamp: 1441463459653,
-  {meta}timestamp: 1441463459654,
-  {meta}type: Configuration
-
+  _class: org.apache.tamaya.functions.FilteredConfiguration,
+  _info.filter: java.v,sun,
+  _info.format: text/html,
+  _info.timestamp: 1441463459653,
+  _timestamp: 1441463459654,
+  _type: Configuration
 &lt;/pre&gt;
 &lt;/body&gt;
 &lt;/html&gt;</code></pre>
@@ -423,127 +389,6 @@ Configuration:
 </div>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_spi">SPI</h3>
-<div class="sect3">
-<h4 id="_scopes">Scopes</h4>
-<div class="paragraph">
-<p>As mentioned earlier in this document scopes can be used to define the exact configuration tree to be returned, e.g.
-as a result of combining multiple sub trees. Following an example of the code to be written to return a configuration
-that combines common client default entries with client specific entries:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public class ClientScopeProvider implements ScopeProvider{
-
-    /**
-     * Access the unique scope name.
-     * @return the unique scope name.
-     */
-    public String getScopeType(){
-            return "CLIENT";
-    }
-
-    @Override
-    public ConfigOperator getScope(String scopeId) {
-        return c -&gt;
-                ConfigurationFunctions.combine("Scoped Config CLIENT="+scopeId,
-                        c.with(ConfigurationFunctions.sectionRecursive(true, "client.default")),
-                        c.with(ConfigurationFunctions.sectionRecursive(true, "client." + scopeId))
-                );
-    }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This class can be registered using the ServiceContext in place. By default the ServiceLoader is used, so you will
-have to add the following to META-INF/services/org.apache.tamaya.server.spi.ScopeProvider:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-listing" data-lang="listing">my.full.packagename.ClientScopeProvider</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_adapting_the_way_configuration_is_derived">Adapting the Way Configuration is Derived</h4>
-<div class="paragraph">
-<p>Finally the effective readong and configuration handling logic can also be replaced or improved. This can be
-done by registering your own implementation of the interface ConfigProviderService:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface ConfigProviderService {
-    String getConfigurationWithPath(String path, String format, String scope, String scopeId, HttpServletRequest request);
-    String getConfiguration(String format, String scope, String scopeId, HttpServletRequest request);
-    void updateConfiguration(String payload, HttpServletRequest request);
-    void deleteConfiguration(String paths, HttpServletRequest request);
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>By default the ServiceContextManager uses the java.util.ServiceLoader for component loading, so to replace the
-default server code you must register a higher @Priority implementation.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_replacing_the_built_in_server">Replacing the Built-In Server</h4>
-<div class="paragraph">
-<p>We have seen earlier that starting a configuration server is pretty easy:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Server server = org.apache.tamaya.server.ConfigServer.createServer();
-server.start(port);</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Nevertheless one may want to replace the used implementation of Server. This can be done easily by simply
-registering an overriding implementation if the corresponding interface:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface Server {
-    void start(int port);
-    boolean isStarted();
-    void stop();
-    void destroy();
-}</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_the_scopemanager_singleton">The ScopeManager Singleton</h4>
-<div class="paragraph">
-<p>Finally whe implementing your own server, you might also benefit from the ScopeManager singleton. Basically this
-class loads all registered ScopeProvider and manages the configured scope instances:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public final class ScopeManager {
-    ...
-
-    private ScopeManager(){}
-
-    /**
-     * Get the scope given its name.
-     * @param scopeId the scope name
-     * @return the scope matching
-     * @throws ConfigException, if nos such scope is defined.
-     */
-    public static ConfigOperator getScope(String scopeId, String target);
-
-    /**
-     * Get the defined scope names.
-     * @return the defined scope names, never null.
-     */
-    public static Set&lt;String&gt; getScopes();
-
-}</code></pre>
-</div>
-</div>
-</div>
-</div>
 </div>
 </div></p>
 
@@ -557,7 +402,7 @@ class loads all registered ScopeProvider and manages the configured scope instan
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_spi-support.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_spi-support.html b/documentation/extensions/mod_spi-support.html
index af80719..8a5d9d8 100644
--- a/documentation/extensions/mod_spi-support.html
+++ b/documentation/extensions/mod_spi-support.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Classloader Isolation Support</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -175,10 +175,27 @@ case, where no such annotation is present).</p>
 + PropertyFiltering provides another helpful class that manages PropertyFilter instances and provides an
   easy to use high level API.
 + PropertySourceComparator provides an implementation that compares PropertySources based on their getOrdinal()
-  values and their class names.</p>
+  values and their class names.
++ The default configuration implementation also allows to replace the raw value evaluation
+  logic using a ConfigValueEvaluator, similar to Tamaya&#8217;s core implementation.</p>
 </li>
 </ul>
 </div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+It is highly recommended that you read also the <a href="../core.html">documentation</a> of Tamaya&#8217;s
+      implementation core, since this describes the abstrations in use in more
+      detail. This module allows to reuse Tamaya&#8217;s implementation artifacts but
+      still allow alternate implementations of the core API to be used.
+</td>
+</tr>
+</table>
+</div>
 </div>
 <div class="sect2">
 <h3 id="_compatibility">Compatibility</h3>
@@ -189,7 +206,7 @@ case, where no such annotation is present).</p>
 <div class="sect2">
 <h3 id="_installation">Installation</h3>
 <div class="paragraph">
-<p>To benefit from Tamaya CDI integration you only must add the corresponding dependency to your module:</p>
+<p>To use Tamaya&#8217;s <em>spisupport</em> you only must add the corresponding dependency to your module:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -219,7 +236,7 @@ of the Tamaya API similarly.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_spring.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_spring.html b/documentation/extensions/mod_spring.html
index 17d9489..7c0d156 100644
--- a/documentation/extensions/mod_spring.html
+++ b/documentation/extensions/mod_spring.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Spring Integration</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -290,7 +290,8 @@ public class ConfiguredSpringBean {
 </div>
 </div>
 <div class="paragraph">
-<p>Summarizing you get all the nice features of Tamaya out of the box running with your Spring code.</p>
+<p>Summarizing you get all the nice features of Tamaya out of the box running
+with your Spring code.</p>
 </div>
 </div>
 </div>
@@ -306,7 +307,7 @@ public class ConfiguredSpringBean {
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_usagetracker.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_usagetracker.html b/documentation/extensions/mod_usagetracker.html
index fec06ab..7b7efa6 100644
--- a/documentation/extensions/mod_usagetracker.html
+++ b/documentation/extensions/mod_usagetracker.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Usage Tracking</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -153,7 +153,7 @@ VM.</p>
 <div class="sect2">
 <h3 id="_installation">Installation</h3>
 <div class="paragraph">
-<p>To benefit from configuration mutability support you only must add the corresponding dependency to your module:</p>
+<p>To use Tamaya <em>usagetracker</em> you only must add the corresponding dependency to your module:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -252,7 +252,7 @@ singleton for configuration statistics is defined as follows:</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_customizing_the_stacktrage_for_usage_reporting">Customizing the Stacktrage for Usage Reporting</h4>
+<h4 id="_customizing_the_stacktrace_for_usage_reporting">Customizing the Stacktrace for Usage Reporting</h4>
 <div class="paragraph">
 <p>The stacktrace tracked by the system can be customized in several ways:</p>
 </div>
@@ -339,7 +339,7 @@ logic can be adapted or replaced.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_validation.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_validation.html b/documentation/extensions/mod_validation.html
index af87ce3..9232151 100644
--- a/documentation/extensions/mod_validation.html
+++ b/documentation/extensions/mod_validation.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Configuration Validation</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -153,7 +153,7 @@ defined in a Tamaya Metaconfiguration XML file.</p>
 <div class="sect2">
 <h3 id="_installation">Installation</h3>
 <div class="paragraph">
-<p>To benefit from Tamaya Metamodel feature you only must add the corresponding dependency to your module:</p>
+<p>To activate configuration <em>validation</em> you only must add the corresponding dependency to your module:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -274,7 +274,7 @@ a WARNING message.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_yaml.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_yaml.html b/documentation/extensions/mod_yaml.html
index be7f7a4..381c946 100644
--- a/documentation/extensions/mod_yaml.html
+++ b/documentation/extensions/mod_yaml.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Builder</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -153,7 +153,7 @@ use intendation for expressing hierarchy, which makes yaml configuration files v
 <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>
+<p>To use YAML as configuration format you must add the corresponding dependency to your module:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -175,7 +175,7 @@ use intendation for expressing hierarchy, which makes yaml configuration files v
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigurationData dataRead = ConfigurationFormats.readConfig(
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">PropertySource ps = ConfigurationFormats.createPropertySource(
     getClassLoader().getResource("myFileConfig.yaml"), new YAMLFormat()));</code></pre>
 </div>
 </div>
@@ -263,7 +263,7 @@ comments -&gt; Late afternoon is best. Backup contact is Nancy Billsmer @ 338-43
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/quickstart.html
----------------------------------------------------------------------
diff --git a/documentation/quickstart.html b/documentation/quickstart.html
index 388a441..9f13202 100644
--- a/documentation/quickstart.html
+++ b/documentation/quickstart.html
@@ -124,16 +124,18 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div class="sect1">
 <h2 id="_apache_tamaya_quickstart">Apache Tamaya: Quickstart</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>The fastest way to start with Tamaya is just using the <em>Core</em> implementation,
-implementing the <strong>API</strong> in small, minimalistic way. For that add the following
+implementing the <strong>API</strong> in a minimalistic way. For that add the following
 Maven dependency to your project:</p>
 </div>
+<div class="sect2">
+<h3 id="_adding_the_tamaya_dependency">Adding the Tamaya Dependency</h3>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
@@ -143,8 +145,39 @@ Maven dependency to your project:</p>
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
+</div>
+<div class="sect2">
+<h3 id="_start_coding">Start Coding</h3>
 <div class="paragraph">
-<p>Given that you can add your configuration properties to the following locations in your classpath:</p>
+<p>In your Java code you can directly access configuration from the API. In most cases it is recommended
+to provide the default values when accessing the configuration:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Configuration config = ConfigurationProvider.getConfiguration();
+
+String aTextValue = config.getOrDefault("my.value.key", "N/A");
+int aNumericValue = config.getOrDefault("my.numValueKey", Integer.class, 15 /* default */);
+BigDecimal bdValue = config.getOrDefault("my.BD.value", BigDecimal.class, BigDecimal.valueOf(120));</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>With Java 8 you can, of course, also use Optional, 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();
+
+String aTextValue = Optional.ofNullable(config.getOrDefault("my.value.key").orElse("N/A");</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_add_define_your_configuration_data">Add/define your configuration data</h3>
+<div class="paragraph">
+<p>As seen you can immedeatly start working with your configuration backend, without adding any kind of
+default configuration. Nevertheless the <em>core</em> implementation also comes with a <em>default</em> mechanism,
+where you can store your configuration as .properties in your classpath:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -152,8 +185,8 @@ Maven dependency to your project:</p>
 </div>
 </div>
 <div class="paragraph">
-<p>Additionally also system properties are taken into account, hereby overriding the default properties. Overall
-Tamaya by default defines the following configuration model per default (most significant first):</p>
+<p>Additionally also system properties are taken into account, hereby overriding the <em>default</em> properties.
+Overall Tamaya by default defines the following configuration model per default (most significant first):</p>
 </div>
 <div class="olist arabic">
 <ol class="arabic">
@@ -165,21 +198,58 @@ Tamaya by default defines the following configuration model per default (most si
 </li>
 </ol>
 </div>
-<div class="paragraph">
-<p>There many modules that extend the capabilities of Tamaya.
-These modules doe not depend on core, so alternative
-implementations of the Tamaya API should work similarly.</p>
 </div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_advanced_topics">Advanced Topics</h2>
+<div class="sectionbody">
 <div class="sect2">
 <h3 id="_multiple_configuration_files">Multiple configuration files</h3>
 <div class="paragraph">
 <p>By default you can provide multiple <code>javaconfig.properties</code> files, e.g. as part
-of multiple jars loaded into your system. The system internally creates one
+of multiple jars loaded into your system. The system creates one
 <code>PropertySource</code> for each file found on the classpath. All <code>PropertySource</code>
-instances created are ordered by their ordinal value (an int).</p>
+instances created are ordered by their precedence.</p>
+</div>
+<div class="paragraph">
+<p>By default the precendence of a PropertySource is evaluated based on an <em>ordinal</em> value
+calculated as follows:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>the systems checks for a <code>tamaya.ordinal</code> configuration value and tries to convert to
+an <code>int</code> ordinal value.</p>
+</li>
+<li>
+<p>the systems checks if the property source has a method int getOrdinal(). If present
+the result is used as ordinal.</p>
+</li>
+<li>
+<p>the systems checks if the property source has a <code>@Priority</code> annotation and uses the
+annotation&#8217;s value as ordinal.</p>
+</li>
+<li>
+<p>if all of the above fails, 0 is assumed as ordinal.</p>
+</li>
+</ol>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+Since evaluation of the <code>tamaya.ordinal</code> is always done first, it is possible to change
+      the ordinal value by adding a corresponding configuration entry to a property source.
+</td>
+</tr>
+</table>
 </div>
 <div class="paragraph">
-<p>Tamaya Core defines the following default ordinals (used, if no custom ordinal is defined):</p>
+<p>Tamaya Core uses the following default ordinals:</p>
 </div>
 <table class="tableblock frame-all grid-all" style="width: 70%;">
 <colgroup>
@@ -196,19 +266,19 @@ instances created are ordered by their ordinal value (an int).</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock">400</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Environment Variables</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Environment Properties</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">Java Configuration Properties</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Properties from <code>META-INF/javaconfiguration.properties</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">100</p></td>
 </tr>
 </tbody>
 </table>
 <div class="paragraph">
 <p>That means that the value of a configuration variable <code>x</code> overhanded via <code>-Dx=yes</code> has
-a higher precedence then the entry for configuration variable <code>x</code> specified in a <code>javaconfig.properties</code>
-as <code>x=no</code>.</p>
+a higher precedence then the entry for configuration variable <code>x</code> specified in
+<code>META-INF/javaconfig.properties</code> as <code>x=no</code>.</p>
 </div>
 <div class="paragraph">
 <p>These ordinal values can be either hardcoded, or be dynamically
@@ -222,7 +292,8 @@ tamaya.ordinal=123</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>This assigns an ordinal of 123 to each entry in that configuration resource.</p>
+<p>This assigns an ordinal of 123 to each entry in that property source providing this configuration
+properties.</p>
 </div>
 </div>
 <div class="sect2">
@@ -231,7 +302,9 @@ tamaya.ordinal=123</code></pre>
 <p>There many modules that extend the capabilities of
 Tamaya. These modules doe not depend on core, so alternative
 implementations of the Tamaya API should work similarly. Following a
-small extract of most important modules available (or available soon):</p>
+small extract of most important modules available (or available soon).
+Refer to <a href="extensions/extensions.html">this list</a> for a complete
+overview.</p>
 </div>
 <div class="sect3">
 <h4 id="_dynamic_resolution_and_value_placeholders">Dynamic Resolution and Value Placeholders</h4>
@@ -303,7 +376,7 @@ annotated classes or let Tamaya implement a configuration template.</p>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">public class MyType {
-   @ConfiguredProperty("name")
+   @Config("my.key")
    private String typeName;
 
    public String getName() {
@@ -321,7 +394,7 @@ ConfigurationInjector.configure(type);</code></pre>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-xml" data-lang="xml">public interface MyTypeTemplate {
-   @ConfiguredProperty("name")
+   @Config("my.key")
    public String getName();
 }
 
@@ -370,7 +443,7 @@ MyTypeTemplate type = ConfigurationInjector.createTemplate(MyTypeTemplate.class)
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/usecases.html
----------------------------------------------------------------------
diff --git a/documentation/usecases.html b/documentation/usecases.html
index ceaba60..098e77b 100644
--- a/documentation/usecases.html
+++ b/documentation/usecases.html
@@ -1045,7 +1045,7 @@ on Configuration.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/download.html
----------------------------------------------------------------------
diff --git a/download.html b/download.html
index 2856bc2..9415dab 100644
--- a/download.html
+++ b/download.html
@@ -242,7 +242,7 @@ $ gpg --verify tamaya-project-1.2.0-source-release.zip.asc</code></pre>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/examples.html
----------------------------------------------------------------------
diff --git a/examples.html b/examples.html
index 67938b8..03caa4f 100644
--- a/examples.html
+++ b/examples.html
@@ -208,7 +208,7 @@ adapted.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 9c5a27b..7b6a5e6 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
     <atom:link href="https://tamaya.incubator.apache.org/feed.xml" rel="self" type="application/rss+xml" />
     <description>Apache Tamaya RSS feed template</description>
     <language>en-gb</language>
-    <pubDate>Fr, 24 Feb 2017 22:17:25 +0100</pubDate>
-    <lastBuildDate>Fr, 24 Feb 2017 22:17:25 +0100</lastBuildDate>
+    <pubDate>Di, 7 M�r 2017 21:53:28 +0100</pubDate>
+    <lastBuildDate>Di, 7 M�r 2017 21:53:28 +0100</lastBuildDate>
 
     <item>
       <title>Blog post (German) - Dirk Weil: Anwendungskonfiguration mit Apache Tamaya</title>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/highleveldesign.html
----------------------------------------------------------------------
diff --git a/highleveldesign.html b/highleveldesign.html
index 4bd7029..c1740ef 100644
--- a/highleveldesign.html
+++ b/highleveldesign.html
@@ -412,7 +412,7 @@ and of its current available <a href="documentation/extensions.html">modules</a>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/history.html
----------------------------------------------------------------------
diff --git a/history.html b/history.html
index 0e99bd8..46965c8 100644
--- a/history.html
+++ b/history.html
@@ -173,7 +173,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 3398436..0001b2c 100644
--- a/index.html
+++ b/index.html
@@ -451,7 +451,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/release-guide.html
----------------------------------------------------------------------
diff --git a/release-guide.html b/release-guide.html
index 1cbbaac..b51c7ed 100644
--- a/release-guide.html
+++ b/release-guide.html
@@ -526,7 +526,7 @@ Also drop a short mail on the mailing list.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/sitemap.xml
----------------------------------------------------------------------
diff --git a/sitemap.xml b/sitemap.xml
index aeec1b0..9f2e32c 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,136 +1,145 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
     <url>
-        <loc>https://tamaya.incubator.apache.org/history.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/development/source.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/release-guide.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/api.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/start.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/core.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/apidocs/index.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_camel.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/community.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_features.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/possible-contributions.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_hazelcast.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/source.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jndi.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/development/team.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_mutable_config.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/devguide.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_optional.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/api.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_osgi.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/core.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_remote.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_camel.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resolver.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_cdi.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resources.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_classloader_support.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_server.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_collections.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_spi-support.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_consul.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_spring.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_etcd.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_usagetracker.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_events.html</loc>
-        <lastmod>2017-02-24</lastmod>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_validation.html</loc>
+        <lastmod>2017-03-07</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_filter.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_yaml.html</loc>
+        <lastmod>2017-03-07</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions.html</loc>
+        <lastmod>2017-03-07</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/documentation/quickstart.html</loc>
+        <lastmod>2017-03-07</lastmod>
+    </url><url>
+        <loc>https://tamaya.incubator.apache.org/download.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_formats.html</loc>
+        <loc>https://tamaya.incubator.apache.org/examples.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_functions.html</loc>
+        <loc>https://tamaya.incubator.apache.org/highleveldesign.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_injection.html</loc>
+        <loc>https://tamaya.incubator.apache.org/history.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jodatime.html</loc>
+        <loc>https://tamaya.incubator.apache.org/release-guide.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_json.html</loc>
+        <loc>https://tamaya.incubator.apache.org/start.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_management.html</loc>
+        <loc>https://tamaya.incubator.apache.org/apidocs/index.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_metamodel.html</loc>
+        <loc>https://tamaya.incubator.apache.org/development/community.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_mutable_config.html</loc>
+        <loc>https://tamaya.incubator.apache.org/development/possible-contributions.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_optional.html</loc>
+        <loc>https://tamaya.incubator.apache.org/development/team.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_osgi.html</loc>
+        <loc>https://tamaya.incubator.apache.org/devguide.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_remote.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_cdi.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resolver.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_classloader_support.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_resources.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_collections.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_server.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_consul.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_spi-support.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_etcd.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_spring.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_events.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_usagetracker.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_filter.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_validation.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_formats.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_yaml.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_functions.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/extensions.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_injection.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/quickstart.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_jodatime.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/documentation/usecases.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_json.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/download.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_management.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/examples.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/extensions/mod_metamodel.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
-        <loc>https://tamaya.incubator.apache.org/highleveldesign.html</loc>
+        <loc>https://tamaya.incubator.apache.org/documentation/usecases.html</loc>
         <lastmod>2017-02-24</lastmod>
     </url><url>
         <loc>https://tamaya.incubator.apache.org/blog/2016/dirk-weil-javaeeblog.html</loc>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/start.html
----------------------------------------------------------------------
diff --git a/start.html b/start.html
index f2fe2b5..f61b810 100644
--- a/start.html
+++ b/start.html
@@ -238,7 +238,7 @@ or in a clustered Docker environment in production, it stays the same!</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>


[3/3] incubator-tamaya-site git commit: TAMAYA-255: Regenerate.

Posted by po...@apache.org.
TAMAYA-255: Regenerate.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/commit/637aaff6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/637aaff6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/637aaff6

Branch: refs/heads/asf-site
Commit: 637aaff62b6e89d404ea1a004c27901a33698531
Parents: d22f8ed
Author: Phil Ottlinger <po...@apache.org>
Authored: Tue Mar 7 21:53:50 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Tue Mar 7 21:53:50 2017 +0100

----------------------------------------------------------------------
 archive.html                                    |   2 +-
 blog/2014/no-jsr-in-javaee8.html                |   2 +-
 blog/2014/whatistamaya.html                     |   2 +-
 blog/2015/dzone-article.html                    |   2 +-
 blog/2015/introduction.html                     |   2 +-
 blog/2015/javaland.html                         |   2 +-
 blog/2015/new-configuration-api.html            |   2 +-
 blog/2016/apachecon-seville.html                |   2 +-
 blog/2016/apachecon-vancouver.html              |   2 +-
 blog/2016/bedcon.html                           |   2 +-
 blog/2016/dirk-weil-javaeeblog.html             |   2 +-
 blog/2016/infoq-article.html                    |   2 +-
 blog/2016/java2days-sofia.html                  |   2 +-
 blog/2016/javaland.html                         |   2 +-
 blog/2016/javaone.html                          |   2 +-
 blog/2016/jug-basel.html                        |   2 +-
 blog/2016/jug-stgallen.html                     |   2 +-
 blog/2016/tamaya-book.html                      |   2 +-
 blog/2016/voxxed-days-zurich.html               |   2 +-
 development/community.html                      |   2 +-
 development/possible-contributions.html         |   2 +-
 development/source.html                         |  16 +-
 development/team.html                           |   2 +-
 devguide.html                                   |   2 +-
 documentation/api.html                          | 152 ++++++++--
 documentation/core.html                         | 218 +++++++++----
 documentation/extensions.html                   | 156 +++++-----
 documentation/extensions/mod_camel.html         |  16 +-
 documentation/extensions/mod_cdi.html           |   2 +-
 .../extensions/mod_classloader_support.html     |   2 +-
 documentation/extensions/mod_collections.html   |   2 +-
 documentation/extensions/mod_consul.html        |   2 +-
 documentation/extensions/mod_etcd.html          |   2 +-
 documentation/extensions/mod_events.html        |   2 +-
 documentation/extensions/mod_features.html      | 301 ++++++++++++++++++
 documentation/extensions/mod_filter.html        |   2 +-
 documentation/extensions/mod_formats.html       |   2 +-
 documentation/extensions/mod_functions.html     |   2 +-
 documentation/extensions/mod_hazelcast.html     | 303 +++++++++++++++++++
 documentation/extensions/mod_injection.html     |   2 +-
 documentation/extensions/mod_jndi.html          | 247 +++++++++++++++
 documentation/extensions/mod_jodatime.html      |   2 +-
 documentation/extensions/mod_json.html          |   2 +-
 documentation/extensions/mod_management.html    |   2 +-
 documentation/extensions/mod_metamodel.html     |   2 +-
 .../extensions/mod_mutable_config.html          | 115 ++-----
 documentation/extensions/mod_optional.html      |  26 +-
 documentation/extensions/mod_osgi.html          |  20 +-
 documentation/extensions/mod_remote.html        |  36 +--
 documentation/extensions/mod_resolver.html      |  13 +-
 documentation/extensions/mod_resources.html     |  27 +-
 documentation/extensions/mod_server.html        | 251 +++------------
 documentation/extensions/mod_spi-support.html   |  25 +-
 documentation/extensions/mod_spring.html        |   7 +-
 documentation/extensions/mod_usagetracker.html  |   8 +-
 documentation/extensions/mod_validation.html    |   6 +-
 documentation/extensions/mod_yaml.html          |   8 +-
 documentation/quickstart.html                   | 115 +++++--
 documentation/usecases.html                     |   2 +-
 download.html                                   |   2 +-
 examples.html                                   |   2 +-
 feed.xml                                        |   4 +-
 highleveldesign.html                            |   2 +-
 history.html                                    |   2 +-
 index.html                                      |   2 +-
 release-guide.html                              |   2 +-
 sitemap.xml                                     | 133 ++++----
 start.html                                      |   2 +-
 68 files changed, 1629 insertions(+), 664 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/archive.html
----------------------------------------------------------------------
diff --git a/archive.html b/archive.html
index 072ca43..64c85ac 100644
--- a/archive.html
+++ b/archive.html
@@ -259,7 +259,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2014/no-jsr-in-javaee8.html
----------------------------------------------------------------------
diff --git a/blog/2014/no-jsr-in-javaee8.html b/blog/2014/no-jsr-in-javaee8.html
index b333712..f27d17e 100644
--- a/blog/2014/no-jsr-in-javaee8.html
+++ b/blog/2014/no-jsr-in-javaee8.html
@@ -150,7 +150,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2014/whatistamaya.html
----------------------------------------------------------------------
diff --git a/blog/2014/whatistamaya.html b/blog/2014/whatistamaya.html
index c65d296..5def878 100644
--- a/blog/2014/whatistamaya.html
+++ b/blog/2014/whatistamaya.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2015/dzone-article.html
----------------------------------------------------------------------
diff --git a/blog/2015/dzone-article.html b/blog/2015/dzone-article.html
index bab5d8b..3411482 100644
--- a/blog/2015/dzone-article.html
+++ b/blog/2015/dzone-article.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2015/introduction.html
----------------------------------------------------------------------
diff --git a/blog/2015/introduction.html b/blog/2015/introduction.html
index bc8b1a7..c0d880d 100644
--- a/blog/2015/introduction.html
+++ b/blog/2015/introduction.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2015/javaland.html
----------------------------------------------------------------------
diff --git a/blog/2015/javaland.html b/blog/2015/javaland.html
index 7dbc2b6..884d71f 100644
--- a/blog/2015/javaland.html
+++ b/blog/2015/javaland.html
@@ -153,7 +153,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2015/new-configuration-api.html
----------------------------------------------------------------------
diff --git a/blog/2015/new-configuration-api.html b/blog/2015/new-configuration-api.html
index 81816c1..63a6259 100644
--- a/blog/2015/new-configuration-api.html
+++ b/blog/2015/new-configuration-api.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/apachecon-seville.html
----------------------------------------------------------------------
diff --git a/blog/2016/apachecon-seville.html b/blog/2016/apachecon-seville.html
index 7b77eb1..4c5d721 100644
--- a/blog/2016/apachecon-seville.html
+++ b/blog/2016/apachecon-seville.html
@@ -153,7 +153,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/apachecon-vancouver.html
----------------------------------------------------------------------
diff --git a/blog/2016/apachecon-vancouver.html b/blog/2016/apachecon-vancouver.html
index 5a498e9..0045a36 100644
--- a/blog/2016/apachecon-vancouver.html
+++ b/blog/2016/apachecon-vancouver.html
@@ -150,7 +150,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/bedcon.html
----------------------------------------------------------------------
diff --git a/blog/2016/bedcon.html b/blog/2016/bedcon.html
index 693df09..3c4b7b2 100644
--- a/blog/2016/bedcon.html
+++ b/blog/2016/bedcon.html
@@ -150,7 +150,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/dirk-weil-javaeeblog.html
----------------------------------------------------------------------
diff --git a/blog/2016/dirk-weil-javaeeblog.html b/blog/2016/dirk-weil-javaeeblog.html
index a49538f..ece9fe3 100644
--- a/blog/2016/dirk-weil-javaeeblog.html
+++ b/blog/2016/dirk-weil-javaeeblog.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/infoq-article.html
----------------------------------------------------------------------
diff --git a/blog/2016/infoq-article.html b/blog/2016/infoq-article.html
index 5370a90..07aa787 100644
--- a/blog/2016/infoq-article.html
+++ b/blog/2016/infoq-article.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/java2days-sofia.html
----------------------------------------------------------------------
diff --git a/blog/2016/java2days-sofia.html b/blog/2016/java2days-sofia.html
index e4aa433..bf90d53 100644
--- a/blog/2016/java2days-sofia.html
+++ b/blog/2016/java2days-sofia.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/javaland.html
----------------------------------------------------------------------
diff --git a/blog/2016/javaland.html b/blog/2016/javaland.html
index 816d0c3..8491d8f 100644
--- a/blog/2016/javaland.html
+++ b/blog/2016/javaland.html
@@ -159,7 +159,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/javaone.html
----------------------------------------------------------------------
diff --git a/blog/2016/javaone.html b/blog/2016/javaone.html
index 515747b..b37d23d 100644
--- a/blog/2016/javaone.html
+++ b/blog/2016/javaone.html
@@ -153,7 +153,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/jug-basel.html
----------------------------------------------------------------------
diff --git a/blog/2016/jug-basel.html b/blog/2016/jug-basel.html
index 9f9581c..f8239b4 100644
--- a/blog/2016/jug-basel.html
+++ b/blog/2016/jug-basel.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/jug-stgallen.html
----------------------------------------------------------------------
diff --git a/blog/2016/jug-stgallen.html b/blog/2016/jug-stgallen.html
index 8a5b5a8..6fdbcbb 100644
--- a/blog/2016/jug-stgallen.html
+++ b/blog/2016/jug-stgallen.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/tamaya-book.html
----------------------------------------------------------------------
diff --git a/blog/2016/tamaya-book.html b/blog/2016/tamaya-book.html
index ebd0982..5650fc3 100644
--- a/blog/2016/tamaya-book.html
+++ b/blog/2016/tamaya-book.html
@@ -153,7 +153,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/blog/2016/voxxed-days-zurich.html
----------------------------------------------------------------------
diff --git a/blog/2016/voxxed-days-zurich.html b/blog/2016/voxxed-days-zurich.html
index 3ed095e..2153fc7 100644
--- a/blog/2016/voxxed-days-zurich.html
+++ b/blog/2016/voxxed-days-zurich.html
@@ -147,7 +147,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/development/community.html
----------------------------------------------------------------------
diff --git a/development/community.html b/development/community.html
index 7cd90e5..e68fe87 100644
--- a/development/community.html
+++ b/development/community.html
@@ -288,7 +288,7 @@ $ irssi
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/development/possible-contributions.html
----------------------------------------------------------------------
diff --git a/development/possible-contributions.html b/development/possible-contributions.html
index 15e3e9e..0caacf1 100644
--- a/development/possible-contributions.html
+++ b/development/possible-contributions.html
@@ -472,7 +472,7 @@ as configured.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/development/source.html
----------------------------------------------------------------------
diff --git a/development/source.html b/development/source.html
index e0af065..54d1e20 100644
--- a/development/source.html
+++ b/development/source.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya: Source code repositories</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -162,6 +162,9 @@ In case you want to contribute file an issue in our <a href="https://issues.apac
 <li>
 <p><a href="https://github.com/apache/incubator-tamaya" target="_blank">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">Jenkins</a></p>
+</li>
 </ul>
 </div>
 <div class="paragraph">
@@ -184,6 +187,9 @@ In case you want to contribute file an issue in our <a href="https://issues.apac
 <li>
 <p><a href="https://github.com/apache/incubator-tamaya-extensions" target="_blank">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">Jenkins</a></p>
+</li>
 </ul>
 </div>
 <div class="paragraph">
@@ -206,6 +212,9 @@ In case you want to contribute file an issue in our <a href="https://issues.apac
 <li>
 <p><a href="https://github.com/apache/incubator-tamaya-sandbox" target="_blank">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">Jenkins</a></p>
+</li>
 </ul>
 </div>
 <div class="paragraph">
@@ -228,6 +237,9 @@ In case you want to contribute file an issue in our <a href="https://issues.apac
 <li>
 <p><a href="https://github.com/apache/incubator-tamaya-site" target="_blank">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">Jenkins</a></p>
+</li>
 </ul>
 </div>
 <div class="paragraph">
@@ -247,7 +259,7 @@ In case you want to contribute file an issue in our <a href="https://issues.apac
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/development/team.html
----------------------------------------------------------------------
diff --git a/development/team.html b/development/team.html
index bcd0364..53b1d7b 100644
--- a/development/team.html
+++ b/development/team.html
@@ -293,7 +293,7 @@
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/devguide.html
----------------------------------------------------------------------
diff --git a/devguide.html b/devguide.html
index c191e6c..f3c5850 100644
--- a/devguide.html
+++ b/devguide.html
@@ -380,7 +380,7 @@ $ git branch -d TAMAYA-XXX</pre>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/api.html
----------------------------------------------------------------------
diff --git a/documentation/api.html b/documentation/api.html
index cc24b2a..6b2720b 100644
--- a/documentation/api.html
+++ b/documentation/api.html
@@ -124,7 +124,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div class="sect1">
 <h2 id="CoreDesign">Apache Tamaya: API</h2>
@@ -195,11 +195,16 @@ requirement that the configuration data is always fully available. Summarizing a
 PropertySource</p>
 </li>
 <li>
-<p>provides String based property access for single key/value pairs in <em>raw</em> format (meaning no postprocessing
-is applied yet).</p>
+<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,String&gt;, providing all its properties at once.</p>
+<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>
@@ -543,6 +548,104 @@ ConfigSecurity is an arbitrary class only for demonstration purposes.
 <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&#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>
+</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 String getKey();
+    public String getSource();
+    public String getValue();
+    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 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
@@ -561,11 +664,11 @@ identified to be necessary:</p>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface PropertySource{
-      int getOrdinal(); // This feature is under discussion
+      int getOrdinal();
       String getName();
-      String get(String key);
+      PropertyValue get(String key);
       boolean isScannable();
-      Map&lt;String, String&gt; getProperties();
+      Map&lt;String,PropertyValue&gt; getProperties();
 }</code></pre>
 </div>
 </div>
@@ -578,7 +681,7 @@ identified to be necessary:</p>
 <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,String&gt;. Other methods like containsKey,
+<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>
@@ -586,18 +689,19 @@ keySet as well as streaming operations then can be applied on the returned Map i
 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
-String get(String) method. The fact if a PropertySource is <em>scannable</em> can be determined by calling isScannable().</p>
+PropertyValue get(String) method. The fact if a PropertySource is <em>scannable</em> can be determined by calling isScannable().</p>
 </li>
 <li>
-<p>TODO Feature is in question: getOrdinal() defines the ordinal of the PropertySource. Property sources are managed in an ordered chain, where
-property sources with higher ordinals override the ones with lower ordinals. If ordinal are the same, the natural
-ordering of the fulloy qualified class names of the property source implementations are 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.</p>
+<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 the current
-ConfigurationContext.</p>
+<p>Finally getName() returns a (unique) name that identifies the PropertySource within its containing ConfigurationContext.</p>
 </li>
 </ul>
 </div>
@@ -670,7 +774,7 @@ class level @Priority annotations (assuming 0 if none is present).</p>
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">// Functional Interface
 public interface PropertyFilter{
-    String filterProperty(String value, FilterContext context);
+    PropertyValue filterProperty(PropertyValue value, FilterContext context);
 }</code></pre>
 </div>
 </div>
@@ -688,7 +792,7 @@ filter evaluation has to be continued as long as filters are still changing some
 To prevent possible endless loops after a defined number of loops evaluation is stopped.</p>
 </li>
 <li>
-<p>FilterContext provides additional metdata, including the key accessed, which is useful in many use cases.</p>
+<p>FilterContext provides additional metdata, including the property accessed, which is useful in many use cases.</p>
 </li>
 </ul>
 </div>
@@ -711,23 +815,21 @@ public interface PropertyValueCombinationPolicy{
    PropertyValueCombinationPolicy DEFAULT_OVERRIDING_COLLECTOR =
      new PropertyValueCombinationPolicy(){
        @Override
-       public Map&lt;String,String&gt; collect(Map&lt;String,String&gt; currentValue, String key,
+       public PropertyValue collect(PropertyValue currentValue, String key,
                                          PropertySource propertySource) {
            PropertyValue value = propertySource.get(key);
-           return value!=null?value.getConfigEntries():currentValue;
+           return value!=null?value:currentValue;
        }
    };
 
-   Map&lt;String,String&gt; collect(Map&lt;String,String&gt; currentValue currentValue, String key,
+   PropertyValue collect(PropertyValue currentValue, String key,
                   PropertySource propertySource);
 
 }</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>Looking at the collect method&#8217;s signature it may be surprising to find a Map for the return type.
-This is because returning a Map allows also to filter/combine/use meta entries (by default entries starting
-with an '_').</p>
+<p>Looking at the collect method&#8217;s signature, returning a PropertyValue allows also to filter/combine/use meta entries.</p>
 </div>
 </div>
 <div class="sect3">
@@ -1125,7 +1227,7 @@ further details.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/core.html
----------------------------------------------------------------------
diff --git a/documentation/core.html b/documentation/core.html
index 7a23293..f88a7c0 100644
--- a/documentation/core.html
+++ b/documentation/core.html
@@ -124,7 +124,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div class="sect1">
 <h2 id="Core">Tamaya Core Implementation</h2>
@@ -141,14 +141,14 @@ and building blocks for supporting SPI implementations.</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Implementations of Configuration, ConfigurationContext, ConfigurationContextBuilder ConfigurationProviderSpi+</p>
+<p>Implementations of Configuration, ConfigurationContext, ConfigurationContextBuilder, ConfigurationProviderSpi</p>
 </li>
 <li>
 <p>A java.util.ServiceLoader based ServiceContext implementation. Hereby it implements component priorization based
 on the @Priority annotations.</p>
 </li>
 <li>
-<p>A PropertyConverterManager+ that loads and stores references to all the preconfigured PropertyConverter instances
+<p>A PropertyConverterManager that loads and stores references to all the preconfigured PropertyConverter instances
 hereby providing type conversion for all important types.</p>
 </li>
 <li>
@@ -159,7 +159,7 @@ hereby providing type conversion for all important types.</p>
 registers them in the global ConfigurationContext</p>
 </li>
 <li>
-<p>It provides a ConfigurationContextBuilder implementation (class DefaultConfigurationContextBuilder) and allows
+<p>It provides a ConfigurationContextBuilder implementation (DefaultConfigurationContextBuilder) and allows
 changing the current ConfigurationContext.</p>
 </li>
 </ul>
@@ -172,31 +172,29 @@ enough to be extended/accommodated with additional features as needed, such as</
 <div class="ulist">
 <ul>
 <li>
-<p>placeholder and resolution mechanisms</p>
+<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</p>
+<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</p>
+<p>configuration injection and configuration templates (org.apache.tamaya.ext:tamaya-injcetion-api)</p>
 </li>
 <li>
-<p>abstraction for reusable formats</p>
+<p>abstraction for reusable formats (org.apache.tamaya.ext:tamaya-formats)</p>
 </li>
 <li>
-<p>integration with other existing solutions</p>
+<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</p>
+<p>configuration and configuration isolation targeting Java EE (org.apache.tamaya.ext:tamaya-injection-ee)</p>
 </li>
 <li>
-<p>dynamic configuration and configuration updates</p>
+<p>dynamic configuration and configuration updates (org.apache.tamaya.ext:tamaya-events)</p>
 </li>
 <li>
-<p>Configuration management extensions</p>
-</li>
-<li>
-<p>remote configuration</p>
+<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>
@@ -208,9 +206,9 @@ enough to be extended/accommodated with additional features as needed, such as</
 </div>
 </div>
 <div class="sect2">
-<h3 id="CorePropertyConverters">Default PropertyConverters in Core</h3>
+<h3 id="CorePropertyConverters">Default PropertyConverters</h3>
 <div class="paragraph">
-<p>As mentioned the Core module delivers several default PropertyConverter instances out of the box. Find below the
+<p>The <em>Core</em> module provides several PropertyConverter implementations by default. Find below the
 listing of converters automatically registered with the Core module:</p>
 </div>
 <table class="tableblock frame-1 grid-all spread">
@@ -333,49 +331,40 @@ listing of converters automatically registered with the Core module:</p>
 <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 then 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 per each).</p>
+<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).</p>
 </div>
 <div class="paragraph">
-<p>Alternatively you can also use a ConfigurationContextBuilder to add additional converters programmatically.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-API Implementations can be read-only thus not allowing adding additional converters programmatically.
-</td>
-</tr>
-</table>
+<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 Core in general loads all components 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
-core adds this functionality by the possibility to add @Priority annotations to the components registered.
-By default, and if no annotation is added 0 is used as priority. Hereby higher values preceed lower values, meaning</p>
+<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 singleton component is accessed from the current ServiceContext the component with the higher value
-effectively <em>overrides/replaces</em> any component with lower values.</p>
+<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 collection of components is obtained from the ServiceContext the components are ordered in order, where the
-ones with higher priority are before components with lower priority.</p>
+<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 match Tamaya Core additionally sorts them using the simple class name. This ensures that ordering is
-still defined and predictable in almost all scenarios.</p>
+<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>
@@ -386,8 +375,9 @@ still defined and predictable in almost all scenarios.</p>
 <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:
+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>
@@ -396,22 +386,43 @@ Sorting the property sources based on their ordinal value is only the default or
 <div class="sect2">
 <h3 id="RegisteringPropertySources">Registering Property Sources</h3>
 <div class="paragraph">
-<p>PropertySources that provide configuration properties are registered as ordinary components as described in the previous
-section. Nevertheless the priority is not managed based on @Priority annotations, but based on an explicit
-int getOrdinal() method. This allows to define the ordinal/priority of a PropertySource explicitly. This is useful
-due to several reasons:</p>
+<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="ulist">
-<ul>
+<div class="olist arabic">
+<ol class="arabic">
 <li>
-<p>it allows to define the ordinal as part of the configuration, thus allowing new overriding property sources being
-added easily.</p>
+<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 allows to define the ordinal dynamically, e.g. based on the configuration location, the time of loading or
-whatever may be appropriate.</p>
+<p>It checks for an explicit method int getOrdinal(), if found its value is taken as an ordinal.</p>
 </li>
-</ul>
+<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>
@@ -458,12 +469,17 @@ org.apache.tamaya.core.provider:</p>
 <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">0</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">0</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>
@@ -473,10 +489,22 @@ org.apache.tamaya.core.provider:</p>
 <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">400</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">
+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>
@@ -528,9 +556,10 @@ one method to implemented:</p>
 </div>
 </div>
 <div class="paragraph">
-<p>By default the ordinal of the property sources will be 1000, unless the key tamaya.ordinal asdefined 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>
+<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>
@@ -542,13 +571,70 @@ present that loads all .properties files found at META-INF/javaconfiguration.pro
 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}.
+ */
+public interface ConfigValueEvaluator {
+
+    /**
+     * Evaluates single value using a {@link ConfigurationContext}.
+     * @param key the config key, not null.
+     * @param context the context, not null.
+     * @return the value, or null.
+     */
+    PropertyValue evaluteRawValue(String key, ConfigurationContext context);
+
+    /**
+     * Evaluates all property values from a {@link ConfigurationContext}.
+     * @param context the context, not null.
+     * @return the value, or null.
+     */
+    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>The Core module only implements the <a href="api.html">API</a>. Many users require/wish additional functionality from a
+<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>
@@ -568,7 +654,7 @@ Loading extensions hereby is trivial: you only are required to add the correspon
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions.html
----------------------------------------------------------------------
diff --git a/documentation/extensions.html b/documentation/extensions.html
index 3a849c8..8c1b110 100644
--- a/documentation/extensions.html
+++ b/documentation/extensions.html
@@ -124,7 +124,7 @@
 				<h1></h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div class="sect1">
 <h2 id="_apache_tamaya_extension_modules">Apache Tamaya: Extension Modules</h2>
@@ -155,29 +155,9 @@
 <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-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-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-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-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>
+<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>
@@ -190,6 +170,21 @@
 <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&#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>
@@ -210,14 +205,29 @@
 <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-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-spi-support</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Tamaya support module for SPI implementation.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_spi-support.html">Documentation</a></p></td>
+<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-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>
@@ -225,20 +235,20 @@
 <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-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>
-<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>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-spi-support</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Tamaya support module for SPI implementation.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="extensions/mod_spi-support.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">
@@ -289,14 +299,9 @@ All extensions currently run on Java 7 as well as on Java 8.
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-commons</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-jodatime</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>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-camel</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>
@@ -304,34 +309,14 @@ All extensions currently run on Java 7 as well as on Java 8.
 <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-management</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</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-validation</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-usagetracker</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-camel</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>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-commons</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-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>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-configured-sysprops</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</p></td>
@@ -349,9 +334,24 @@ All extensions currently run on Java 7 as well as on Java 8.
 <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-configured-sysprops</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>
+<td class="tableblock halign-left valign-top"><p class="tableblock">org.apache.tamaya.ext:tamaya-jodatime</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</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</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-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-remote</p></td>
@@ -368,6 +368,16 @@ All extensions currently run on Java 7 as well as on Java 8.
 <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-usagetracker</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</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>
 </tbody>
 </table>
 </div>
@@ -384,7 +394,7 @@ All extensions currently run on Java 7 as well as on Java 8.
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_camel.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_camel.html b/documentation/extensions/mod_camel.html
index d8d3632..a49132a 100644
--- a/documentation/extensions/mod_camel.html
+++ b/documentation/extensions/mod_camel.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Integration with Apache Camel</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -140,7 +140,7 @@
 <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> integration module provides different artifacts which allows integration of Apachae Tamaya
+<p>The Tamaya <em>Camel</em> module provides different artifacts which allows integration of Apachae Tamaya
 configuration with Apache Camel.</p>
 </div>
 </div>
@@ -168,18 +168,18 @@ configuration with Apache Camel.</p>
 <div class="sect2">
 <h3 id="_the_functionality_provided">The Functionality Provided</h3>
 <div class="paragraph">
-<p>Camel integration comes basically with three artifacts:</p>
+<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.integration.camel.TamayaPropertyResolver).</p>
+(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.integration.camel.TamayaPropertiesComponent).</p>
+(org.apache.tamaya.camel.TamayaPropertiesComponent).</p>
 </li>
 </ul>
 </div>
@@ -191,7 +191,7 @@ additionally allows using Tamaya configuration as Camel <em>overrides</em>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">import org.apache.tamaya.integration.camel.TamayaPropertiesComponent;
+<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>
@@ -264,7 +264,7 @@ again use Tamaya as the main configuration solutions only using Camel&#8217;s de
         &lt;/route&gt;
     &lt;/routeContext&gt;
 
-    &lt;bean id="properties" class="org.apache.tamaya.integration.camel.TamayaPropertiesComponent"&gt;
+    &lt;bean id="properties" class="org.apache.tamaya.camel.TamayaPropertiesComponent"&gt;
         &lt;property name="tamayaOverrides" value="true"/&gt;
     &lt;/bean&gt;
 
@@ -285,7 +285,7 @@ again use Tamaya as the main configuration solutions only using Camel&#8217;s de
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_cdi.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_cdi.html b/documentation/extensions/mod_cdi.html
index 19dcf77..de0e728 100644
--- a/documentation/extensions/mod_cdi.html
+++ b/documentation/extensions/mod_cdi.html
@@ -442,7 +442,7 @@ default section parts.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_classloader_support.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_classloader_support.html b/documentation/extensions/mod_classloader_support.html
index aab581d..d9d8767 100644
--- a/documentation/extensions/mod_classloader_support.html
+++ b/documentation/extensions/mod_classloader_support.html
@@ -254,7 +254,7 @@ hierarchies:</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_collections.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_collections.html b/documentation/extensions/mod_collections.html
index bc8e2aa..6f2aba7 100644
--- a/documentation/extensions/mod_collections.html
+++ b/documentation/extensions/mod_collections.html
@@ -456,7 +456,7 @@ _redefined-map.item-separator=|</code></pre>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_consul.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_consul.html b/documentation/extensions/mod_consul.html
index 20af105..e63a970 100644
--- a/documentation/extensions/mod_consul.html
+++ b/documentation/extensions/mod_consul.html
@@ -225,7 +225,7 @@ set to <code>cluster-config.</code> a consul key of <code>host:known/all</code>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_etcd.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_etcd.html b/documentation/extensions/mod_etcd.html
index b79643b..f552f7c 100644
--- a/documentation/extensions/mod_etcd.html
+++ b/documentation/extensions/mod_etcd.html
@@ -357,7 +357,7 @@ set to <code>cluster-config.</code> a etcd key of <code>host:known/all</code> is
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_events.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_events.html b/documentation/extensions/mod_events.html
index 38d80b3..0f37665 100644
--- a/documentation/extensions/mod_events.html
+++ b/documentation/extensions/mod_events.html
@@ -525,7 +525,7 @@ active (by default using the Java ServiceLoader mechanism).</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>



[2/3] incubator-tamaya-site git commit: TAMAYA-255: Regenerate.

Posted by po...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_features.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_features.html b/documentation/extensions/mod_features.html
new file mode 100644
index 0000000..13adfec
--- /dev/null
+++ b/documentation/extensions/mod_features.html
@@ -0,0 +1,301 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+	    <meta charset="utf-8"/>
+	    <title>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Features Check</title>
+	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+	    <meta name="description" content=""/>
+	    <meta name="author" content=""/>
+	    <meta name="keywords" content=""/>
+	    <meta name="generator" content="'JBake '+'${version}"/>
+
+	    <!-- Le styles -->
+	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
+	    <link href="../../css/asciidoctor.css" rel="stylesheet"/>
+	    <link href="../../css/base.css" rel="stylesheet"/>
+	    <link href="../../css/prettify.css" rel="stylesheet"/>
+
+	    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+	    <!--[if lt IE 9]>
+	      <script src="../../js/html5shiv.min.js"></script>
+	    <![endif]-->
+
+	    <!-- Fav and touch icons from ASF -->
+			<link rel="shortcut icon" href="../../favicon.ico"/>
+			<link rel="apple-touch-icon" sizes="57x57" href="../../favicons/apple-touch-icon-57x57.png"/>
+		  <link rel="apple-touch-icon" sizes="60x60" href="../../favicons/apple-touch-icon-60x60.png"/>
+		  <link rel="apple-touch-icon" sizes="72x72" href="../../favicons/apple-touch-icon-72x72.png"/>
+		  <link rel="apple-touch-icon" sizes="76x76" href="../../favicons/apple-touch-icon-76x76.png"/>
+		  <link rel="apple-touch-icon" sizes="114x114" href="../../favicons/apple-touch-icon-114x114.png"/>
+		  <link rel="apple-touch-icon" sizes="120x120" href="../../favicons/apple-touch-icon-120x120.png"/>
+		  <link rel="apple-touch-icon" sizes="144x144" href="../../favicons/apple-touch-icon-144x144.png"/>
+		  <link rel="apple-touch-icon" sizes="152x152" href="../../favicons/apple-touch-icon-152x152.png"/>
+		  <link rel="apple-touch-icon" sizes="180x180" href="../../favicons/apple-touch-icon-180x180.png"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-32x32.png" sizes="32x32"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-194x194.png" sizes="194x194"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-96x96.png" sizes="96x96"/>
+		  <link rel="icon" type="image/png" href="../../favicons/android-chrome-192x192.png" sizes="192x192"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-16x16.png" sizes="16x16"/>
+		  <link rel="manifest" href="../../favicons/manifest.json"/>
+		  <link rel="shortcut icon" href="../../favicons/favicon.ico"/>
+		  <meta name="msapplication-TileColor" content="#603cba"/>
+		  <meta name="msapplication-TileImage" content="../../favicons/mstile-144x144.png"/>
+		  <meta name="msapplication-config" content="../../favicons/browserconfig.xml"/>
+		  <meta name="theme-color" content="#303284"/>
+	</head>
+	<body onload="prettyPrint()">
+	<div id="wrap">
+		<div>
+
+	  <!-- Fixed navbar -->
+      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+						<li><a href="../../start.html">Tamaya in 5 minutes</a></li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../documentation/usecases.html">Use Cases and Requirements</a></li>
+								<li><a href="../../documentation/quickstart.html">Quickstart</a></li>
+								<li><a href="../../documentation/api.html">API</a></li>
+								<li><a href="../../documentation/core.html">Core</a></li>
+								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
+								<li class="divider"></li>
+								<li><a href="../../apidocs/index.html">Javadoc 0.3-incubating-SNAPSHOT (external)</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Development <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../development/source.html">Sources</a></li>
+								<li><a href="../../development/community.html">Community</a></li>
+								<li><a href="../../development/team.html">Project Team</a></li>
+								<li><a target="_blank" href="https://builds.apache.org/view/S-Z/view/Tamaya/">CI / ASF Jenkins</a></li>
+								<li><a target="_blank" href="https://issues.apache.org/jira/browse/TAMAYA">Issues / ASF Jira</a></li>
+								<li><a href="../../devguide.html">Development Guide</a></li>
+								<li><a href="../../release-guide.html">Release Guide</a></li>
+								<li class="divider"></li>
+								<li><a href="../../development/possible-contributions.html">Possible Contributions</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Releases <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../download.html">Download</a></li>
+								<li><a href="../../history.html">Release History</a></li>
+              </ul>
+            </li>
+<!-- Example:
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="#">Action</a></li>
+                <li><a href="#">Another action</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li class="dropdown-header">Nav header</li>
+                <li><a href="#">Separated link</a></li>
+                <li><a href="#">One more separated link</a></li>
+              </ul>
+            </li>
+-->
+						<li><a href="../../sitemap.xml">Sitemap</a></li>
+						<li><a href="../../feed.xml">Subscribe</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
+	</div>
+		<div class="container">
+
+			<div class="page-header">
+				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Features Check</h1>
+			</div>
+
+			<p><em>2017-03-07</em></p>
+
+			<p><div id="preamble">
+<div class="sectionbody">
+<!-- toc disabled -->
+</div>
+</div>
+<div class="sect1">
+<h2 id="Features">Tamaya Features Check (Extension Module)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>Features</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>Features</em> provides a simple Features singleton that allows to check
+which Tamaya Extensions are currently on the classpath.</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 Tamaya <em>Features</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-features&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_functionality_provided">The Functionality Provided</h3>
+<div class="paragraph">
+<p>Main artifact is the Features singleton, which provides various static methods
+to check, which Tamaya extensions are currently loaded.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public final class Features {
+
+    private Features(){}
+
+    public static boolean eventsAvailable();
+    public static boolean formatsAvailable();
+    public static boolean tamayaCoreAvailable();
+    public static boolean injectionAvailable();
+    public static boolean injectionCDIAvailable();
+    public static boolean mutableConfigAvailable();
+    public static boolean optionalAvailable();
+    public static boolean resolverAvailable();
+    public static boolean resourcesAvailable();
+    public static boolean spiSupportAvailable();
+    public static boolean filterSupportAvailable();
+    public static boolean springAvailable();
+    public static boolean jndiAvailable();
+
+    public static boolean extSpringCoreAvailable();
+    public static boolean extJndiAvailable();
+    public static boolean extOSGIAvailable();
+
+    public static boolean checkClassIsLoadable(String classname);
+}</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>eventsAvailable(); checks for the <a href="mod_events.html"><em>tamaya_events</em></a> module.</p>
+</li>
+<li>
+<p>formatsAvailable(); checks for the <a href="mod_formats.html"><em>tamaya_formats</em></a> module.</p>
+</li>
+<li>
+<p>tamayaCoreAvailable(); checks if the <a href="core.html"><em>Tamaya core</em></a> implementation is loaded.</p>
+</li>
+<li>
+<p>injectionAvailable(); checks for the <a href="mod_injection.html"><em>tamaya_injection</em></a> SE module.</p>
+</li>
+<li>
+<p>injectionCDIAvailable(); checks for the <a href="mod_cdi.html"><em>tamaya CDI</em></a> modules.</p>
+</li>
+<li>
+<p>mutableConfigAvailable(); checks for the <a href="mod_mutableconfig.html"><em>tamaya_mutableconfig</em></a> module.</p>
+</li>
+<li>
+<p>optionalAvailable(); checks for the <a href="mod_optional.html"><em>tamaya_optional</em></a> module.</p>
+</li>
+<li>
+<p>resolverAvailable(); checks for the <a href="mod_resolver.html"><em>tamaya_resolver</em></a> module.</p>
+</li>
+<li>
+<p>resourcesAvailable(); checks for the <a href="mod_reources.html"><em>tamaya_resources</em></a> module.</p>
+</li>
+<li>
+<p>spiSupportAvailable(); checks for the <a href="mod_spisupport.html"><em>tamaya_spisupport</em></a> module.</p>
+</li>
+<li>
+<p>filterSupportAvailable(); checks for the <a href="mod_filter.html"><em>tamaya_filter</em></a> module.</p>
+</li>
+<li>
+<p>springAvailable(); checks for the <a href="mod_spring.html"><em>tamaya_spring</em></a> module.</p>
+</li>
+<li>
+<p>jndiAvailable(); checks for the <a href="mod_jndi.html"><em>tamaya_jndi</em></a> module.</p>
+</li>
+<li>
+<p>extJndiAvailable(); checks if creation of a new <code>InitialContext</code> is successful.</p>
+</li>
+<li>
+<p>extSpringCoreAvailable(); checks if Spring Core is on the classpath.</p>
+</li>
+<li>
+<p>extOSGIAvailable(); checks the OSGI framework is on the classpath.</p>
+</li>
+<li>
+<p>Finally checkClassIsLoaded(String) tries to load a class. If it fails, <code>false</code> is returned.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+</div></p>
+
+			<hr />
+		</div>
+	</div>
+	<div>
+			<div id="push"></div>
+
+		    <div id="footer">
+		      <div class="container">
+		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
+							at <span>2017-03-07</span> |
+							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+						</p>
+						<p>
+								<b>Disclaimer</b>
+                    Apache Tamaya (incubating) is an effort undergoing
+                    incubation at
+                    The Apache Software Foundation (ASF), sponsored by
+                    the name of Apache Incubator. Incubation is required of
+                    all newly accepted projects until a further review indicates
+                    that the infrastructure, communications, and decision making
+                    process have stabilized in a manner consistent with other
+                    successful ASF projects. While incubation status is not
+                    necessarily a reflection of the completeness or stability of
+                    the code, it does indicate that the project has yet to
+                    be fully endorsed by the ASF.<br />
+                    <a href="http://incubator.apache.org/guides/website.html" style="border:0px;" target="_target"><img class="incubator-logo" src="../../logos/egg-logo2.png"/></a>
+							</p>
+		      </div>
+		    </div>
+
+		    <!-- Le javascript
+		    ================================================== -->
+		    <!-- Placed at the end of the document so the pages load faster -->
+		    <script src="../../js/jquery-1.11.1.min.js"></script>
+		    <script src="../../js/bootstrap.min.js"></script>
+		    <script src="../../js/prettify.js"></script>
+    	</div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_filter.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_filter.html b/documentation/extensions/mod_filter.html
index 185aac4..3457f02 100644
--- a/documentation/extensions/mod_filter.html
+++ b/documentation/extensions/mod_filter.html
@@ -277,7 +277,7 @@ managed filters:</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_formats.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_formats.html b/documentation/extensions/mod_formats.html
index 9b91fd5..7754620 100644
--- a/documentation/extensions/mod_formats.html
+++ b/documentation/extensions/mod_formats.html
@@ -559,7 +559,7 @@ functionality provided with java.util.Properties:</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_functions.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_functions.html b/documentation/extensions/mod_functions.html
index 2b570ef..88945c5 100644
--- a/documentation/extensions/mod_functions.html
+++ b/documentation/extensions/mod_functions.html
@@ -310,7 +310,7 @@ in <em>sectionKeys</em> from a given <em>key</em>.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_hazelcast.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_hazelcast.html b/documentation/extensions/mod_hazelcast.html
new file mode 100644
index 0000000..943589d
--- /dev/null
+++ b/documentation/extensions/mod_hazelcast.html
@@ -0,0 +1,303 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+	    <meta charset="utf-8"/>
+	    <title>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Integration with Hazelcast</title>
+	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+	    <meta name="description" content=""/>
+	    <meta name="author" content=""/>
+	    <meta name="keywords" content=""/>
+	    <meta name="generator" content="'JBake '+'${version}"/>
+
+	    <!-- Le styles -->
+	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
+	    <link href="../../css/asciidoctor.css" rel="stylesheet"/>
+	    <link href="../../css/base.css" rel="stylesheet"/>
+	    <link href="../../css/prettify.css" rel="stylesheet"/>
+
+	    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+	    <!--[if lt IE 9]>
+	      <script src="../../js/html5shiv.min.js"></script>
+	    <![endif]-->
+
+	    <!-- Fav and touch icons from ASF -->
+			<link rel="shortcut icon" href="../../favicon.ico"/>
+			<link rel="apple-touch-icon" sizes="57x57" href="../../favicons/apple-touch-icon-57x57.png"/>
+		  <link rel="apple-touch-icon" sizes="60x60" href="../../favicons/apple-touch-icon-60x60.png"/>
+		  <link rel="apple-touch-icon" sizes="72x72" href="../../favicons/apple-touch-icon-72x72.png"/>
+		  <link rel="apple-touch-icon" sizes="76x76" href="../../favicons/apple-touch-icon-76x76.png"/>
+		  <link rel="apple-touch-icon" sizes="114x114" href="../../favicons/apple-touch-icon-114x114.png"/>
+		  <link rel="apple-touch-icon" sizes="120x120" href="../../favicons/apple-touch-icon-120x120.png"/>
+		  <link rel="apple-touch-icon" sizes="144x144" href="../../favicons/apple-touch-icon-144x144.png"/>
+		  <link rel="apple-touch-icon" sizes="152x152" href="../../favicons/apple-touch-icon-152x152.png"/>
+		  <link rel="apple-touch-icon" sizes="180x180" href="../../favicons/apple-touch-icon-180x180.png"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-32x32.png" sizes="32x32"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-194x194.png" sizes="194x194"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-96x96.png" sizes="96x96"/>
+		  <link rel="icon" type="image/png" href="../../favicons/android-chrome-192x192.png" sizes="192x192"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-16x16.png" sizes="16x16"/>
+		  <link rel="manifest" href="../../favicons/manifest.json"/>
+		  <link rel="shortcut icon" href="../../favicons/favicon.ico"/>
+		  <meta name="msapplication-TileColor" content="#603cba"/>
+		  <meta name="msapplication-TileImage" content="../../favicons/mstile-144x144.png"/>
+		  <meta name="msapplication-config" content="../../favicons/browserconfig.xml"/>
+		  <meta name="theme-color" content="#303284"/>
+	</head>
+	<body onload="prettyPrint()">
+	<div id="wrap">
+		<div>
+
+	  <!-- Fixed navbar -->
+      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+						<li><a href="../../start.html">Tamaya in 5 minutes</a></li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../documentation/usecases.html">Use Cases and Requirements</a></li>
+								<li><a href="../../documentation/quickstart.html">Quickstart</a></li>
+								<li><a href="../../documentation/api.html">API</a></li>
+								<li><a href="../../documentation/core.html">Core</a></li>
+								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
+								<li class="divider"></li>
+								<li><a href="../../apidocs/index.html">Javadoc 0.3-incubating-SNAPSHOT (external)</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Development <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../development/source.html">Sources</a></li>
+								<li><a href="../../development/community.html">Community</a></li>
+								<li><a href="../../development/team.html">Project Team</a></li>
+								<li><a target="_blank" href="https://builds.apache.org/view/S-Z/view/Tamaya/">CI / ASF Jenkins</a></li>
+								<li><a target="_blank" href="https://issues.apache.org/jira/browse/TAMAYA">Issues / ASF Jira</a></li>
+								<li><a href="../../devguide.html">Development Guide</a></li>
+								<li><a href="../../release-guide.html">Release Guide</a></li>
+								<li class="divider"></li>
+								<li><a href="../../development/possible-contributions.html">Possible Contributions</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Releases <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../download.html">Download</a></li>
+								<li><a href="../../history.html">Release History</a></li>
+              </ul>
+            </li>
+<!-- Example:
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="#">Action</a></li>
+                <li><a href="#">Another action</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li class="dropdown-header">Nav header</li>
+                <li><a href="#">Separated link</a></li>
+                <li><a href="#">One more separated link</a></li>
+              </ul>
+            </li>
+-->
+						<li><a href="../../sitemap.xml">Sitemap</a></li>
+						<li><a href="../../feed.xml">Subscribe</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
+	</div>
+		<div class="container">
+
+			<div class="page-header">
+				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Integration with Hazelcast</h1>
+			</div>
+
+			<p><em>2017-03-07</em></p>
+
+			<p><div id="preamble">
+<div class="sectionbody">
+<!-- toc disabled -->
+</div>
+</div>
+<div class="sect1">
+<h2 id="Consul">Integration with Hazelcast (Extension Module)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>Hazelcast</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>Hazelcast</em> provides a property source which uses
+<a href="http://www.hazelcast.org">Hazelcast</a> as configuration backend. Hereby the
+module supports read-only integration (as a HazelcastPropertySource 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 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-hazelcast</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-hazelcast&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>Hazelcast integration comes basically with 2 artifacts:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The org.apache.tamaya.hazelcast.HazelcastPropertySource is a PropertySource. The property source is not automatically
+registered. Either register it using the <em>ServiceLoader</em> yourself or implement
+and register a corresponding <code>PropertySourceProvider</code>.</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:hazelcast.</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_hazelcastpropertysource">The HazelcastPropertySource</h3>
+<div class="paragraph">
+<p>The HazelcastPropertySource is not automatically registered and provides different options how to integrate
+Tamaya with Hazelcast.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">/**
+ * Creates a new instance, hereby using {@code "Hazelcast"} as property source name and
+ * a default hazelcast backend created by calling {@link Hazelcast#newHazelcastInstance()}.
+ */
+public HazelcastPropertySource();
+
+/**
+ * Creates a new instance, hereby using {@code "Hazelcast"} as property source name and the
+ * given hazelcast instance.
+ * @param hazelcastInstance the hazelcast instance, not null.
+ */
+public HazelcastPropertySource(HazelcastInstance hazelcastInstance);
+
+/**
+ * Creates a new instance, hereby using the given property source name and
+ * a default hazelcast backend created by calling {@link Hazelcast#newHazelcastInstance()}.
+ * @param name the property source name, not null.
+ */
+public HazelcastPropertySource(String name);
+
+/**
+ * Creates a new instance, hereby using the given property source name and
+ * a creating a new hazelcast backend using the given Hazelcast {@link Config}.
+ * @param config the hazelcast config, not null.
+ * @param name the property source name, not null.
+ */
+public HazelcastPropertySource(String name, Config config);
+
+/**
+ * Creates a new instance, hereby using the given property source name and the
+ * hazelcast instance.
+ * @param name
+ * @param hazelcastInstance
+ */
+public HazelcastPropertySource(String name, HazelcastInstance hazelcastInstance);</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>To use hazelcast as a configuration backend, you simply create the corresponding Hazelcast instance
+and use it to initialize the Tamaya property source. Given that a hazelcast backedn configuration
+can be easily created asillustrated below:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Config hazelcastConfig = new Config();
+// define config settings
+HazelcastInstance hazelcastInstance = Hazelcast.newInstance(hazelcastConfig);
+HazelcastPropertySource ps = new HazelcastPropertySource(hazelcastInstance);
+ps.setName("myHazelcast-config");
+ps.setOrdinal(2000);
+// Build your own configuration context
+ConfigurationContextBuilder b = ConfigurationProvider.createNewConfigurationContextBuilder();
+b.addDefaultPropertyConverters().addDefaultPropertyFilter().addDefaultPropertySources();
+// Add the hazelcast property source (as most significant)
+b.addPropertySource(ps);
+// build and use the configuration
+Configuration config = b.build();</code></pre>
+</div>
+</div>
+</div>
+</div>
+</div></p>
+
+			<hr />
+		</div>
+	</div>
+	<div>
+			<div id="push"></div>
+
+		    <div id="footer">
+		      <div class="container">
+		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
+							at <span>2017-03-07</span> |
+							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+						</p>
+						<p>
+								<b>Disclaimer</b>
+                    Apache Tamaya (incubating) is an effort undergoing
+                    incubation at
+                    The Apache Software Foundation (ASF), sponsored by
+                    the name of Apache Incubator. Incubation is required of
+                    all newly accepted projects until a further review indicates
+                    that the infrastructure, communications, and decision making
+                    process have stabilized in a manner consistent with other
+                    successful ASF projects. While incubation status is not
+                    necessarily a reflection of the completeness or stability of
+                    the code, it does indicate that the project has yet to
+                    be fully endorsed by the ASF.<br />
+                    <a href="http://incubator.apache.org/guides/website.html" style="border:0px;" target="_target"><img class="incubator-logo" src="../../logos/egg-logo2.png"/></a>
+							</p>
+		      </div>
+		    </div>
+
+		    <!-- Le javascript
+		    ================================================== -->
+		    <!-- Placed at the end of the document so the pages load faster -->
+		    <script src="../../js/jquery-1.11.1.min.js"></script>
+		    <script src="../../js/bootstrap.min.js"></script>
+		    <script src="../../js/prettify.js"></script>
+    	</div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_injection.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_injection.html b/documentation/extensions/mod_injection.html
index fb70d43..406b809 100644
--- a/documentation/extensions/mod_injection.html
+++ b/documentation/extensions/mod_injection.html
@@ -738,7 +738,7 @@ The event published is very simple:
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_jndi.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_jndi.html b/documentation/extensions/mod_jndi.html
new file mode 100644
index 0000000..008bc21
--- /dev/null
+++ b/documentation/extensions/mod_jndi.html
@@ -0,0 +1,247 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+	    <meta charset="utf-8"/>
+	    <title>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Integration with JNDI</title>
+	    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+	    <meta name="description" content=""/>
+	    <meta name="author" content=""/>
+	    <meta name="keywords" content=""/>
+	    <meta name="generator" content="'JBake '+'${version}"/>
+
+	    <!-- Le styles -->
+	    <link href="../../css/bootstrap.min.css" rel="stylesheet"/>
+	    <link href="../../css/asciidoctor.css" rel="stylesheet"/>
+	    <link href="../../css/base.css" rel="stylesheet"/>
+	    <link href="../../css/prettify.css" rel="stylesheet"/>
+
+	    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+	    <!--[if lt IE 9]>
+	      <script src="../../js/html5shiv.min.js"></script>
+	    <![endif]-->
+
+	    <!-- Fav and touch icons from ASF -->
+			<link rel="shortcut icon" href="../../favicon.ico"/>
+			<link rel="apple-touch-icon" sizes="57x57" href="../../favicons/apple-touch-icon-57x57.png"/>
+		  <link rel="apple-touch-icon" sizes="60x60" href="../../favicons/apple-touch-icon-60x60.png"/>
+		  <link rel="apple-touch-icon" sizes="72x72" href="../../favicons/apple-touch-icon-72x72.png"/>
+		  <link rel="apple-touch-icon" sizes="76x76" href="../../favicons/apple-touch-icon-76x76.png"/>
+		  <link rel="apple-touch-icon" sizes="114x114" href="../../favicons/apple-touch-icon-114x114.png"/>
+		  <link rel="apple-touch-icon" sizes="120x120" href="../../favicons/apple-touch-icon-120x120.png"/>
+		  <link rel="apple-touch-icon" sizes="144x144" href="../../favicons/apple-touch-icon-144x144.png"/>
+		  <link rel="apple-touch-icon" sizes="152x152" href="../../favicons/apple-touch-icon-152x152.png"/>
+		  <link rel="apple-touch-icon" sizes="180x180" href="../../favicons/apple-touch-icon-180x180.png"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-32x32.png" sizes="32x32"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-194x194.png" sizes="194x194"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-96x96.png" sizes="96x96"/>
+		  <link rel="icon" type="image/png" href="../../favicons/android-chrome-192x192.png" sizes="192x192"/>
+		  <link rel="icon" type="image/png" href="../../favicons/favicon-16x16.png" sizes="16x16"/>
+		  <link rel="manifest" href="../../favicons/manifest.json"/>
+		  <link rel="shortcut icon" href="../../favicons/favicon.ico"/>
+		  <meta name="msapplication-TileColor" content="#603cba"/>
+		  <meta name="msapplication-TileImage" content="../../favicons/mstile-144x144.png"/>
+		  <meta name="msapplication-config" content="../../favicons/browserconfig.xml"/>
+		  <meta name="theme-color" content="#303284"/>
+	</head>
+	<body onload="prettyPrint()">
+	<div id="wrap">
+		<div>
+
+	  <!-- Fixed navbar -->
+      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="../../index.html">Apache Tamaya (incubating)</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+						<li><a href="../../start.html">Tamaya in 5 minutes</a></li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../documentation/usecases.html">Use Cases and Requirements</a></li>
+								<li><a href="../../documentation/quickstart.html">Quickstart</a></li>
+								<li><a href="../../documentation/api.html">API</a></li>
+								<li><a href="../../documentation/core.html">Core</a></li>
+								<li><a href="../../documentation/extensions.html">Extension Guide</a></li>
+								<li class="divider"></li>
+								<li><a href="../../apidocs/index.html">Javadoc 0.3-incubating-SNAPSHOT (external)</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Development <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../development/source.html">Sources</a></li>
+								<li><a href="../../development/community.html">Community</a></li>
+								<li><a href="../../development/team.html">Project Team</a></li>
+								<li><a target="_blank" href="https://builds.apache.org/view/S-Z/view/Tamaya/">CI / ASF Jenkins</a></li>
+								<li><a target="_blank" href="https://issues.apache.org/jira/browse/TAMAYA">Issues / ASF Jira</a></li>
+								<li><a href="../../devguide.html">Development Guide</a></li>
+								<li><a href="../../release-guide.html">Release Guide</a></li>
+								<li class="divider"></li>
+								<li><a href="../../development/possible-contributions.html">Possible Contributions</a></li>
+              </ul>
+            </li>
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Releases <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+								<li><a href="../../download.html">Download</a></li>
+								<li><a href="../../history.html">Release History</a></li>
+              </ul>
+            </li>
+<!-- Example:
+						<li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="#">Action</a></li>
+                <li><a href="#">Another action</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li class="dropdown-header">Nav header</li>
+                <li><a href="#">Separated link</a></li>
+                <li><a href="#">One more separated link</a></li>
+              </ul>
+            </li>
+-->
+						<li><a href="../../sitemap.xml">Sitemap</a></li>
+						<li><a href="../../feed.xml">Subscribe</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
+	</div>
+		<div class="container">
+
+			<div class="page-header">
+				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Integration with JNDI</h1>
+			</div>
+
+			<p><em>2017-03-07</em></p>
+
+			<p><div id="preamble">
+<div class="sectionbody">
+<!-- toc disabled -->
+</div>
+</div>
+<div class="sect1">
+<h2 id="JNDI">Integration with JNDI (Extension Module)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Tamaya <em>JNDI</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>JNDI</em> provides a simple PropertySource that reads values from a
+JNDI context.</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>jndi</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-jndi&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_functionality_provided">The Functionality Provided</h3>
+<div class="paragraph">
+<p>Main artifact is the JNDIPropertySource class, which implements a
+property source based on a JNDI context:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">public class JNDIPropertySource extends BasePropertySource {
+
+    public JNDIPropertySource(String name, Context context);
+    public JNDIPropertySource(String name) throws NamingException;
+    public JNDIPropertySource() throws NamingException;
+
+    public void setScannable(boolean scannable);
+
+    [...]
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>By default the property source is <em>non scannable</em>, so a call the <code>getProperties()</code>
+will return an empty map instance. After calling <code>setScannable(true);</code> a call to
+<code>getProperties()</code> will return a String representation of the JNDI tree. Hereby
+leaves of the tree are converted using <code>String.valueOf(leaveObject)</code>.</p>
+</div>
+<div class="paragraph">
+<p>This module automatically registers an instance of JNDIPropertySource with a
+default ordinal of 200.</p>
+</div>
+<div class="paragraph">
+<p>You can extend this class or manually instantiate it, e.g. as part of a
+PropertySourceProvider. If no <code>Context</code> is passed explicitly, a new
+InitialContext is created, without any environment parameters set.</p>
+</div>
+</div>
+</div>
+</div></p>
+
+			<hr />
+		</div>
+	</div>
+	<div>
+			<div id="push"></div>
+
+		    <div id="footer">
+		      <div class="container">
+		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
+							at <span>2017-03-07</span> |
+							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+						</p>
+						<p>
+								<b>Disclaimer</b>
+                    Apache Tamaya (incubating) is an effort undergoing
+                    incubation at
+                    The Apache Software Foundation (ASF), sponsored by
+                    the name of Apache Incubator. Incubation is required of
+                    all newly accepted projects until a further review indicates
+                    that the infrastructure, communications, and decision making
+                    process have stabilized in a manner consistent with other
+                    successful ASF projects. While incubation status is not
+                    necessarily a reflection of the completeness or stability of
+                    the code, it does indicate that the project has yet to
+                    be fully endorsed by the ASF.<br />
+                    <a href="http://incubator.apache.org/guides/website.html" style="border:0px;" target="_target"><img class="incubator-logo" src="../../logos/egg-logo2.png"/></a>
+							</p>
+		      </div>
+		    </div>
+
+		    <!-- Le javascript
+		    ================================================== -->
+		    <!-- Placed at the end of the document so the pages load faster -->
+		    <script src="../../js/jquery-1.11.1.min.js"></script>
+		    <script src="../../js/bootstrap.min.js"></script>
+		    <script src="../../js/prettify.js"></script>
+    	</div>
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_jodatime.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_jodatime.html b/documentation/extensions/mod_jodatime.html
index 999b6c9..566601a 100644
--- a/documentation/extensions/mod_jodatime.html
+++ b/documentation/extensions/mod_jodatime.html
@@ -292,7 +292,7 @@ DateTime pit = configuration.get("pointInTime", DateTime.class)</code></pre>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_json.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_json.html b/documentation/extensions/mod_json.html
index 638fc92..7455a95 100644
--- a/documentation/extensions/mod_json.html
+++ b/documentation/extensions/mod_json.html
@@ -228,7 +228,7 @@ registers the <em>json</em> format automatically using the <code>ServiceContext<
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_management.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_management.html b/documentation/extensions/mod_management.html
index 626ed87..807f4db 100644
--- a/documentation/extensions/mod_management.html
+++ b/documentation/extensions/mod_management.html
@@ -274,7 +274,7 @@ The instance of ManagedConfigMBean to be created and registered is evaluated by
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_metamodel.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_metamodel.html b/documentation/extensions/mod_metamodel.html
index 1178333..f0569ef 100644
--- a/documentation/extensions/mod_metamodel.html
+++ b/documentation/extensions/mod_metamodel.html
@@ -871,7 +871,7 @@ never change later.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_mutable_config.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_mutable_config.html b/documentation/extensions/mod_mutable_config.html
index 1db90fc..a72ea09 100644
--- a/documentation/extensions/mod_mutable_config.html
+++ b/documentation/extensions/mod_mutable_config.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Mutable Configuration</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -141,7 +141,7 @@
 <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
 <div class="paragraph">
 <p>Tamaya Configuration by default is read-only, which covers must of the use cases. But there are many legit scenarios
-where configuration should be written back to some backend systems or the local file system. This module adds this
+where configuration should be written back to backend systems or the local file system. This module adds this
 functionality.</p>
 </div>
 </div>
@@ -173,14 +173,15 @@ functionality.</p>
 <div class="paragraph">
 <p>The core of the module is the MutableConfigurationProvider singleton, which provides access to MutableConfiguration
 instance, which extends Configuration. This interface adds additional methods to add/update or remove property values.
-Hereby changes applied are managed in a transaction like context, called ConfigChangeContext. Each context defines
+Hereby each MutableConfiguration manages a transaction like context, which includes
 a UUID that identifes a change.
-Backends for writing changes applied are of type MutablePropertySource, similarly extending the PropertySource
-SPI with methods for writing changes back. Registrations and ordering policies are like with ordinary property sources,
-with one important difference. Mutable property source can be targeted by write operations.</p>
+Backends for writing changes applied umst implement MutablePropertySource, which extends PropertySource.
+Registrations and ordering policies are exact the same as with ordinary property sources, but
+mutable property sources can be targeted by config write operations.</p>
 </div>
 <div class="paragraph">
-<p>The example below shows how a MutableConfiguration can be obtained the simplest way:</p>
+<p>The example below shows how a MutableConfiguration can be obtained ,values added, removed and
+finally changes written back to the backend:</p>
 </div>
 <div class="listingblock">
 <div class="title">Accessing and changing configuration</div>
@@ -194,7 +195,7 @@ config.put("newKey", "newValue")
 </div>
 </div>
 <div class="paragraph">
-<p>In the above scenario we use the overall system&#8217;s configuration as the backend to be used.
+<p>In the above scenario we use the system&#8217;s <em>default</em> configuration as the backend to be used.
 We can also pass any Configuration to render it into a mutable instance, e.g.</p>
 </div>
 <div class="listingblock">
@@ -213,14 +214,15 @@ MutableConfiguration config = MutableConfigurationProvider
 </td>
 <td class="content">
 If a configuration does not contain any MutablePropertySource instances,
-      a MutableConfiguration built from it will not be able to accept any changes.
+      a ConfigurationException is thrown since it would not be able to accept
+      any changes.
 </td>
 </tr>
 </table>
 </div>
 <div class="paragraph">
-<p>Following you see the options how to create a MutableConfiguration using the
-MutableConfigurationProvider singleton:</p>
+<p>Following we show the possible methods you can use to create a MutableConfiguration.
+We will show in the following sections more details on the options provided&#8230;&#8203;</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -241,7 +243,7 @@ MutableConfigurationProvider singleton:</p>
 </div>
 </div>
 <div class="paragraph">
-<p>Hereby MutableConfiguration is defined as follows:</p>
+<p>As we have not yet shown it, MutableConfiguration is defined as follows:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -260,21 +262,20 @@ MutableConfigurationProvider singleton:</p>
 }</code></pre>
 </div>
 </div>
-</div>
-<div class="sect3">
-<h4 id="_targeting_the_right_mutablepropertysources">Targeting the right MutablePropertySources</h4>
+<div class="sect4">
+<h5 id="_targeting_specific_mutablepropertysources">Targeting specific MutablePropertySources</h5>
 <div class="paragraph">
-<p>A Configuration may have multiple MutablePropertySource instances present. These are members of Tamaya&#8217;s oredered list of
+<p>A Configuration may have multiple MutablePropertySource instances present. These are members of Tamaya&#8217;s ordered list of
 PropertySources to evaluate the configuration. Nevertheless writing back changes requires additional aspects to
 be considered:
-* Should changes being written back to all mutable property sources? Or should a key that could be added or removed
-  on a more significant instance not be written/removed on less significant property source instances?
-* Should a change be applied only to a specific mutable property source, regardless its position in the
+* Should changes written target all mutable property sources? Or should a change only
+  target the most significant instance (hereby not writing the change to less significant property sources)?
+* Or should a change be applied only to specific mutable property source(s), regardless its position in the
   processing chain?</p>
 </div>
 <div class="paragraph">
-<p>Therefore a ChangePropagationPolicy can be set on a MutableConfiguration instance, which allows to control
-this aspect:</p>
+<p>Therefore a <em>default</em> ChangePropagationPolicy can be applied on a MutableConfiguration instance, which allows to
+control this aspect:</p>
 </div>
 <div class="listingblock">
 <div class="title">Explicitly passing the backing configuration</div>
@@ -282,7 +283,7 @@ this aspect:</p>
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public interface ChangePropagationPolicy {
     /**
      * Method being called when a multiple key/value pairs are added or updated.
-     * @param propertySources the property sources, including readable property sources of the current configuration,
+     * @param propertySources all property sources, including read-only property sources, of the current configuration,
      *                        never null.
      * @param configChange the configuration change, not null.
      */
@@ -291,10 +292,12 @@ this aspect:</p>
 </div>
 </div>
 <div class="paragraph">
-<p>By default, changes are applied to all registered MutablePropertySources similarly.</p>
+<p>By default, changes are applied to all registered MutablePropertySource instances
+similarly.</p>
 </div>
 <div class="paragraph">
-<p>Also the MutableConfigurationProvider provides access to the most commonly used change propagation policies:</p>
+<p>The MutableConfigurationProvider singleton also provides the most common
+change propagation policy implementations:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -310,6 +313,7 @@ this aspect:</p>
 </div>
 </div>
 </div>
+</div>
 <div class="sect3">
 <h4 id="_some_aspects_to_consider">Some Aspects to consider</h4>
 <div class="paragraph">
@@ -341,17 +345,7 @@ accordingly. Finally values also can be marked as immutable or being cached.</p>
 </div>
 <div class="paragraph">
 <p>So it is part of your application configuration design to clearly define, which property sources may be read-only, which
-may be mutable, how overriding should work and to which backends finally any changes should be written back. Nevertheless
-changing or adding value is very easy:</p>
-</div>
-<div class="listingblock">
-<div class="title">Changing a configuration</div>
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">MutableConfiguration config = MutableConfigurationProvider.createMutableConfiguration();
-config.put("newKey", "newValue");
-config.remove("mycluster.myapp.myKey");
-config.store();</code></pre>
-</div>
+may be mutable, how overriding should work and to which backends finally any changes should be written back.</p>
 </div>
 </div>
 </div>
@@ -377,8 +371,8 @@ PropertySourceProvider instances about the changes applied.</p>
 <div class="sect2">
 <h3 id="_supported_backends">Supported Backends</h3>
 <div class="paragraph">
-<p>Multiple backends are supported. E.g. the <em>etcd</em> integration module of Tamaya also registers
-corresponding SPI implementations/backends. By default this module comes with
+<p>Multiple backends are supported. E.g. <em>tamaya-etcd</em> also registers
+corresponding SPI implementations/backends. This module comes with
 the following MutablePropertySource implementations:</p>
 </div>
 <div class="ulist">
@@ -393,51 +387,6 @@ XML format.</p>
 </li>
 </ul>
 </div>
-<div class="sect3">
-<h4 id="_refreshable_property_sources">Refreshable Property Sources</h4>
-<div class="paragraph">
-<p>Somehow similar to configuration changes applied explicitly is the case, where values of underlying
-configuration backends change and must be reflected in the new configuration tree. Examples are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Configuration files being edited, added or removed.</p>
-</li>
-<li>
-<p>Changes on remote servers like etcd, consul</p>
-</li>
-<li>
-<p>etc.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>For having a common API for refreshable items a Refreshable interface is defined:</p>
-</div>
-<div class="listingblock">
-<div class="title">Refreshable interface</div>
-<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java">/**
- * Interface to be implemented by items that can be refreshed. By default
- * these are property sources, but more types may be supported at a later
- * point in time.
- */
-public interface Refreshable {
-
-    /**
-     * Refreshes the item by reloading its internal state.
-     */
-    void refresh();
-
-}</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_refreshable_property_sources_2">Refreshable Property Sources</h4>
-
-</div>
 </div>
 <div class="sect2">
 <h3 id="_spis">SPIs</h3>
@@ -480,7 +429,7 @@ singleton accessor:</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_optional.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_optional.html b/documentation/extensions/mod_optional.html
index 9071da7..62560ab 100644
--- a/documentation/extensions/mod_optional.html
+++ b/documentation/extensions/mod_optional.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Optional Tamaya Configuration</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -140,12 +140,13 @@
 <div class="sect2">
 <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
 <div class="paragraph">
-<p>Tamaya <em>Optional</em> provides contains three types only. It is for projects that want to benefit from Tamaya
-configuration optionally only. E.g. doing an OSS project you can declare to support configuration with Tamaya as
-an optional extension. This module can be added as a hard dependency to your code, hereby adding only three artofacts.
-It automatically checks the availability of Tamaya on the classpath and only if available tries to access it for
-configuration evaluation. Additionally an EvaluationPolicy lets you define the precedence of configured values
-(yours, or Tamaya ones if present).</p>
+<p>Tamaya <em>Optional</em>  is for projects that want to benefit from Tamaya configuration optionally only.
+E.g. doing an OSS project you can declare to support configuration with Tamaya as
+an optional extension. This module can be added as a hard dependency to your code, hereby adding only
+three artifacts. The <em>optional</em> module automatically checks the availability of Tamaya on the
+classpath and only if available it tries to access it for configuration evaluation.
+Additionally an EvaluationPolicy lets you define the precedence of configured values
+(yours, or Tamaya ones, if present).</p>
 </div>
 </div>
 <div class="sect2">
@@ -157,7 +158,7 @@ configuration evaluation. Additionally an EvaluationPolicy lets you define the p
 <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>
+<p>To use Tamaya <em>optional</em> you only must add the corresponding dependency to your module:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -172,8 +173,11 @@ configuration evaluation. Additionally an EvaluationPolicy lets you define the p
 <div class="sect2">
 <h3 id="_reading_configuration_using_the_tamaya_optional_module">Reading configuration using the Tamaya Optional Module</h3>
 <div class="paragraph">
-<p>Tamaya <em>Optional</em> allows reading configuration with a small subset of functionality only. For extended of full
-featured config please consider using the Apache Tamaya as a full configuration backend.</p>
+<p>Tamaya <em>Optional</em> allows reading configuration with a small subset of functionality only. For more
+ advanced use cases consider using the Apache Tamaya as your main configuration API. When
+ creating your OptionalConfiguration instance you also pass the logic to access a value
+ with your own configuration logic. Tamaya Optional will delegate to your logic as needed
+ (depending on the <code>EvaluationPolicy</code>).</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -200,7 +204,7 @@ featured config please consider using the Apache Tamaya as a full configuration
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_osgi.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_osgi.html b/documentation/extensions/mod_osgi.html
index e7aea4c..b6f3412 100644
--- a/documentation/extensions/mod_osgi.html
+++ b/documentation/extensions/mod_osgi.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extensions: OSGI Integrations</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -140,25 +140,25 @@
 <div class="sect2">
 <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
 <div class="paragraph">
-<p>Tamaya <em>OSGI</em> provides also support for integration with OSGI. Hereby Tamaya implements the OSGI ConfigAdmin service,
+<p>Tamaya <em>OSGI</em> provides support for integration with OSGI. Hereby Tamaya implements the OSGI ConfigAdmin service,
 which is the OSGI basic component providing configuration. Tamaya by default overrides the OSGI default configuration
-but can also be configured to extend it.</p>
+but can also be configured to extend it instead.</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_compatibility">Compatibility</h3>
 <div class="paragraph">
 <p>All module described are based on Java 7, so it will run on Java 7 and beyond.
-The modules are built against OSGI Compendium version 5.0. Tamaya OSGI support is tested against the following OSGI
-runtimes:</p>
+The modules are built against <strong>OSGI Compendium version 5.0</strong>. Tamaya OSGI support
+is tested against the following OSGI runtimes:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Apache Karaf, version 4.0.7</p>
+<p>Apache Karaf, version 4.0.7 (tbc)</p>
 </li>
 <li>
-<p>Apache Felix, version 5.6.1.</p>
+<p>Apache Felix, version 5.6.1</p>
 </li>
 <li>
 <p>tbd: Eclipse Equinox, version x.x.x.</p>
@@ -169,8 +169,8 @@ runtimes:</p>
 <div class="sect2">
 <h3 id="_installation">Installation</h3>
 <div class="paragraph">
-<p>To benefit from Tamaya in an OSGI context you must deploy at least the following modules to your OSGI runtime
-environment:</p>
+<p>To benefit from Tamaya in an OSGI context you must deploy at least the following modules to
+your OSGI runtime environment:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -293,7 +293,7 @@ as org.apache.tamaya.ext:tamaya-karaf-features:{tamaya-version}:features:xml.</p
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_remote.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_remote.html b/documentation/extensions/mod_remote.html
index baa574a..8f4ca8d 100644
--- a/documentation/extensions/mod_remote.html
+++ b/documentation/extensions/mod_remote.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Remote Configuration</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div id="preamble">
 <div class="sectionbody">
@@ -141,8 +141,8 @@
 <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
 <div class="paragraph">
 <p>Tamaya <em>Remote</em> provides support for reading configuration from remote resources. It provides
-especially out-of-the-box support for reading scoped configuration from a configuration server as
-provided with the <em>Tamaya server module</em> .</p>
+out-of-the-box support for reading scoped configuration from a Tamaya configuration server as
+provided with the Tamaya <em>server</em> module .</p>
 </div>
 </div>
 <div class="sect2">
@@ -154,7 +154,7 @@ provided with the <em>Tamaya server module</em> .</p>
 <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>
+<p>To use remote support you only must add the corresponding dependency to your module:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -169,7 +169,7 @@ provided with the <em>Tamaya server module</em> .</p>
 <div class="sect2">
 <h3 id="_reading_remote_configuration_from_a_tamaya_configuration_server">Reading Remote configuration from a Tamaya Configuration Server</h3>
 <div class="paragraph">
-<p>The remote module allows reading JSON formatted configuration as provided by the <em>Tamaya server extension</em> . The JSON
+<p>The remote module allows reading JSON formatted configuration as provided by the Tamaya <em>server</em> extension . The JSON
 format used looks as follows:</p>
 </div>
 <div class="listingblock">
@@ -196,37 +196,29 @@ format used looks as follows:</p>
   "sun.jnu.encoding": "Cp1252",
   "sun.management.compiler": "HotSpot 64-Bit Tiered Compilers",
   "sun.os.patch.level": "",
-  "{meta}class": "org.apache.tamaya.functions.FilteredConfiguration",
-  "{meta}info.filter": "java.v,sun",
-  "{meta}info.format": "application/json",
-  "{meta}info.timestamp": "1441463200571",
-  "{meta}timestamp": "1441463200571",
-  "{meta}type": "Configuration"
+  "_class": "org.apache.tamaya.functions.FilteredConfiguration",
+  "_info.filter": "java.v,sun",
+  "_info.format": "application/json",
+  "_info.timestamp": "1441463200571",
+  "_timestamp": "1441463200571",
+  "_type": "Configuration"
 }</code></pre>
 </div>
 </div>
 <div class="paragraph">
 <p>Basically there are no constraints about they keys provided. By default Tamaya uses keys prefixed with
-{xxx} to identify meta-data entries, but this is not a required precondition.</p>
+'_' to identify meta-data entries, but this is not a required precondition.</p>
 </div>
 <div class="paragraph">
 <p>Finally such a remote configuration can be easily integrated by inheriting from the provided base
 class. Hereby a default ordinal must be defined and the protected Collection&lt;URL&gt; getAccessURLs()
 method must be implemented to define the URL from where the configuration should be accessible. Hereby
 multiple URLs can be provided, which are accesed in order as provided by the collection&#8217;s iterator. The
-first URL that is successfully accessed determines the configuration read and imported into the
-PropertySource.</p>
+first accessible URL determines the configuration read.</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="prettyprint highlight"><code class="language-java" data-lang="java">public class RemotePropertySource extends BaseRemotePropertySource{
-    /** Current remote property source default ordinal. */
-    private static final int REMOTE_ORDINAL = 15000;
-
-    @Override
-    public int getDefaultOrdinal(){
-        return REMOTE_ORDINAL;
-    }
 
     @Override
     protected Collection&lt;URL&gt; getAccessURLs() {
@@ -263,7 +255,7 @@ PropertySource.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_resolver.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_resolver.html b/documentation/extensions/mod_resolver.html
index 1a6fa9c..7eb7a29 100644
--- a/documentation/extensions/mod_resolver.html
+++ b/documentation/extensions/mod_resolver.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Resolver</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div class="sect1">
 <h2 id="Resolver">Tamaya Resolver (Extension Module)</h2>
@@ -135,8 +135,7 @@
 <div class="sect2">
 <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
 <div class="paragraph">
-<p>Tamaya <em>Resolver</em> is an extension module. Refer to the
-<a href="../extensions.html">extensions documentation</a>
+<p>Tamaya <em>Resolver</em> is an extension module. Refer to the <a href="../extensions.html">extensions documentation</a>
 for further details about modules.</p>
 </div>
 <div class="paragraph">
@@ -173,7 +172,7 @@ is accessed.</p>
 <div class="sect2">
 <h3 id="_available_resolvers">Available Resolvers</h3>
 <div class="paragraph">
-<p>Currently the module defined the following resolvers:</p>
+<p>Currently the module defines the following resolvers:</p>
 </div>
 <table class="tableblock frame-all grid-all spread">
 <caption class="title">Table 1. Available Resolvers</caption>
@@ -214,7 +213,7 @@ is accessed.</p>
 <div class="sect2">
 <h3 id="_spi_implementing_your_own_resolvers">SPI: Implementing your own Resolvers</h3>
 <div class="paragraph">
-<p>The module also provides an easy but powerful SPI for adding your own resolver implementations. Basically the
+<p>The module also provides a small but powerful SPI for adding your own resolver implementations. Basically the
 first and most important thing to do is implementing the ExpressionResolver interface:</p>
 </div>
 <div class="listingblock">
@@ -271,7 +270,7 @@ interface:</p>
 </div>
 </div>
 <div class="paragraph">
-<p>Implementing and registering this interface gives you full control, but in most cases yhou should be fine with
+<p>Implementing and registering this interface gives you full control, but in most cases you should be fine with
 the default implementation in place.</p>
 </div>
 </div>
@@ -288,7 +287,7 @@ the default implementation in place.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/637aaff6/documentation/extensions/mod_resources.html
----------------------------------------------------------------------
diff --git a/documentation/extensions/mod_resources.html b/documentation/extensions/mod_resources.html
index 13729cd..83a02b9 100644
--- a/documentation/extensions/mod_resources.html
+++ b/documentation/extensions/mod_resources.html
@@ -124,7 +124,7 @@
 				<h1>Apache Tamaya&amp;#8201;&amp;#8212;&amp;#8201;Extension: Resources</h1>
 			</div>
 
-			<p><em>2017-02-24</em></p>
+			<p><em>2017-03-07</em></p>
 
 			<p><div class="sect1">
 <h2 id="Resources">Tamaya Resources (Extension Module)</h2>
@@ -135,8 +135,20 @@
 <div class="sect2">
 <h3 id="_what_functionality_this_module_provides">What functionality this module provides ?</h3>
 <div class="paragraph">
-<p>Tamaya <em>Resources</em> defines some additional tools to locate resources in your classpath or file system based on descriptive
-ant-styled resource patterns. To use this module add the following dependency:</p>
+<p>Tamaya <em>Resources</em> defines some additional tools to locate resources in your classpath or file system based on
+descriptive ant-styled resource patterns.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_compatibility">Compatibility</h3>
+<div class="paragraph">
+<p>The module is based on Java 7, so it can be used with Java 7 and beyond.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_installation">Installation</h3>
+<div class="paragraph">
+<p>To use this module add the following dependency:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -147,6 +159,9 @@ ant-styled resource patterns. To use this module add the following dependency:</
 &lt;/dependency&gt;</code></pre>
 </div>
 </div>
+</div>
+<div class="sect2">
+<h3 id="_usage">Usage</h3>
 <div class="paragraph">
 <p>The module&#8217;s main entry point is the singleton class org.apache.tamaya.resource.ConfigResources. This class
 provides access to a ResourceResolver instance:</p>
@@ -189,7 +204,7 @@ So by default resources can be looked up</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_valid_expression_examples">Valid Expression Examples</h3>
+<h3 id="_examples">Examples</h3>
 <div class="paragraph">
 <p>There are numerous ways how a resource pattern can be defined. Following the most important variants
 are listed:</p>
@@ -239,7 +254,7 @@ location, hereby traversing down all folders:</p>
     @Override
     public Collection&lt;PropertySource&gt; getPropertySources() {
         List&lt;PropertySource&gt; propertySources = new ArrayList&lt;&gt;();
-        Collection&lt;URL&gt; resources = Resources.getResourceResolver().getResources("META-INF/cfg/**/*.properties");
+        Collection&lt;URL&gt; resources = ConfigResources.getResourceResolver().getResources("META-INF/cfg/**/*.properties");
         for(URL url:resources){
             Properties props = new Properties();
             try(InputStream is = url.openStream()){
@@ -307,7 +322,7 @@ on your own.</p>
 		      <div class="container">
 		        <p class="muted credit">&copy; 2014-<span>2017</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.5.1</span></a>
-							at <span>2017-02-24</span> |
+							at <span>2017-03-07</span> |
 							 <a href="https://twitter.com/tamayaconf" class="twitter-follow-button" data-show-count="false">Follow @TamayaConf</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 						</p>
 						<p>