tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r941994 [16/17] - in /websites/staging/tamaya/trunk/content: ./ javadoc/ javadoc/api/ javadoc/api/index-files/ javadoc/api/org/ javadoc/api/org/apache/ javadoc/api/org/apache/tamaya/ javadoc/api/org/apache/tamaya/spi/ javadoc/core/ javadoc/...
Date Mon, 02 Mar 2015 21:36:04 GMT
Added: websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/JavaConfigurationProvider.html
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/JavaConfigurationProvider.html (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/JavaConfigurationProvider.html Mon Mar  2 21:36:02 2015
@@ -0,0 +1,282 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (1.8.0) on Sun Mar 01 11:36:39 CET 2015 -->
+<title>JavaConfigurationProvider</title>
+<meta name="date" content="2015-03-01">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="JavaConfigurationProvider";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/tamaya/core/provider/JavaConfigurationProvider.html" target="_top">Frames</a></li>
+<li><a href="JavaConfigurationProvider.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.tamaya.core.provider</div>
+<h2 title="Class JavaConfigurationProvider" class="title">Class JavaConfigurationProvider</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>org.apache.tamaya.core.provider.JavaConfigurationProvider</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>org.apache.tamaya.spi.PropertySourceProvider</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">JavaConfigurationProvider</span>
+extends java.lang.Object
+implements org.apache.tamaya.spi.PropertySourceProvider</pre>
+<div class="block">Provider which reads all <code>javaconfiguration.properties</code> files from classpath</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/tamaya/core/provider/JavaConfigurationProvider.html#JavaConfigurationProvider--">JavaConfigurationProvider</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.util.Collection&lt;org.apache.tamaya.spi.PropertySource&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/tamaya/core/provider/JavaConfigurationProvider.html#getPropertySources--">getPropertySources</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="JavaConfigurationProvider--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>JavaConfigurationProvider</h4>
+<pre>public&nbsp;JavaConfigurationProvider()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getPropertySources--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getPropertySources</h4>
+<pre>public&nbsp;java.util.Collection&lt;org.apache.tamaya.spi.PropertySource&gt;&nbsp;getPropertySources()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>getPropertySources</code>&nbsp;in interface&nbsp;<code>org.apache.tamaya.spi.PropertySourceProvider</code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>For each e.g. property file, we return a single PropertySource
+         or an empty list if no PropertySource exists.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/tamaya/core/provider/JavaConfigurationProvider.html" target="_top">Frames</a></li>
+<li><a href="JavaConfigurationProvider.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

Added: websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/package-frame.html
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/package-frame.html (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/package-frame.html Mon Mar  2 21:36:02 2015
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (1.8.0) on Sun Mar 01 11:36:39 CET 2015 -->
+<title>org.apache.tamaya.core.provider</title>
+<meta name="date" content="2015-03-01">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../../../org/apache/tamaya/core/provider/package-summary.html" target="classFrame">org.apache.tamaya.core.provider</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="JavaConfigurationProvider.html" title="class in org.apache.tamaya.core.provider" target="classFrame">JavaConfigurationProvider</a></li>
+</ul>
+</div>
+</body>
+</html>

Added: websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/package-summary.html
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/package-summary.html (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/package-summary.html Mon Mar  2 21:36:02 2015
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (1.8.0) on Sun Mar 01 11:36:39 CET 2015 -->
+<title>org.apache.tamaya.core.provider</title>
+<meta name="date" content="2015-03-01">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="org.apache.tamaya.core.provider";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/apache/tamaya/core/propertysource/package-summary.html">Prev&nbsp;Package</a></li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/tamaya/core/provider/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;org.apache.tamaya.core.provider</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/apache/tamaya/core/provider/JavaConfigurationProvider.html" title="class in org.apache.tamaya.core.provider">JavaConfigurationProvider</a></td>
+<td class="colLast">
+<div class="block">Provider which reads all <code>javaconfiguration.properties</code> files from classpath</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/apache/tamaya/core/propertysource/package-summary.html">Prev&nbsp;Package</a></li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/tamaya/core/provider/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

Added: websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/package-tree.html
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/package-tree.html (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/org/apache/tamaya/core/provider/package-tree.html Mon Mar  2 21:36:02 2015
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (1.8.0) on Sun Mar 01 11:36:39 CET 2015 -->
+<title>org.apache.tamaya.core.provider Class Hierarchy</title>
+<meta name="date" content="2015-03-01">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="org.apache.tamaya.core.provider Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/apache/tamaya/core/propertysource/package-tree.html">Prev</a></li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/tamaya/core/provider/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package org.apache.tamaya.core.provider</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">org.apache.tamaya.core.provider.<a href="../../../../../org/apache/tamaya/core/provider/JavaConfigurationProvider.html" title="class in org.apache.tamaya.core.provider"><span class="typeNameLink">JavaConfigurationProvider</span></a> (implements org.apache.tamaya.spi.PropertySourceProvider)</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/apache/tamaya/core/propertysource/package-tree.html">Prev</a></li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/tamaya/core/provider/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

Added: websites/staging/tamaya/trunk/content/javadoc/core/overview-frame.html
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/overview-frame.html (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/overview-frame.html Mon Mar  2 21:36:02 2015
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (1.8.0) on Sun Mar 01 11:36:39 CET 2015 -->
+<title>Overview List</title>
+<meta name="date" content="2015-03-01">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<div class="indexHeader"><span><a href="allclasses-frame.html" target="packageFrame">All&nbsp;Classes</a></span></div>
+<div class="indexContainer">
+<h2 title="Packages">Packages</h2>
+<ul title="Packages">
+<li><a href="org/apache/tamaya/core/internal/package-frame.html" target="packageFrame">org.apache.tamaya.core.internal</a></li>
+<li><a href="org/apache/tamaya/core/internal/converters/package-frame.html" target="packageFrame">org.apache.tamaya.core.internal.converters</a></li>
+<li><a href="org/apache/tamaya/core/propertysource/package-frame.html" target="packageFrame">org.apache.tamaya.core.propertysource</a></li>
+<li><a href="org/apache/tamaya/core/provider/package-frame.html" target="packageFrame">org.apache.tamaya.core.provider</a></li>
+</ul>
+</div>
+<p>&nbsp;</p>
+</body>
+</html>

Added: websites/staging/tamaya/trunk/content/javadoc/core/overview-summary.html
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/overview-summary.html (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/overview-summary.html Mon Mar  2 21:36:02 2015
@@ -0,0 +1,145 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (1.8.0) on Sun Mar 01 11:36:39 CET 2015 -->
+<title>Overview</title>
+<meta name="date" content="2015-03-01">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Overview";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li class="navBarCell1Rev">Overview</li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-summary.html" target="_top">Frames</a></li>
+<li><a href="overview-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
+<caption><span>Packages</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="org/apache/tamaya/core/internal/package-summary.html">org.apache.tamaya.core.internal</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="org/apache/tamaya/core/internal/converters/package-summary.html">org.apache.tamaya.core.internal.converters</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="org/apache/tamaya/core/propertysource/package-summary.html">org.apache.tamaya.core.propertysource</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="org/apache/tamaya/core/provider/package-summary.html">org.apache.tamaya.core.provider</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li class="navBarCell1Rev">Overview</li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-summary.html" target="_top">Frames</a></li>
+<li><a href="overview-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

Added: websites/staging/tamaya/trunk/content/javadoc/core/overview-tree.html
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/overview-tree.html (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/overview-tree.html Mon Mar  2 21:36:02 2015
@@ -0,0 +1,174 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (1.8.0) on Sun Mar 01 11:36:39 CET 2015 -->
+<title>Class Hierarchy</title>
+<meta name="date" content="2015-03-01">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For All Packages</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="org/apache/tamaya/core/internal/package-tree.html">org.apache.tamaya.core.internal</a>, </li>
+<li><a href="org/apache/tamaya/core/internal/converters/package-tree.html">org.apache.tamaya.core.internal.converters</a>, </li>
+<li><a href="org/apache/tamaya/core/propertysource/package-tree.html">org.apache.tamaya.core.propertysource</a>, </li>
+<li><a href="org/apache/tamaya/core/provider/package-tree.html">org.apache.tamaya.core.provider</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">org.apache.tamaya.core.propertysource.<a href="org/apache/tamaya/core/propertysource/BasePropertySource.html" title="class in org.apache.tamaya.core.propertysource"><span class="typeNameLink">BasePropertySource</span></a> (implements org.apache.tamaya.spi.PropertySource)
+<ul>
+<li type="circle">org.apache.tamaya.core.propertysource.<a href="org/apache/tamaya/core/propertysource/EnvironmentPropertySource.html" title="class in org.apache.tamaya.core.propertysource"><span class="typeNameLink">EnvironmentPropertySource</span></a></li>
+<li type="circle">org.apache.tamaya.core.propertysource.<a href="org/apache/tamaya/core/propertysource/PropertiesFilePropertySource.html" title="class in org.apache.tamaya.core.propertysource"><span class="typeNameLink">PropertiesFilePropertySource</span></a></li>
+<li type="circle">org.apache.tamaya.core.propertysource.<a href="org/apache/tamaya/core/propertysource/SystemPropertySource.html" title="class in org.apache.tamaya.core.propertysource"><span class="typeNameLink">SystemPropertySource</span></a></li>
+</ul>
+</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/BigDecimalConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">BigDecimalConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/BigIntegerConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">BigIntegerConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/BooleanConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">BooleanConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/ByteConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">ByteConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/CharConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">CharConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/ClassConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">ClassConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/CurrencyConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">CurrencyConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.<a href="org/apache/tamaya/core/internal/DefaultConfiguration.html" title="class in org.apache.tamaya.core.internal"><span class="typeNameLink">DefaultConfiguration</span></a> (implements org.apache.tamaya.Configuration)</li>
+<li type="circle">org.apache.tamaya.core.internal.<a href="org/apache/tamaya/core/internal/DefaultConfigurationContext.html" title="class in org.apache.tamaya.core.internal"><span class="typeNameLink">DefaultConfigurationContext</span></a> (implements org.apache.tamaya.spi.ConfigurationContext)</li>
+<li type="circle">org.apache.tamaya.core.internal.<a href="org/apache/tamaya/core/internal/DefaultConfigurationProvider.html" title="class in org.apache.tamaya.core.internal"><span class="typeNameLink">DefaultConfigurationProvider</span></a> (implements org.apache.tamaya.spi.ConfigurationProviderSpi)</li>
+<li type="circle">org.apache.tamaya.core.propertysource.<a href="org/apache/tamaya/core/propertysource/DefaultOrdinal.html" title="class in org.apache.tamaya.core.propertysource"><span class="typeNameLink">DefaultOrdinal</span></a></li>
+<li type="circle">org.apache.tamaya.core.internal.<a href="org/apache/tamaya/core/internal/DefaultServiceContext.html" title="class in org.apache.tamaya.core.internal"><span class="typeNameLink">DefaultServiceContext</span></a> (implements org.apache.tamaya.spi.ServiceContext)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/DoubleConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">DoubleConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/EnumConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">EnumConverter</span></a>&lt;T&gt; (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/FloatConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">FloatConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/IntegerConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">IntegerConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.provider.<a href="org/apache/tamaya/core/provider/JavaConfigurationProvider.html" title="class in org.apache.tamaya.core.provider"><span class="typeNameLink">JavaConfigurationProvider</span></a> (implements org.apache.tamaya.spi.PropertySourceProvider)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/LocalDateConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">LocalDateConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">LocalDateTimeConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/LocalTimeConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">LocalTimeConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/LongConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">LongConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.<a href="org/apache/tamaya/core/internal/MetaConfig.html" title="class in org.apache.tamaya.core.internal"><span class="typeNameLink">MetaConfig</span></a></li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/NumberConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">NumberConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.<a href="org/apache/tamaya/core/internal/PropertiesFileLoader.html" title="class in org.apache.tamaya.core.internal"><span class="typeNameLink">PropertiesFileLoader</span></a></li>
+<li type="circle">org.apache.tamaya.core.internal.<a href="org/apache/tamaya/core/internal/PropertyConverterManager.html" title="class in org.apache.tamaya.core.internal"><span class="typeNameLink">PropertyConverterManager</span></a></li>
+<li type="circle">org.apache.tamaya.core.internal.<a href="org/apache/tamaya/core/internal/ReflectionUtil.html" title="class in org.apache.tamaya.core.internal"><span class="typeNameLink">ReflectionUtil</span></a></li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/ShortConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">ShortConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/URiConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">URiConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/URLConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">URLConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.tamaya.core.internal.converters.<a href="org/apache/tamaya/core/internal/converters/ZoneIdConverter.html" title="class in org.apache.tamaya.core.internal.converters"><span class="typeNameLink">ZoneIdConverter</span></a> (implements org.apache.tamaya.PropertyConverter&lt;T&gt;)</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

Added: websites/staging/tamaya/trunk/content/javadoc/core/package-list
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/package-list (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/package-list Mon Mar  2 21:36:02 2015
@@ -0,0 +1,4 @@
+org.apache.tamaya.core.internal
+org.apache.tamaya.core.internal.converters
+org.apache.tamaya.core.propertysource
+org.apache.tamaya.core.provider

Added: websites/staging/tamaya/trunk/content/javadoc/core/script.js
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/script.js (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/script.js Mon Mar  2 21:36:02 2015
@@ -0,0 +1,30 @@
+function show(type)
+{
+    count = 0;
+    for (var key in methods) {
+        var row = document.getElementById(key);
+        if ((methods[key] &  type) != 0) {
+            row.style.display = '';
+            row.className = (count++ % 2) ? rowColor : altColor;
+        }
+        else
+            row.style.display = 'none';
+    }
+    updateTabs(type);
+}
+
+function updateTabs(type)
+{
+    for (var value in tabs) {
+        var sNode = document.getElementById(tabs[value][0]);
+        var spanNode = sNode.firstChild;
+        if (value == type) {
+            sNode.className = activeTableTab;
+            spanNode.innerHTML = tabs[value][1];
+        }
+        else {
+            sNode.className = tableTab;
+            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
+        }
+    }
+}

Added: websites/staging/tamaya/trunk/content/javadoc/core/stylesheet.css
==============================================================================
--- websites/staging/tamaya/trunk/content/javadoc/core/stylesheet.css (added)
+++ websites/staging/tamaya/trunk/content/javadoc/core/stylesheet.css Mon Mar  2 21:36:02 2015
@@ -0,0 +1,574 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D7A97;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+    width:100%;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}

Modified: websites/staging/tamaya/trunk/content/modules.html
==============================================================================
--- websites/staging/tamaya/trunk/content/modules.html (original)
+++ websites/staging/tamaya/trunk/content/modules.html Mon Mar  2 21:36:02 2015
@@ -83,13 +83,10 @@
               <div class="toc">
 <ul>
 <li><a href="#overview">Overview</a></li>
-<li><a href="#api">API</a><ul>
-<li><a href="#directly-access-configuration">Directly Access Configuration</a></li>
-<li><a href="#configuration-injection">Configuration Injection</a></li>
-</ul>
-</li>
+<li><a href="#api">API</a></li>
 <li><a href="#core">Core</a></li>
 <li><a href="#modules">Modules</a><ul>
+<li><a href="#configuration-injection">Configuration Injection</a></li>
 <li><a href="#integrations">Integrations</a><ul>
 <li><a href="#cdi-integration">CDI Integration</a></li>
 <li><a href="#spring-integration">Spring Integration</a></li>
@@ -99,15 +96,10 @@
 <li><a href="#meta-models">Meta-Models</a><ul>
 <li><a href="#simple-meta-model">Simple (Meta-Model)</a></li>
 <li><a href="#classloader-aware-meta-model">Classloader Aware Meta-Model</a></li>
-<li><a href="#java-ee-default-meta-model">Java EE Default Meta-Model</a></li>
-</ul>
-</li>
-<li><a href="#environment-models">Environment Models</a><ul>
-<li><a href="#default-environment-model">Default Environment-Model</a></li>
-<li><a href="#classloader-aware-environment-model">Classloader Aware Environment-Model</a></li>
-<li><a href="#java-ee-default-environment-model">Java EE Default Environment-Model</a></li>
+<li><a href="#java-ee-base-meta-model">Java EE Base Meta-Model</a></li>
 </ul>
 </li>
+<li><a href="#environment-module">Environment Module</a></li>
 </ul>
 </li>
 </ul>
@@ -116,86 +108,45 @@
 <h1 id="overview">Overview</h1>
 <p>Tamaya has a modular design comprising the following parts:</p>
 <ul>
-<li>The <strong>API</strong> contains a complete API and <strong>SPI</strong> with interfaces for <em>Configuration, Environment, PropertyProvider</em>
-  and the frameworks <strong>Bootstrap</strong> mechanism.</li>
-<li>The <strong>Core</strong> contains a minimal implementation of the API that contains everything but
-  the effective meta-model.</li>
-<li>The <strong>Modules</strong> contains extensions and adapters to </li>
-<li>integrate Tamaya with other frameworks such as Apache Commons Configuration, Spring and Java EE, CDI.</li>
-<li>additional helper modules that support developers assembling complex meta-models from simpler providers.</li>
-<li>different preconfigured environment models.</li>
-<li>different rebuilt configuration meta-models.</li>
-<li>The <strong>Documentation</strong> module contains several documentations in <em>asciidoc</em> .</li>
+<li>Tamaya contains a complete <strong>API</strong> with interfaces for <em>Configuration, ConfigurationProvider,
+  ConfigOperator, ConfigQuery, PropertyConverter, TypeLiteral, ConfigException</em></li>
+<li>Besides the API Tamaya defines an <strong>SPI</strong>, which provides powerful extension mechanisms with artifacts such as
+  <strong>ConfigurationContext, ConfigurationContextBuilder, ConfigurationProviderSpi, PropertyFilter, PropertySource,
+  PropertySourceProvider,  PropertyValueCombinationPolicy, ServiceContext, ServiceContextManager</strong>.</li>
+<li>The <strong>Core</strong> contains a small and minimal implementation of the API that contains everything needed for SE based use cases.</li>
+<li>
+<p>The <strong>Modules</strong> are planned to contain extensions (based on the API, no dependencies to Core) to
+  <strong> provide injection mechanism for configuration (injection)
+  </strong> provide support for dynamic placeholders and custom resolvers (resolver)
+  <strong> provide mechanism to declaratively lookup resources in the filesystem and the classpath (resources)
+  </strong> event mechanism for modelling and propagating configuration changes (events)
+  <strong> define a common model for decoupling formatting from building up concrete property sources (formats)
+  </strong> enrich Tamaya with an extendible environment model (environment)
+  <strong> provide more complex met-configuration schemes, e.g. for OSGI, Java EE and other runtime container technologies.
+  </strong> integrate Tamaya with other frameworks such as Apache Commons Configuration, Spring and Java EE, CDI.
+  ** and possibly more...</p>
+</li>
+<li>
+<p>The <strong>Documentation</strong> module contains overall documentations in <em>asciidoc</em> .</p>
+</li>
 </ul>
 <h1 id="api">API</h1>
-<h2 id="directly-access-configuration">Directly Access Configuration</h2>
-<p>The <strong>API</strong> contains a complete SE API with interfaces for <em>Configuration, Environment, PropertyProvider</em>.
-This interfaces also offer access to related instances, e.g.</p>
-<div class="codehilite"><pre><span class="n">Configuration</span> <span class="n">config</span> <span class="p">=</span> <span class="n">Configuration</span><span class="p">.</span><span class="n">current</span><span class="p">();</span>
-<span class="n">Environment</span> <span class="n">env</span> <span class="p">=</span> <span class="n">Environment</span><span class="p">.</span><span class="n">current</span><span class="p">();</span>
-</pre></div>
-
-
-<p>Most users in a SE context will typically only work with <em>Configuration</em>, since it offers all functionality
-available regarding configuration. Additionally the API allows to inject configuration
-by adding annotations:</p>
-<div class="codehilite"><pre><span class="n">String</span> <span class="n">myKey</span> <span class="p">=</span> <span class="n">Configuration</span><span class="p">.</span><span class="n">current</span><span class="p">().</span><span class="n">get</span><span class="p">(</span>&quot;<span class="n">myKey</span>&quot;<span class="p">).</span><span class="n">orElse</span><span class="p">(</span>&quot;<span class="n">myDefaultValue</span>&quot;<span class="p">);</span>
-<span class="n">int</span> <span class="n">myLimit</span> <span class="p">=</span> <span class="n">Configuration</span><span class="p">.</span><span class="n">current</span><span class="p">().</span><span class="n">getInt</span><span class="p">(</span>&quot;<span class="n">all</span><span class="p">.</span><span class="nb">size</span><span class="p">.</span><span class="n">limit</span>&quot;<span class="p">).</span><span class="n">getAsInt</span><span class="p">();</span>
-</pre></div>
-
-
-<h2 id="configuration-injection">Configuration Injection</h2>
-<p>Now with JSR 299/330 we all are aware of inversion of control and dependency injection as a much
-more elegant way to resolve our dependencies. The same is also true for configuring. Instead
-of adding boilerplate configuration code just let <em>Tamaya: do the work for you. When CDI
-is in place that can be done seemlessly, by leveraging CDI. The same can be done for other DI
-frameworks. But even in pure SE _Tamaya</em> supports configuration injection. Look at the following
-example:</p>
-<div class="codehilite"><pre><span class="n">public</span> <span class="n">final</span> <span class="n">class</span> <span class="n">MyConfiguredPlugin</span> <span class="p">{</span>
-  <span class="p">@</span><span class="n">ConfiguredProperty</span>
-  <span class="n">private</span> <span class="n">String</span> <span class="n">productName</span><span class="p">;</span>
-
-  <span class="p">@</span><span class="n">ConfiguredProperty</span><span class="p">(</span>&quot;<span class="n">product</span><span class="p">.</span><span class="n">version</span>&quot;<span class="p">)</span>
-  <span class="p">@</span><span class="n">ConfiguredProperty</span><span class="p">(</span>&quot;<span class="n">PRODUCT</span><span class="p">.</span><span class="n">version</span>&quot;<span class="p">)</span> <span class="o">//</span> <span class="n">Legacy</span> <span class="n">item</span>
-  <span class="n">private</span> <span class="n">Version</span> <span class="n">version</span><span class="p">;</span>
-
-  <span class="p">...</span>
-<span class="p">}</span>
-</pre></div>
-
-
-<p>Hereby the example only shows a subset of the possibilities, given an instance of this class
-you can then call <em>Tamaya</em> to configure your fields:</p>
-<div class="codehilite"><pre><span class="n">MyConfiguredPlugin</span> <span class="n">plugin</span> <span class="p">=</span> <span class="p">...;</span>
-<span class="n">Configuration</span><span class="p">.</span><span class="n">configure</span><span class="p">(</span><span class="n">plugin</span><span class="p">);</span>
-</pre></div>
-
-
-<p>But this is not yet all. You can also define your type-safe configuration templates and add
-annotations on your template and let <em>Tamaya</em> implement your interface:</p>
-<div class="codehilite"><pre><span class="n">public</span> <span class="n">interface</span> <span class="n">MyConfiguredPluginTemplate</span><span class="p">{</span>
-
-  <span class="p">@</span><span class="n">ConfiguredProperty</span>
-  <span class="n">public</span> <span class="n">String</span> <span class="n">getProductName</span><span class="p">();</span>
-
-  <span class="p">@</span><span class="n">ConfiguredProperty</span><span class="p">(</span>&quot;<span class="n">product</span><span class="p">.</span><span class="n">version</span>&quot;<span class="p">)</span>
-  <span class="p">@</span><span class="n">ConfiguredProperty</span><span class="p">(</span>&quot;<span class="n">PRODUCT</span><span class="p">.</span><span class="n">version</span>&quot;<span class="p">)</span> <span class="o">//</span> <span class="n">Legacy</span> <span class="n">item</span>
-  <span class="n">public</span> <span class="n">Version</span> <span class="n">getVersion</span><span class="p">();</span>
-
-<span class="p">}</span>
-</pre></div>
-
-
-<p>Similar as when configuring instances you pass your template to the configuration:</p>
-<div class="codehilite"><pre><span class="n">MyConfiguredPluginTemplate</span> <span class="n">template</span> <span class="p">=</span> <span class="n">Configuration</span><span class="p">.</span><span class="n">getConfiguration</span><span class="p">(</span><span class="n">MyConfiguredPluginTemplate</span><span class="p">.</span><span class="n">class</span><span class="p">);</span>
+<p>The <em>API</em> models a complete Java SE API for configuration. It is possible to implement an application completely
+against this API. Nevertheless the API is minimalistic and many users will add additional extensions for additional
+comfort. The API is available from Maven central as</p>
+<div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
+  <span class="nt">&lt;artifactId&gt;</span>org.apache.tamaya<span class="nt">&lt;/id&gt;</span>
+  <span class="nt">&lt;artifactId&gt;</span>tamaya-api<span class="nt">&lt;/artifactId&gt;</span>
+  <span class="nt">&lt;version&gt;&lt;CURRENT_VERSION&gt;&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span>
 </pre></div>
 
 
 <h1 id="core">Core</h1>
 <p>The Core module implements the API based on Java SE and provides additional features as useful.
-The Core part hereby does <em>not have any external dependencies</em>. So it can be directly
+The Core part hereby does <em>not have any external dependencies</em>, beside the API. So it can be directly
 accessed and consumed as artifact:</p>
-<p>Put the following information in your ~/.m2/settings.xml file</p>
+<p>Put the following information in your pom.xml file</p>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>org.apache.tamaya<span class="nt">&lt;/id&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>tamaya-core<span class="nt">&lt;/artifactId&gt;</span>
@@ -204,15 +155,13 @@ accessed and consumed as artifact:</p>
 </pre></div>
 
 
-<p>The core modules out of the box supports _.properties, .xml-properties and .ini files
+<p>The core modules out of the box supports _.properties files
 as valid input formats. It is capable of reading configuration resources from</p>
 <ul>
 <li>the classpath</li>
 <li>the file system</li>
 <li>any resource addressable by an URL</li>
 </ul>
-<p>Additionally the core part provides a <em>Environment</em> implementation that maps CLI arguments,
-system and environment properties into a <em>root</em> Environment.</p>
 <p>The core part by default is not considered to define how you should organize your configuration.
 Different needs and usage scenarios still require <em>Tamaya</em> to be very flexible, consider the
 following aspects that theoretically may be completely different for different usage scenarios/
@@ -223,34 +172,80 @@ companies:</p>
 <li>Configuration Technology (files, remote resources, classpath, database, ReST, ...)</li>
 <li>Configuration Levels</li>
 <li>Configuration Overriding Policies (aka duplicate handling and conflict resolution)</li>
-<li>Configuration Isoolation (ear, war, rar, shared classloaders, paas, saas, multi tenancy,
+<li>Configuration Isolation (ear, war, rar, shared classloaders, paas, saas, multi tenancy,
   etc).</li>
 <li>Configuration Access Policies (security constraints, encryption, ...)</li>
 <li>Configuration Granularity (overall, solution, products, plugins, package, class, ...)</li>
 <li>Configuration Context (in relation to the current <em>Environment</em>)</li>
 <li>... (and more)</li>
 </ul>
-<p>All these aspects are defined in a so called configuration <strong>meta-model</strong>. So basically 
-you will additionally have to</p>
-<ul>
-<li>choose a prebuilt meta-model provided with the metamodels module part of <em>Tamaya</em></li>
-<li>implement your own meta-model (quite easy ;) ).</li>
-</ul>
-<p>Also <em>Tamaya</em> allows you to have multiple meta-models loaded in parallel, each one hereby
-is identified by a unique name. Nevertheless if no meta-model has been explicitly registered
-<em>Tamaya</em> implicitly registers and loads a <strong>simple</strong> meta-model by default, which is as follows
+<p>By default <em>Tamaya</em> implicitly registers and loads a <strong>simple</strong> meta-model by default, which is as follows
 (first sources have lower priority):</p>
 <ul>
-<li><strong>Default entries:</strong> META-INF/cfg/default/*<em>/</em></li>
-<li><strong>Explicit entries:</strong> META-INF/cfg/config/*<em>/</em></li>
+<li><strong>Default entries:</strong> META-INF/cfg/default-config.properties</li>
+<li><strong>Explicit entries:</strong> META-INF/cfg/config.properties</li>
 <li><strong>System Properties</strong></li>
 <li><strong>Environment Properties</strong>, mapped to <em>env.*</em></li>
 </ul>
-<p>By default <em>.properties</em>, <em>.xml</em> (properties) and <em>.ini</em> file formats are supported.</p>
+<p>By default <em>.properties</em> and <em>.xml</em> (properties) formats as defined by <em>java.util.Properties</em> are supported.</p>
 <h1 id="modules">Modules</h1>
+<p>Tamaya ships with several extension modules that provide additional APIs or integration functionality. The
+most important ones are shortly listed in this section.</p>
+<h2 id="configuration-injection">Configuration Injection</h2>
+<p>Now with JSR 299/330 we all are aware of inversion of control and dependency injection as a very elegant way to resolve
+our dependencies. The same is also true for configuration. Instead of adding boilerplate configuration code just let
+_Tamaya: do the work for you. To use this feature simply add the following dependency to your porject:</p>
+<div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
+  <span class="nt">&lt;groupId&gt;</span>org.apache.tamaya.ext<span class="nt">&lt;/groupId&gt;</span>
+  <span class="nt">&lt;artifactId&gt;</span>tamaya-innject<span class="nt">&lt;/artifactId&gt;</span>
+  <span class="nt">&lt;version&gt;&lt;CURRENT_VERSION&gt;&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span>
+</pre></div>
+
+
+<p>Now what can you do with it? Look at the following example:</p>
+<div class="codehilite"><pre><span class="n">public</span> <span class="n">final</span> <span class="n">class</span> <span class="n">MyConfiguredPlugin</span> <span class="p">{</span>
+
+  <span class="p">@</span><span class="n">ConfiguredProperty</span>
+  <span class="n">private</span> <span class="n">String</span> <span class="n">productName</span><span class="p">;</span>
+
+  <span class="p">@</span><span class="n">ConfiguredProperty</span><span class="p">({</span>&quot;<span class="n">product</span><span class="p">.</span><span class="n">version</span>&quot;<span class="p">,</span>&quot;<span class="n">PRODUCT</span><span class="p">.</span><span class="n">version</span>&quot;<span class="p">})</span>
+  <span class="n">private</span> <span class="n">Version</span> <span class="n">version</span><span class="p">;</span>
+
+  <span class="p">...</span>
+<span class="p">}</span>
+</pre></div>
+
+
+<p>Hereby the example only shows a subset of the possibilities, given an instance of this class
+you can then call <em>Tamaya</em> to configure your fields:</p>
+<div class="codehilite"><pre><span class="n">MyConfiguredPlugin</span> <span class="n">plugin</span> <span class="p">=</span> <span class="p">...;</span>
+<span class="n">ConfigurationInjector</span><span class="p">.</span><span class="n">configure</span><span class="p">(</span><span class="n">plugin</span><span class="p">);</span>
+</pre></div>
+
+
+<p>But this is not yet all. You can also define your type-safe configuration templates and add
+annotations on your template and let <em>Tamaya</em> implement your interface:</p>
+<div class="codehilite"><pre><span class="n">public</span> <span class="n">interface</span> <span class="n">MyConfiguredPluginTemplate</span><span class="p">{</span>
+
+  <span class="p">@</span><span class="n">ConfiguredProperty</span>
+  <span class="n">public</span> <span class="n">String</span> <span class="n">productName</span><span class="p">();</span>
+
+  <span class="p">@</span><span class="n">ConfiguredProperty</span><span class="p">({</span>&quot;<span class="n">product</span><span class="p">.</span><span class="n">version</span>&quot;<span class="p">,</span> &quot;<span class="n">PRODUCT</span><span class="p">.</span><span class="n">version</span>&quot;<span class="p">})</span>
+  <span class="n">public</span> <span class="n">Version</span> <span class="n">getVersion</span><span class="p">();</span>
+
+<span class="p">}</span>
+</pre></div>
+
+
+<p>Finally the template can be accessed  from <em>ConfigurationInjector</em> similarly:</p>
+<div class="codehilite"><pre><span class="n">MyConfiguredPluginTemplate</span> <span class="n">template</span> <span class="p">=</span> <span class="n">ConfigurationInjector</span><span class="p">.</span><span class="n">getConfiguration</span><span class="p">(</span><span class="n">MyConfiguredPluginTemplate</span><span class="p">.</span><span class="n">class</span><span class="p">);</span>
+</pre></div>
+
+
 <h2 id="integrations">Integrations</h2>
 <p>Integrations adapt <em>Tamaya</em> for being interoperable with other solutions, or on the other way round
-existing configuration solutions can transparently hooked into Tamaya.</p>
+existing configuration solutions can transparently hooked into <em>Tamaya</em>.</p>
 <h3 id="cdi-integration">CDI Integration</h3>
 <p>When using CDI configuration injection can be provided by simply adding the following library
 to your classpath:</p>
@@ -264,15 +259,13 @@ to your classpath:</p>
 
 <p>Additionally <em>Configuration</em> and also other artifacts are known by CDI and can be injected.</p>
 <h3 id="spring-integration">Spring Integration</h3>
-<p><em>Tamaya</em> also supports Spring by providing a corresponding <em>PropertyResolver</em> or <em>PropertySource</em>
-that is based on the Tamaya logic. On the other hand existing Spring <em>PropertySource</em> implementation
-can easily be adapted into full fledged Tamaya <em>Configuration</em> instances.</p>
+<p>Planned for the future.</p>
 <h3 id="apache-commons-configuration-integration">Apache Commons Configuration Integration</h3>
-<p>tbd</p>
+<p>Planned for the future.</p>
 <h2 id="meta-models">Meta-Models</h2>
 <h3 id="simple-meta-model">Simple (Meta-Model)</h3>
-<p>This meta-model module provides a simple, but already powerful configuration meta-model. To
-activate it, you just must add the following dependency:</p>
+<p>This meta-model module provides a simple, but already powerful configuration meta-model suitable for most SE
+applications. To use it, you just must simply add the following dependency:</p>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>org.apache.tamaya.metamodels<span class="nt">&lt;/id&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>tamaya-simple<span class="nt">&lt;/artifactId&gt;</span>
@@ -301,16 +294,11 @@ counterpart:</p>
 
 
 <h3 id="classloader-aware-meta-model">Classloader Aware Meta-Model</h3>
-<p>tbd</p>
-<h3 id="java-ee-default-meta-model">Java EE Default Meta-Model</h3>
-<p>tbd</p>
-<h2 id="environment-models">Environment Models</h2>
-<h3 id="default-environment-model">Default Environment-Model</h3>
-<p>tbd</p>
-<h3 id="classloader-aware-environment-model">Classloader Aware Environment-Model</h3>
-<p>tbd</p>
-<h3 id="java-ee-default-environment-model">Java EE Default Environment-Model</h3>
-<p>tbd</p>
+<p>Planned for the future.</p>
+<h3 id="java-ee-base-meta-model">Java EE Base Meta-Model</h3>
+<p>Planned for the future.</p>
+<h2 id="environment-module">Environment Module</h2>
+<p>There is an experimaental <em>Environment</em> available, but not yet as a mature module ready to use.</p>
           </div>
       </div>
 

Modified: websites/staging/tamaya/trunk/content/news.html
==============================================================================
--- websites/staging/tamaya/trunk/content/news.html (original)
+++ websites/staging/tamaya/trunk/content/news.html Mon Mar  2 21:36:02 2015
@@ -83,6 +83,8 @@
               <div class="toc">
 <ul>
 <li><a href="#overview">Overview</a><ul>
+<li><a href="#project-page-updated-232014">Project Page Updated (2.3.2014)</a></li>
+<li><a href="#api-entered-stabilization-132014">API entered stabilization (1.3.2014)</a></li>
 <li><a href="#apache-cms-9122014">Apache CMS (9.12.2014)</a></li>
 <li><a href="#first-report-december-2014">First report December 2014</a></li>
 <li><a href="#initial-code-contribution-by-anatole-tresch-november-2014">Initial Code Contribution by Anatole Tresch (November 2014)</a></li>
@@ -96,6 +98,10 @@
 </div>
 <hr />
 <h1 id="overview">Overview</h1>
+<h2 id="project-page-updated-232014">Project Page Updated (2.3.2014)</h2>
+<p>Updated project page, preparing first release.</p>
+<h2 id="api-entered-stabilization-132014">API entered stabilization (1.3.2014)</h2>
+<p>Basic API and Core implementations are ongoing stabilization for preparing first release.</p>
 <h2 id="apache-cms-9122014">Apache CMS (9.12.2014)</h2>
 <p>The setup of the project-site in Apache CMS started.</p>
 <h2 id="first-report-december-2014">First report December 2014</h2>



Mime
View raw message