svn commit: r944136 - in /websites/staging/tamaya/trunk/content: ./ quickstart.html

[bu...@apache.org]

Author: buildbot
Date: Tue Mar 17 19:38:01 2015
New Revision: 944136

Log:
Staging update by buildbot for tamaya

Modified:
    websites/staging/tamaya/trunk/content/   (props changed)
    websites/staging/tamaya/trunk/content/quickstart.html

Propchange: websites/staging/tamaya/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Mar 17 19:38:01 2015
@@ -1 +1 @@
-1663744
+1667379

Modified: websites/staging/tamaya/trunk/content/quickstart.html
==============================================================================
--- websites/staging/tamaya/trunk/content/quickstart.html (original)
+++ websites/staging/tamaya/trunk/content/quickstart.html Tue Mar 17 19:38:01 2015
@@ -104,22 +104,39 @@ minimalistic way. FOr that add the follo
 
 
 <p>Given that you can add your configuration properties to the following locations in your classpath:</p>
-<div class="codehilite"><pre><span class="n">META</span><span class="o">-</span><span class="n">INF</span><span class="o">/</span><span class="n">cfg</span><span class="o">/</span><span class="n">default</span><span class="o">-</span><span class="n">config</span><span class="p">.</span><span class="k">properties</span>
-<span class="n">META</span><span class="o">-</span><span class="n">INF</span><span class="o">/</span><span class="n">cfg</span><span class="o">/</span><span class="n">config</span><span class="p">.</span><span class="k">properties</span>
+<div class="codehilite"><pre><span class="n">META</span><span class="o">-</span><span class="n">INF</span><span class="o">/</span><span class="n">javaconfiguration</span><span class="p">.</span><span class="k">properties</span>
 </pre></div>
 
 
-<p>Additionally also system and environment properties are taken into account. Overall Tamaya by default defines the
-following configuration model (most significant first):</p>
+<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>
 <div class="codehilite"><pre>1<span class="p">.</span> <span class="n">System</span> <span class="n">Properties</span>
-2<span class="p">.</span> <span class="n">META</span><span class="o">-</span><span class="n">INF</span><span class="o">/</span><span class="n">cfg</span><span class="o">/</span><span class="n">config</span><span class="p">.</span><span class="k">properties</span>
-3<span class="p">.</span> <span class="n">META</span><span class="o">-</span><span class="n">INF</span><span class="o">/</span><span class="n">cfg</span><span class="o">/</span><span class="n">default</span><span class="o">-</span><span class="n">config</span><span class="p">.</span><span class="k">properties</span>
-5<span class="p">.</span> <span class="n">Environment</span> <span class="n">Properties</span>
+2<span class="p">.</span> <span class="n">META</span><span class="o">-</span><span class="n">INF</span><span class="o">/</span><span class="n">cfg</span><span class="o">/</span><span class="n">javaconfiguration</span><span class="p">.</span><span class="k">properties</span>
 </pre></div>
 
 
+<p>By default you can provide multiple javaconfig.properties files, e.g. as part of multiple jars loaded into your system.
+The system internally creates one PropertySource for each file found on the classpath. All PropertySources created
+are ordered by their ordinal value (an int). These ordinal values can be either hardcoded, or be dynamically
+configurable as key within each file. The ladder can be done by defining a special Tamaya ordinal value as follows:</p>
+<div class="codehilite"><pre><span class="c">#override ordinal</span>
+<span class="n">tamaya</span><span class="p">.</span><span class="n">ordinal</span><span class="p">=</span>123
+</pre></div>
+
+
+<p>This assigns an ordinal of 123 to each entry in that configuration resource. Tamaya Core defines the following default
+ordinals (used, if no custom ordinal is defined):</p>
+<ul>
+<li>System Properties -&gt; 400</li>
+<li>javaconfiguration.properties -&gt; 100</li>
+</ul>
+<p>If you want to add additional file locations or formats or other functionality you miss, have a look at the numerous
+Tamaya extension modules (see below). Or just implement a PropertySource (or PropertySourceProvider) on your own and register
+it using the Java ServiceLoader.</p>
 <h1 id="adding-additional-features">Adding additional features</h1>
-<p>Depenending on your liking you may add additional extensions such as:</p>
+<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>
 <h2 id="dynamic-resolution-and-value-placeholders">Dynamic Resolution and Value Placeholders</h2>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>org.apache.tamaya.ext<span class="nt">&lt;/id&gt;</span>