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 2016/12/19 21:58:47 UTC
[29/57] [abbrv] incubator-tamaya-site git commit: Merge branch
'asf-site' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya-site
into asf-site
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/4f4912e5/css/prettify.css
----------------------------------------------------------------------
diff --cc css/prettify.css
index 805d39b,805d39b..0000000
deleted file mode 100644,100644
--- a/css/prettify.css
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
--.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/4f4912e5/development/community.html
----------------------------------------------------------------------
diff --cc development/community.html
index e5c2a66,428d986..0000000
deleted file mode 100644,100644
--- a/development/community.html
+++ /dev/null
@@@ -1,320 -1,317 +1,0 @@@
--<!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: Community</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>
- <a class="navbar-brand" href="../">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><a href="../index.html">Home</a></li>
- <li><a href="../about.html">About</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 {tamaya_version} (external)</a></li>
- <li><a href="../apidocs/index.html">Javadoc ${tamaya_version} (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: Community</h1>
-- </div>
--
-- <p><em>2016-12-19</em></p>
--
-- <p><div class="sect1">
- <h2 id="_users">Users</h2>
-<h2 id="_users">1. Users</h2>
--<div class="sectionbody">
--<div class="paragraph">
--<p>If you are a new user and you would like to participate in Tamaya
--(would be great!), you can have a look at the current
--project documentation. Apache Tamaya currently does
--not yet have a users mailing list. If you want discuss your use cases
--we encourage you to <a href="mailto:dev-subscribe@tamaya.incubator.apache.org">subscribe</a>
--to our <a href="mailto:dev@tamaya.incubator.apache.org">mailing list for developers</a>.
--Furthermore, you can check our <a href="#a_mailing_lists">mail-archives</a>.</p>
--</div>
--<div class="paragraph">
--<p>Before you file a ticket in our <a href="https://issues.apache.org/jira/browse/TAMAYA" target="_blank">Jira</a>
--please ask on the mailing list if it’s a known issue in case of a
--bug or if there is an ongoing discussion in case of a feature.</p>
--</div>
--<div class="paragraph">
--<p>You are very welcome to follow our twitter account
--<a href="https://twitter.com/TBD_tamaya" target="_blank">@TBD_tamaya</a> and spread the word
--of Tamaya with tweets, blog entries,…​</p>
--</div>
--</div>
--</div>
--<div class="sect1">
- <h2 id="_getting_involved">Getting Involved</h2>
-<h2 id="_getting_involved">2. Getting Involved</h2>
--<div class="sectionbody">
--<div class="paragraph">
--<p>Everybody is welcome to get involved with our community. You can find general
--information at <a href="https://apache.org/foundation/getinvolved.html" class="bare">https://apache.org/foundation/getinvolved.html</a> and
--<a href="https://apache.org/foundation/how-it-works.html" class="bare">https://apache.org/foundation/how-it-works.html</a>.
--The following sections provides some details about the different levels of getting involved.</p>
--</div>
--<div class="paragraph">
--<p>If you want to contribute to the
--documentation of Apache Tamaya, please
--read the instructions about the Documentation
--that addresses how to contribute, render and publish it.</p>
--</div>
--<div class="sect2">
- <h3 id="_contributors">Contributors</h3>
-<h3 id="_contributors">2.1. Contributors</h3>
--<div class="paragraph">
--<p>Before you get a committer you have to contribute to our effort.
--E.g. you can help users, participate in discussions on the dev list,
--submit patches,…​ . Therefore, it’s essential to file
--a <a href="https://www.apache.org/licenses/icla.txt" target="_blank">Individual Contributor License Agreement (ICLA)</a>
--or <a href="https://www.apache.org/licenses/cla-corporate.txt" target="_blank">Software Grant and Corporate Contributor License Agreement (CCLA)</a>
--and send it to secretary at apache dot org (or fax it) as early as possible.</p>
--</div>
--<div class="paragraph">
--<p>If you would like to submit a patch through Jira, you can have a look at the
--<a href="devguide.html">suggested Git approach</a>.</p>
--</div>
--<div class="paragraph">
--<p>The lists of current contributors and committers can be found
--on the <a href="team-list.html" target="_blank">team and contributers page</a>.</p>
--</div>
--</div>
--<div class="sect2">
- <h3 id="_committers">Committers</h3>
-<h3 id="_committers">2.2. Committers</h3>
--<div class="paragraph">
--<p>Before you read this section, please ensure that you have read
--the contributor section. All of you are welcome to join our development effort.
--<a href="mailto:dev-subscribe@tamaya.incubator.apache.org">Subscribe</a> to our
--<a href="mailto:dev@tamaya.incubator.apache.org">mailing list for developers</a> and
--start contributing and help users.</p>
--</div>
--<div class="paragraph">
--<p>Optionally <a href="mailto:commits-subscribe@tamaya.incubator.apache.org">subscribe</a> to our
--<a href="mailto:commits@tamaya.incubator.apache.org">mailing list for commits</a>.
--Furthermore, you can check our <a href="community.html#mailing-lists">mail-archives</a>.</p>
--</div>
--<div class="paragraph">
--<p>Further details are available at <a href="https://www.apache.org/dev/" target="_blank">https://www.apache.org/dev/</a>.</p>
--</div>
--</div>
--<div class="sect2">
- <h3 id="_mailing_lists">Mailing lists</h3>
-<h3 id="_mailing_lists">2.3. Mailing lists</h3>
--<div class="paragraph">
--<p>The table below lists all mailings used by the Tamaya project.</p>
--</div>
--<table class="tableblock frame-all grid-all" style="width: 70%;">
--<colgroup>
--<col style="width: 20%;">
--<col style="width: 20%;">
--<col style="width: 20%;">
--<col style="width: 20%;">
--<col style="width: 20%;">
--</colgroup>
--<thead>
--<tr>
--<th class="tableblock halign-left valign-top">List</th>
--<th class="tableblock halign-left valign-top">Subscribe</th>
--<th class="tableblock halign-left valign-top">Unsubscribe</th>
--<th class="tableblock halign-left valign-top">Archive</th>
--<th class="tableblock halign-left valign-top">Mirrors</th>
--</tr>
--</thead>
--<tbody>
--<tr>
--<td class="tableblock halign-left valign-top"><p class="tableblock">Developer List</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-subscribe@tamaya.incubator.apache.org">Subscribe</a></p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-unsubscribe@tamaya.incubator.apache.org">Unsubscribe</a></p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://mail-archives.apache.org/mod_mbox/incubator-tamaya-dev/" target="_blank">Archive</a></p></td>
--<td class="tableblock halign-left valign-top"></td>
--</tr>
--<tr>
--<td class="tableblock halign-left valign-top"><p class="tableblock">Committer List</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:commits-subscribe@tamaya.incubator.apache.org">Subscribe</a></p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:commits-unsubscribe@tamaya.incubator.apache.org">Unsubscribe</a></p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="http://mail-archives.apache.org/mod_mbox/incubator-tamaya-commits/" target="_blank">Archive</a></p></td>
--<td class="tableblock halign-left valign-top"></td>
--</tr>
--</tbody>
--</table>
--</div>
--<div class="sect2">
- <h3 id="_jira">JIRA</h3>
-<h3 id="_jira">2.4. JIRA</h3>
--<div class="paragraph">
--<p>Any kind of issue has to be filed in our
--<a href="https://issues.apache.org/jira/browse/TAMAYA" target="_blank">issue tracker</a>.
--If you have any question, you can ask us
--(e.g. via the mailing list for developers).</p>
--</div>
--</div>
--<div class="sect2">
- <h3 id="_spread_the_word">Spread the word</h3>
-<h3 id="_spread_the_word">2.5. Spread the word</h3>
--<div class="paragraph">
--<p>You are very welcome e.g. to write blog entries, mention our twitter handle
-- @TBD_tamaya if you tweet about the project or just follow our twitter
--account <a href="https://twitter.com/TBD_tamaya" target="_blank">@TBD_tamaya</a></p>
--</div>
--</div>
--<div class="sect2">
- <h3 id="_irc">IRC</h3>
-<h3 id="_irc">2.6. IRC</h3>
--<div class="paragraph">
--<p>Usually discussions happen on the mailing list. Some informal discussions take
--place in our IRC-Channel <a href="irc://irc.freenode.net/apache-tamaya" class="bare">irc://irc.freenode.net/apache-tamaya</a>.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>// with the irssi command-line client:
--$ irssi
--
--> /connect irc.freenode.net
--> /join #apache-tamaya</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">© 2014-2016 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.0</span></a>
-- at <span>2016-12-19</span>
-- </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/4f4912e5/development/source.html
----------------------------------------------------------------------
diff --cc development/source.html
index 6153ac0,692ee7b..0000000
deleted file mode 100644,100644
--- a/development/source.html
+++ /dev/null
@@@ -1,203 -1,200 +1,0 @@@
--<!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: Sources</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>
- <a class="navbar-brand" href="../">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><a href="../index.html">Home</a></li>
- <li><a href="../about.html">About</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 {tamaya_version} (external)</a></li>
- <li><a href="../apidocs/index.html">Javadoc ${tamaya_version} (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: Sources</h1>
-- </div>
--
- <p><em>2016-12-18</em></p>
- <p><em>2016-12-19</em></p>
--
-- <p><div class="sect1">
--<h2 id="_source_code_repositories">1. Source Code Repositories</h2>
--<div class="sectionbody">
--<div class="paragraph">
--<p>The current source code can be found at:</p>
--</div>
--<div class="ulist">
--<ul>
--<li>
--<p><a href="http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git" class="bare">http://git-wip-us.apache.org/repos/asf/incubator-tamaya.git</a> (read-only)</p>
--</li>
--<li>
--<p><a href="https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git" class="bare">https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git</a></p>
--</li>
--</ul>
--</div>
--<div class="paragraph">
--<p>Alternatively there is also a GitHub read-only mirror at
--<a href="https://github.com/apache/incubator-tamaya" target="_blank">https://github.com/apache/incubator-tamaya</a>.</p>
--</div>
--<div class="paragraph">
--<p>The GitHub mirror also provides the project as downloadable zip archive.</p>
--</div>
--</div>
--</div>
--<div class="sect1">
--<h2 id="_contributions">2. Contributions</h2>
--<div class="sectionbody">
--<div class="paragraph">
--<p>If you like to contribute to Apache Tamaya please also refer also to our
--<a href="devguide.html#contributing-workflow">section on contributing to Apache Tamaya</a>.</p>
--</div>
--</div>
--</div></p>
--
-- <hr />
-- </div>
-- </div>
-- <div>
-- <div id="push"></div>
--
-- <div id="footer">
-- <div class="container">
-- <p class="muted credit">© 2014-2016 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.0</span></a>
-- at <span>2016-12-19</span>
-- </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/4f4912e5/development/team.html
----------------------------------------------------------------------
diff --cc development/team.html
index 9966aa0,f9c5701..0000000
deleted file mode 100644,100644
--- a/development/team.html
+++ /dev/null
@@@ -1,318 -1,287 +1,0 @@@
--<!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: Project Team</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>
- <a class="navbar-brand" href="../">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><a href="../index.html">Home</a></li>
- <li><a href="../about.html">About</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 {tamaya_version} (external)</a></li>
- <li><a href="../apidocs/index.html">Javadoc ${tamaya_version} (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: Project Team</h1>
-- </div>
--
-- <p><em>2016-12-19</em></p>
--
-- <p><div id="preamble">
--<div class="sectionbody">
--<div class="paragraph">
--<p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p>
--</div>
--<div class="paragraph">
--<p>The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.</p>
--</div>
--</div>
--</div>
--<div class="sect1">
--<h2 id="_members">Members</h2>
--<div class="sectionbody">
--<div class="paragraph">
--<p>The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.</p>
--</div>
- <table class="tableblock frame-topbot grid-all" style="width: 60%;">
-<table class="tableblock frame-topbot grid-all" style="width: 40%;">
--<caption class="title">Table 1. Members</caption>
--<colgroup>
--<col style="width: 20%;">
--<col style="width: 20%;">
--<col style="width: 20%;">
--<col style="width: 20%;">
--<col style="width: 20%;">
--</colgroup>
--<thead>
--<tr>
--<th class="tableblock halign-left valign-top">Id</th>
--<th class="tableblock halign-left valign-top">Name</th>
--<th class="tableblock halign-left valign-top">E-Mail</th>
--<th class="tableblock halign-left valign-top">Role(s)</th>
--<th class="tableblock halign-left valign-top">Time Zone</th>
--</tr>
--</thead>
--<tbody>
--<tr>
--<td class="tableblock halign-left valign-top"><p class="tableblock">anatole</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">Anatole Tresch</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">anatole[at]apache.org</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
--</tr>
--<tr>
--<td class="tableblock halign-left valign-top"><p class="tableblock">johndament</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">John D. Ament</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">johndament[at]apache.org</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">-5</p></td>
--</tr>
--<tr>
--<td class="tableblock halign-left valign-top"><p class="tableblock">plexus</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">Oliver B. Fischer</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">plexus[at]apache.org</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
--</tr>
--<tr>
--<td class="tableblock halign-left valign-top"><p class="tableblock">pottlinger</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">Phil Ottlinger</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">pottlinger[at]apache.org</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">Committer</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
--</tr>
--</tbody>
--</table>
--</div>
--</div>
--<div class="sect1">
--<h2 id="_contributors">Contributors</h2>
--<div class="sectionbody">
--<div class="paragraph">
- <p>The following people are active contributors:</p>
-<p>The following people are active contributors: none at the moment.</p>
--</div>
- <table class="tableblock frame-topbot grid-all" style="width: 60%;">
- <caption class="title">Table 2. Contributors</caption>
- <colgroup>
- <col style="width: 20%;">
- <col style="width: 20%;">
- <col style="width: 20%;">
- <col style="width: 20%;">
- <col style="width: 20%;">
- </colgroup>
- <thead>
- <tr>
- <th class="tableblock halign-left valign-top">Id</th>
- <th class="tableblock halign-left valign-top">Name</th>
- <th class="tableblock halign-left valign-top">E-Mail</th>
- <th class="tableblock halign-left valign-top">Role(s)</th>
- <th class="tableblock halign-left valign-top">Time Zone</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock">wkeil</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Werner Keil</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">wkeil[at]apache.org</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
- </tr>
- </tbody>
- </table>
--</div>
--</div>
--<div class="sect1">
--<h2 id="_emeritus">Emeritus</h2>
--<div class="sectionbody">
--<div class="paragraph">
--<p>These people used to help with the development of the project but are not active anymore:</p>
--</div>
- <table class="tableblock frame-topbot grid-all" style="width: 60%;">
- <caption class="title">Table 3. Members</caption>
-<table class="tableblock frame-topbot grid-all" style="width: 40%;">
-<caption class="title">Table 2. Members</caption>
--<colgroup>
--<col style="width: 20%;">
--<col style="width: 20%;">
--<col style="width: 20%;">
--<col style="width: 20%;">
--<col style="width: 20%;">
--</colgroup>
--<thead>
--<tr>
--<th class="tableblock halign-left valign-top">Id</th>
--<th class="tableblock halign-left valign-top">Name</th>
--<th class="tableblock halign-left valign-top">E-Mail</th>
--<th class="tableblock halign-left valign-top">Role(s)</th>
--<th class="tableblock halign-left valign-top">Time Zone</th>
--</tr>
--</thead>
--<tbody>
--<tr>
--<td class="tableblock halign-left valign-top"><p class="tableblock">struberg</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">Mark Struberg</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">struberg[at]apache.org</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
--</tr>
--<tr>
--<td class="tableblock halign-left valign-top"><p class="tableblock">gpetracek</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">Gerhard Petracek</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">gpetracek[at]apache.org</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">PMC</p></td>
--<td class="tableblock halign-left valign-top"><p class="tableblock">+1</p></td>
--</tr>
--</tbody>
--</table>
--<div class="paragraph">
--<p>Thanks for all your help!</p>
--</div>
--</div>
--</div></p>
--
-- <hr />
-- </div>
-- </div>
-- <div>
-- <div id="push"></div>
--
-- <div id="footer">
-- <div class="container">
-- <p class="muted credit">© 2014-2016 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.0</span></a>
-- at <span>2016-12-19</span>
-- </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/4f4912e5/devguide.html
----------------------------------------------------------------------
diff --cc devguide.html
index fafb9b5,258c0f8..0000000
deleted file mode 100644,100644
--- a/devguide.html
+++ /dev/null
@@@ -1,412 -1,409 +1,0 @@@
--<!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: Development Guide</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>
- <a class="navbar-brand" href="">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><a href="index.html">Home</a></li>
- <li><a href="about.html">About</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 {tamaya_version} (external)</a></li>
- <li><a href="apidocs/index.html">Javadoc ${tamaya_version} (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: Development Guide</h1>
-- </div>
--
- <p><em>2016-11-28</em></p>
- <p><em>2016-12-19</em></p>
--
-- <p><div class="sect1">
--<h2 id="_suggested_git_workflows">1. Suggested Git Workflows</h2>
--<div class="sectionbody">
--<div class="sect2">
--<h3 id="_avoid_git_pull">1.1. Avoid git pull!</h3>
--<div class="paragraph">
--<p><code>git pull</code> should never get invoked if you have dirty files lying around
--or if your branch is ahead of master. This will always lead to
--some dirty artifacts in the commit history:</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>Merge branch 'master' of http://git-wip-us.apache.org/tamaya into master</pre>
--</div>
--</div>
--</div>
--<div class="sect2">
--<h3 id="_use_git_pull_rebase">1.2. Use git pull --rebase</h3>
--<div class="paragraph">
--<p>An easy version for getting rid of the auto-merges is using</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git pull --rebase</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>Please note that this sometimes trashes your working tree if there
--are unmergeable files around. Cleaning this up with a forced manual
--rebase is not something we would recommend for a git beginner.</p>
--</div>
--</div>
--<div class="sect2">
--<h3 id="_working_in_an_own_branch">1.3. Working in an own branch</h3>
--<div class="paragraph">
--<p>This is actually the suggested way to prevent auto-merges. Create an own
--branch where you do your feature work. Either do all your work in one
--branch or create one branch per feature you are working on.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git branch mybranch</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>After you finished your feature, first add (<code>git add</code>) and commit (<code>git commit</code>) your work.
--Check with <code>git status</code> that you don’t have any dirty files and uncommitted
--changes around. You can use <code>git stash</code> to 'backup' unfinished work.</p>
--</div>
--<div class="paragraph">
--<p>Then switch back to the master branch and pull changes
--done by other committers in the meantime.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git checkout master
--$ git pull --rebase</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>You should now get all the changes done by other committers and
--the will get applied to your local master branch. Now go back to
--your private branch and rebase your locally performed work to the HEAD of master.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git checkout mybranch
--$ git rebase master</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>If you got conflicts, you will get lines with ">>>>" added to those
--files. Resolve those conflicts manually, add them and finish the rebase.</p>
--</div>
--<div class="paragraph">
--<p>Check with <code>git-status</code> and <code>gitk</code> if the merge went well and the history now contains your changes.
--If all is well, go back to the master branch and merge your changes in.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git pull --rebase // (just for safety, you should see no changes)
--$ git checkout master
--$ git merge mybranch</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>Finally you can push your changes to the ASF git repo</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git push</pre>
--</div>
--</div>
--</div>
--</div>
--</div>
--<div class="sect1">
--<h2 id="contributing-workflow">2. Contribution workflow</h2>
--<div class="sectionbody">
--<div class="sect2">
--<h3 id="_creating_patches">2.1. Creating patches</h3>
--<div class="paragraph">
--<p>You should use the following workflow, if you plan to contribute
--patches or new features to Tamaya.</p>
--</div>
--<div class="paragraph">
--<p>First update you local copy of the repository:</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git checkout master
--$ git pull --rebase</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>Then create a new local branch for your work. It’s good practice to name
--it after the corresponding JIRA issue.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git checkout -b TAMAYA-XXX</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>Now you can start to work on your patch. When you are finished, commit your changes. But don’t forget to <strong>add the name
--of the JIRA issue to the commit message</strong>.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git add -am "TAMAYA-XXX: Fixed some issue"</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>For small patches we recommend to do a single commit containing your changes. For larger contributions you should try
--to group your work into separate sub-tasks that you can commit one by one.</p>
--</div>
--<div class="paragraph">
--<p>Before you create your patch you should make sure that your local repository is up to date with the master repository.
--This is very important especially if you work on your branch for a long time. Use the following commands to pull the
--latest changes from the upstream repository and rebase your branch against the current master.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git checkout master
--$ git pull --rebase
--$ git checkout TAMAYA-XXX
--$ git rebase master</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>Now you are ready to create your patch:</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git checkout TAMAYA-XXX
--$ git format-patch --stdout master > ../TAMAYA-XXX.patch</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>Please attach the resulting patch file to the correspoding JIRA issue.</p>
--</div>
--</div>
--<div class="sect2">
--<h3 id="_applying_patches">2.2. Applying patches</h3>
--<div class="paragraph">
--<p>If you are a committer and want to apply a patch you should do so in a separate branch.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git checkout -b TAMAYA-XXX</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>Then apply the patch using <code>git am</code> and rebase it against the master branch.</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git am < ../TAMAYA-XXX.patch
--$ git rebase master</pre>
--</div>
--</div>
--<div class="paragraph">
--<p>After reviewing the changes and testing the code, the changes are ready to
--be merged into the master branch:</p>
--</div>
--<div class="listingblock">
--<div class="content">
--<pre>$ git checkout master
--$ git merge TAMAYA-XXX
--$ git branch -d TAMAYA-XXX</pre>
--</div>
--</div>
--</div>
--<div class="sect2">
--<h3 id="_discussion_workflow_optional">2.3. Discussion workflow (optional)</h3>
--<div class="paragraph">
--<p>All discussions which lead to a decision take place on the mailing list.
--Sometimes it’s required to show-case an idea esp. if the solution is
--more than few lines. As shown above it makes sense to use local branches
--for developing new parts. Git allows to push such local branches to a
--public repository. So it’s easier to share it with the community
--for discussing it. The following listings show an example in combination
--with GitHub - for sure it works with any hosting platform like BitBucket,
--Google-Code,…​ The only important part here is that such branches
--<strong>NEVER</strong> get pushed to the main Apache repository to keep the commit history
--as clean as possible.</p>
--</div>
--</div>
--<div class="sect2">
--<h3 id="_initial_setup">2.4. Initial setup</h3>
--<div class="listingblock">
--<div class="content">
--<pre>$ git clone https://git-wip-us.apache.org/repos/asf/incubator-tamaya.git
--$ git remote add discuss https://[username]@github.com/[username]/[repo-name].git
--$ git push -u discuss master</pre>
--</div>
--</div>
--</div>
--<div class="sect2">
--<h3 id="_branches_for_discussions">2.5. Branches for discussions</h3>
--<div class="listingblock">
--<div class="content">
--<pre>$ git checkout -b TAMAYA-XXX # 1-n commits
--$ git push discuss TAMAYA-XXX # share the link to the branch for the discussions</pre>
--</div>
--</div>
--<div class="paragraph">
--<p><strong>If the community agrees on the suggested change, the implementation will be applied to the origin master. A committer
--has to follow the steps described above for the basic workflow to keep the commit history simple, clean and straight.
--A contributor has to follow the steps described above for creating a patch.</strong></p>
--</div>
--</div>
--<div class="sect2">
--<h3 id="_delete_the_branch_again">2.6. Delete the branch again</h3>
--<div class="listingblock">
--<div class="content">
--<pre>$ git push discuss :TAMAYA-XXX
--$ git branch -d TAMAYA-XXX</pre>
--</div>
--</div>
--</div>
--</div>
--</div></p>
--
-- <hr />
-- </div>
-- </div>
-- <div>
-- <div id="push"></div>
--
-- <div id="footer">
-- <div class="container">
-- <p class="muted credit">© 2014-2016 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.0</span></a>
-- at <span>2016-12-19</span>
-- </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>