[1/2] incubator-tamaya git commit: Fixed generation of docs from site module.

2016-03-19 Thread anatole 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 29f94d911 -> 9e6f040df


Fixed generation of docs from site module.


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

Branch: refs/heads/master
Commit: 4215a1b97bf46e62d7c7943e8777372a057d5435
Parents: 29f94d9
Author: anatole 
Authored: Fri Mar 18 00:44:42 2016 +0100
Committer: anatole 
Committed: Fri Mar 18 00:44:42 2016 +0100

--
 distribution/src/main/assembly/index.html |  13 +-
 src/site/asciidoc/HighLevelDesign.adoc|   3 +-
 src/site/asciidoc/Requirements.adoc   | 250 
 src/site/asciidoc/usecases.adoc   | 273 -
 src/site/asciidoc/usecasesAndReqs.adoc| 505 +
 src/site/asciidoc/userguide.adoc  |  36 --
 src/site/markdown/index.md|   3 +-
 src/site/site.xml |   5 +-
 8 files changed, 513 insertions(+), 575 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4215a1b9/distribution/src/main/assembly/index.html
--
diff --git a/distribution/src/main/assembly/index.html 
b/distribution/src/main/assembly/index.html
index 06da477..c296e72 100644
--- a/distribution/src/main/assembly/index.html
+++ b/distribution/src/main/assembly/index.html
@@ -634,15 +634,11 @@ under the License.
 
 
 
-Use Cases: The 
use cases Tamaya should deal with.
-
-
-Requirements: 
The requirements we derived.
+Use Cases and 
Requirements: The use cases Tamaya should deal with and the 
corresponding requirements identified.
 
 
 Project History: 
The project history.
 
-
 
 
 
@@ -656,13 +652,6 @@ under the License.
 
 Release Guide: 
How to perform a Tamaya release.
 
-
-Requirements: 
The requirements we derived.
-
-
-Project History: 
The project history.
-
-
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4215a1b9/src/site/asciidoc/HighLevelDesign.adoc
--
diff --git a/src/site/asciidoc/HighLevelDesign.adoc 
b/src/site/asciidoc/HighLevelDesign.adoc
index 1e85677..013c567 100644
--- a/src/site/asciidoc/HighLevelDesign.adoc
+++ b/src/site/asciidoc/HighLevelDesign.adoc
@@ -14,13 +14,12 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-'''
 
 include::temp-properties-files-for-site/attributes.adoc[]
 
 
-[[Core Concepts]]
 == The Tamaya High Level Design
+
 Though Tamaya is a very powerful and flexible solution there are basically 
only a few simple core concepts required
 that build the base of all the other mechanisms:
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4215a1b9/src/site/asciidoc/Requirements.adoc
--
diff --git a/src/site/asciidoc/Requirements.adoc 
b/src/site/asciidoc/Requirements.adoc
deleted file mode 100644
index 1c6ead1..000
--- a/src/site/asciidoc/Requirements.adoc
+++ /dev/null
@@ -1,250 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-include::temp-properties-files-for-site/attributes.adoc[]
-
-[[Requirements]]
-== Requirements
-=== Core Configuration Requirements
- General
-
-Tamaya

[1/2] incubator-tamaya git commit: Added index file, enhanced overall integration with site part.

2016-03-19 Thread anatole 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master fbda5b8e3 -> 29f94d911


Added index file, enhanced overall integration with site part.


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

Branch: refs/heads/master
Commit: edef0db6fa66872c8585e9e9bab3ffca3619801b
Parents: fbda5b8
Author: anatole 
Authored: Thu Mar 17 08:34:28 2016 +0100
Committer: anatole 
Committed: Thu Mar 17 08:34:28 2016 +0100

--
 distribution/pom.xml|   2 +-
 .../src/main/assembly/distribution-bin.xml  |   7 +
 distribution/src/main/assembly/index.html   | 672 +++
 distribution/src/main/resources/attributes.adoc |  10 +
 4 files changed, 690 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/edef0db6/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index e21a337..efdad76 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -42,7 +42,7 @@ under the License.
 zip
 
 
- 
+ 
 
 org.apache.tamaya
 tamaya-api

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/edef0db6/distribution/src/main/assembly/distribution-bin.xml
--
diff --git a/distribution/src/main/assembly/distribution-bin.xml 
b/distribution/src/main/assembly/distribution-bin.xml
index 4ddad18..e022f84 100644
--- a/distribution/src/main/assembly/distribution-bin.xml
+++ b/distribution/src/main/assembly/distribution-bin.xml
@@ -435,6 +435,13 @@ under the License.
 
${project.build.directory}/generated-documentation/apache-tamaya-docs-${project.version}
 
 
+/docs
+${project.basedir}/src/main/assembly
+
+index.html
+
+
+
 ${project.parent.basedir}
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/edef0db6/distribution/src/main/assembly/index.html
--
diff --git a/distribution/src/main/assembly/index.html 
b/distribution/src/main/assembly/index.html
new file mode 100644
index 000..06da477
--- /dev/null
+++ b/distribution/src/main/assembly/index.html
@@ -0,0 +1,672 @@
+
+
+
+
+
+
+
+
+Tamaya Documentation
+https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400;>
+
+/* Asciidoctor default stylesheet | MIT License | 
http://asciidoctor.org */
+/* Remove the comments around the @import statement below when using 
this as a custom stylesheet */
+/*@import
+
"https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400";*/
+
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}
+audio,canvas,video{display:inline-block}
+audio:not([controls]){display:none;height:0}
+[hidden],template{display:none}
+script{display:none!important}
+
html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
+body{margin:0}
+a{background:transparent}
+a:focus{outline:thin dotted}
+a:active,a:hover{outline:0}
+h1{font-size:2em;margin:.67em 0}
+abbr[title]{border-bottom:1px dotted}
+b,strong{font-weight:bold}
+dfn{font-style:italic}
+hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
+mark{background:#ff0;color:#000}
+code,kbd,pre,samp{font-family:monospace;font-size:1em}
+pre{white-space:pre-wrap}
+q{quotes:"\201C" "\201D" "\2018" "\2019"}
+small{font-size:80%}
+
sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
+sup{top:-.5em}
+sub{bottom:-.25em}
+img{border:0}
+svg:not(:root){overflow:hidden}
+figure{margin:0}
+fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em 
.75em}
+

[02/11] incubator-tamaya git commit: [maven-release-plugin] prepare for next development iteration

2016-03-19 Thread anatole 
[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/master
Commit: b4c7ed2ce715439f4d784f04a4626f2fe83e7a55
Parents: 2be0c91
Author: anatole 
Authored: Wed Mar 16 16:20:17 2016 +0100
Committer: anatole 
Committed: Wed Mar 16 16:20:17 2016 +0100

--
 buildconfigurations/pom.xml  | 4 ++--
 code/api/pom.xml | 2 +-
 code/core/pom.xml| 2 +-
 code/pom.xml | 2 +-
 distribution/pom.xml | 4 ++--
 docs/pom.xml | 4 ++--
 examples/1-minimal-example/pom.xml   | 2 +-
 examples/2-simple-propertysource-example/pom.xml | 2 +-
 examples/3-resources-example/pom.xml | 2 +-
 examples/4-resolver-example/pom.xml  | 2 +-
 examples/5-injection-example/pom.xml | 2 +-
 examples/6-fileobserver-example/pom.xml  | 2 +-
 examples/7-builder-example/pom.xml   | 2 +-
 examples/8-remote-example/client/pom.xml | 2 +-
 examples/8-remote-example/pom.xml| 2 +-
 examples/8-remote-example/server/pom.xml | 2 +-
 examples/pom.xml | 2 +-
 modules/builder/pom.xml  | 2 +-
 modules/classloader-support/pom.xml  | 2 +-
 modules/collections/pom.xml  | 2 +-
 modules/events/pom.xml   | 2 +-
 modules/filter/pom.xml   | 2 +-
 modules/formats/pom.xml  | 2 +-
 modules/functions/pom.xml| 2 +-
 modules/injection-api/pom.xml| 2 +-
 modules/injection/pom.xml| 2 +-
 modules/integration/camel/pom.xml| 2 +-
 modules/integration/cdi-se/pom.xml   | 2 +-
 modules/integration/cdi/pom.xml  | 2 +-
 modules/integration/consul/pom.xml   | 2 +-
 modules/integration/etcd/pom.xml | 2 +-
 modules/integration/osgi/pom.xml | 2 +-
 modules/integration/pom.xml  | 2 +-
 modules/integration/spring/pom.xml   | 2 +-
 modules/json/pom.xml | 2 +-
 modules/management/pom.xml   | 2 +-
 modules/model/pom.xml| 2 +-
 modules/mutable-config/pom.xml   | 2 +-
 modules/optional/pom.xml | 2 +-
 modules/pom.xml  | 2 +-
 modules/resolver/pom.xml | 2 +-
 modules/resources/pom.xml| 2 +-
 modules/server/pom.xml   | 2 +-
 modules/spi-support/pom.xml  | 2 +-
 modules/yaml/pom.xml | 2 +-
 pom.xml  | 4 ++--
 46 files changed, 50 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b4c7ed2c/buildconfigurations/pom.xml
--
diff --git a/buildconfigurations/pom.xml b/buildconfigurations/pom.xml
index 7ea3663..df02971 100644
--- a/buildconfigurations/pom.xml
+++ b/buildconfigurations/pom.xml
@@ -23,7 +23,7 @@ under the License.
 
 org.apache.tamaya
 tamaya-all
-0.2-incubating
+0.3-incubating-SNAPSHOT
 
 
 buildconfigurations
@@ -45,7 +45,7 @@ under the License.
 
 https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
 
-  tamaya-all-0.2-incubating
+  HEAD
   
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b4c7ed2c/code/api/pom.xml
--
diff --git a/code/api/pom.xml b/code/api/pom.xml
index 0b441a3..23d75cd 100644
--- a/code/api/pom.xml
+++ b/code/api/pom.xml
@@ -22,7 +22,7 @@ under the License.
 
 org.apache.tamaya
 tamaya-code
-0.2-incubating
+0.3-incubating-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b4c7ed2c/code/core/pom.xml
--
diff --git a/code/core/pom.xml b/code/core/pom.xml
index 220f2b1..673b22f 100644
--- a/code/core/pom.xml
+++ b/code/core/pom.xml
@@ -22,7 +22,7 @@ under the License.

[2/2] incubator-tamaya git commit: Fixed not working asciidoc include.

2016-03-19 Thread anatole 
Fixed not working asciidoc include.


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

Branch: refs/heads/master
Commit: 29f94d911282ec087f84294eb4d4bd7b773bd760
Parents: edef0db
Author: anatole 
Authored: Thu Mar 17 08:35:11 2016 +0100
Committer: anatole 
Committed: Thu Mar 17 08:35:11 2016 +0100

--
 docs/pom.xml| 40 
 docs/src/main/resources/attributes.adoc | 10 +++
 pom.xml |  1 +
 3 files changed, 51 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/29f94d91/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index 97d6991..c2fe19c 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -63,6 +63,46 @@ under the License.
 
 
 
+org.apache.maven.plugins
+maven-clean-plugin
+
+
+
+
+
${project.basedir}/temp-properties-files-for-site
+
+
+
+
+
+maven-resources-plugin
+
+
+bal
+generate-resources
+
+copy-resources
+
+false
+
+
${project.basedir}/../src/site/asciidoc/temp-properties-files-for-site
+
+
+
${project.basedir}/src/main/resources
+true
+
+
+
+
+
+
+
 de.saumya.mojo
 gem-maven-plugin
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/29f94d91/docs/src/main/resources/attributes.adoc
--
diff --git a/docs/src/main/resources/attributes.adoc 
b/docs/src/main/resources/attributes.adoc
new file mode 100644
index 000..d8c3b1c
--- /dev/null
+++ b/docs/src/main/resources/attributes.adoc
@@ -0,0 +1,10 @@
+//
+// This file is used to export Maven properties to a file
+// which will be included by various Asciidoctor documents
+// to share global properties/attributes.
+//
+// see https://github.com/asciidoctor/asciidoctor-maven-plugin/issues/170
+//
+:tamaya_version_current: ${project.version}
+:tamaya_mvn_group_id: ${project.groupId}
+

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/29f94d91/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 625b0d3..23e2ea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -808,6 +808,7 @@ under the License.
 true
 true
 true
+true

[10/11] incubator-tamaya git commit: Moved all docs to site part. Removed some of the file hierarchies for getting things work.

2016-03-19 Thread anatole 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fbda5b8e/src/site/asciidoc/examples.adoc
--
diff --git a/src/site/asciidoc/examples.adoc b/src/site/asciidoc/examples.adoc
new file mode 100644
index 000..9f4892a
--- /dev/null
+++ b/src/site/asciidoc/examples.adoc
@@ -0,0 +1,69 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+include::temp-properties-files-for-site/attributes.adoc[]
+
+= Apache Tamaya -- Examples
+
+toc::[]
+
+== Tamaya Examples
+
+=== Minimal
+
+This example shows the basic functionality that is available when Tamaya is 
used without any further extensions.
+It shows how configuration can be added to the classpath and how it can be 
accessed.
+
+=== Simple PropertySource
+
+This example shows how to write and register an additional +PropertySource+ 
and +PropertySourceProvider+, which is
+the SPI to add your own configuration data and locations. For a more advanced 
example you may also have a look at
+the provided default metamodels, e.g. the simple metamodel (currently in the 
experimental part and not shipped with
+the current release).
+
+=== Resources
+
+This example shows how resources can be located using ANT-styled paths and 
this feature can help you to implement
++PropertySourceProvider+ instances that provide configuration for a set of 
files/folders at a certain (searchable)
+location, as provided by the resource extension_.
+
+=== Resolver
+
+The resolver example defines a configuration file that illustrates the usage 
of placeholders that are resolved on
+configuration access, as provided by the _resolver extension_.
+
+=== Injection
+
+The injection sample shows how to inject configuration into a created object 
instance, or how to instantiate a proxied
+configuration template, which provides a type-safe configuration access 
mechanism. This functionality is provided
+by the _injection extension_. Hereby neither JSR 330 nor 299 are used, so it 
is pure and minimal SE based
+implementation.
+
+=== FileObserver
+
+This example shows how the +event extension+ can be used to automatically 
adapt the current configuration when
+the underlying configuration data is changing, e.g. when new configuration is 
added to a file folder, or removed or
+adapted.
+
+=== Builder
+
+This example shows how to build a +Configuration+ using a simple pure SE 
builder API as provided by the
+_builder extension_.
+
+=== Remote
+
+THe remote example shows a simple setup where parts of the +Configuration+ are 
read remotedly.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fbda5b8e/src/site/asciidoc/extensions.adoc
--
diff --git a/src/site/asciidoc/extensions.adoc 
b/src/site/asciidoc/extensions.adoc
new file mode 100644
index 000..ec72f29
--- /dev/null
+++ b/src/site/asciidoc/extensions.adoc
@@ -0,0 +1,105 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+include::temp-properties-files-for-site/attributes.adoc[]
+
+== Apache Tamaya -- Extension Modules
+
+toc::[]
+
+=== Mature Extensions
+
+Mature extensions have a stable API and SPI, similar to the API and 
Implementations provided.
+
+[width="100%",frame="1",options="header",grid="all"]
+|===
+|_Artifact_ |_Description_ 
   |_Links_
+|   | N/A: currently no

[08/11] incubator-tamaya git commit: Moved all docs to site part. Removed some of the file hierarchies for getting things work.

2016-03-19 Thread anatole 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fbda5b8e/src/site/asciidoc/userguide/uc/value-placeholders.adoc
--
diff --git a/src/site/asciidoc/userguide/uc/value-placeholders.adoc 
b/src/site/asciidoc/userguide/uc/value-placeholders.adoc
deleted file mode 100644
index 57857a8..000
--- a/src/site/asciidoc/userguide/uc/value-placeholders.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-=== Value Placeholders
-
-Users just want to to be able to add placeholders to the values of 
configuration (not the keys). The mechanisms for
-resolving the placeholders hereby should be not constraint to one single 
lanmguage like EL. Instead of different
-replacement strategies should be selectable, e.g. by prefixing an expression 
with the name of the resolver that
-should do the work (eg +"blabla ${env:HOME} using Java version 
${sys:java.version}."+.
-This allows resolution mechanism to be isolated easily and also allows to use 
simpler mechanisms, if no more complex
-ones like EL are required. This is especially useful to deal with low resource 
environment like ME.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fbda5b8e/src/site/asciidoc/userguide/usecases.adoc
--
diff --git a/src/site/asciidoc/userguide/usecases.adoc 
b/src/site/asciidoc/userguide/usecases.adoc
deleted file mode 100644
index fa6b8df..000
--- a/src/site/asciidoc/userguide/usecases.adoc
+++ /dev/null
@@ -1,58 +0,0 @@
-= Apache Tamaya -- Use Cases
-:name: Tamaya
-:rootpackage: org.apache.tamaya
-:title: Apache Tamaya
-:revnumber: 0.1-SNAPSHOT
-:revremark: Incubator
-:revdate: November 2014
-:longversion: {revnumber} ({revremark}) {revdate}
-:authorinitials: OBF
-:author: Oliver B. Fischer
-:email: 
-:source-highlighter: coderay
-:website: http://tamaya.incubator.apache.org/
-:toc:
-:toc-placement: manual
-:encoding: UTF-8
-:numbered:
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-toc::[]
-
-
-== Use Cases
-
-include::src/site/asciidoc/userguide/uc/simple-access.adoc[]
-include::src/site/asciidoc/userguide/uc/simple-property-access.adoc[]
-include::src/site/asciidoc/userguide/uc/value-placeholders.adoc[]
-include::src/site/asciidoc/userguide/uc/type-safe-properties.adoc[]
-include::src/site/asciidoc/userguide/uc/templates.adoc[]
-include::src/site/asciidoc/userguide/uc/java8.adoc[]
-include::src/site/asciidoc/userguide/uc/locations.adoc[]
-include::src/site/asciidoc/userguide/uc/formats.adoc[]
-include::src/site/asciidoc/userguide/uc/multiple-configurations.adoc[]
-include::src/site/asciidoc/userguide/uc/external-configuration.adoc[]
-include::src/site/asciidoc/userguide/uc/context-dependent-configuration.adoc[]
-include::src/site/asciidoc/userguide/uc/dynamic-provisioning.adoc[]
-include::src/site/asciidoc/userguide/uc/minimal-propertysource.adoc[]
-include::src/site/asciidoc/userguide/uc/scannable-properties.adoc[]
-include::src/site/asciidoc/userguide/uc/combine-configs.adoc[]
-include::src/site/asciidoc/userguide/uc/management.adoc[]
-include::src/site/asciidoc/userguide/uc/service-context.adoc[]
-include::src/site/asciidoc/userguide/uc/injection.adoc[]
-
-

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fbda5b8e/src/site/markdown/index.md
--
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 238ad58..01b504f 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -16,10 +16,10 @@ powerful environment model and a flexible SPI.
 
 ## Documentation
 
-* [Use Cases](userguide/usecases.html)
-* [High Level Design](userguide/HighLevelDesign.html)
-* [API](userguide/API.html)
-* [Extensions](extensions/index.html)
+* [Use Cases](usecases.html)
+* [High Level Design](HighLevelDesign.html)
+* [API](API.html)
+* [Extensions](extensions.html)
 
 ---
 
@@ -27,10 +27,10 @@ powerful environment model and a flexible SPI.
 
 Using Apache Tamaya is simple:
 
-1. Add `org.apache.tamaya:tamaya-core:${{project.version}}` to your 
dependencies.
+1. Add `org.apache.tamaya:tamaya-core:{tamaya-version}` to your

incubator-tamaya git commit: Updated NOTICE (copyright year), readme and Deployment guide.

2016-03-19 Thread anatole 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 2c8b61753 -> 08e0bfcba


Updated NOTICE (copyright year), readme and Deployment guide.


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

Branch: refs/heads/master
Commit: 08e0bfcba62a8b4f082bd184678151eeaab51a6c
Parents: 2c8b617
Author: anatole 
Authored: Wed Mar 16 14:10:45 2016 +0100
Committer: anatole 
Committed: Wed Mar 16 14:10:45 2016 +0100

--
 NOTICE  |  2 +-
 README.md   |  1 +
 .../asciidoc/releaseguide/ReleaseGuide.adoc | 93 ++--
 3 files changed, 70 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/08e0bfcb/NOTICE
--
diff --git a/NOTICE b/NOTICE
index ed9f187..2e1baa6 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Tamaya (incubating)
-Copyright 2014-2015 The Apache Software Foundation.
+Copyright 2014-2016 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/08e0bfcb/README.md
--
diff --git a/README.md b/README.md
index d325f5f..d343e71 100644
--- a/README.md
+++ b/README.md
@@ -25,4 +25,5 @@ be installed on your computer.
 
 Then you can build Tamaya by the following command:
 
+$> export MAVEN_OPTS="-Xmx512m -XX:PermGenSpace=200m"
 $> mvn clean install

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/08e0bfcb/docs/src/main/asciidoc/releaseguide/ReleaseGuide.adoc
--
diff --git a/docs/src/main/asciidoc/releaseguide/ReleaseGuide.adoc 
b/docs/src/main/asciidoc/releaseguide/ReleaseGuide.adoc
index c7df7ca..6b2b326 100644
--- a/docs/src/main/asciidoc/releaseguide/ReleaseGuide.adoc
+++ b/docs/src/main/asciidoc/releaseguide/ReleaseGuide.adoc
@@ -103,8 +103,7 @@ team should be able to perform the release procedure.
 
 [listing,text]
 
-//install a version of git which is compatible with the release-plugin 
(e.g. v1.8.3.2)
-git checkout -b tamaya-[release version]
+git checkout -b vote-tamaya-[release version]
 
 export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=200m"
 mvn release:prepare -DdryRun=true
@@ -112,37 +111,59 @@ team should be able to perform the release procedure.
 //copy prepared workspace (to continue faster if an upload fails in the 
next step)
 
 
-* If something fails you may _reset_ the release branch, switch to the master 
branch,
-  fix whatever is needed and rebase your release branch to accomodate the 
latest
-  changes done.
+* If something fails you may switch to the master branch, fix whatever is 
needed and rebase your release branch to
+  accomodate the latest changes done.
 * On success you can check the release packages from `dist/target`.
 * If everything looks good you can proceed with the release:
 
 [listing,text]
 
-//hint: do not use -DdryRun=true -- since it can break the next step
 export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=200m"
+mvn release:prepare
 mvn release:perform
+
+
+* check the created commits including user-name and email
+* login to https://repository.apache.org/ and go to "Staging Repositories"
+* check the contents of the newly created tamaya staging repository
+* _close_ the repository to let Nexus do its validations
+* On success:
+* push the release-branch to the git repo
 
-// !!!check the created commits including user-name and email
+[listing,text]
+
+git push
+
 
-// login to https://repository.apache.org/ and go to "Staging Repositories"
-// check esp. 
.../org/apache/tamaya/tamaya/[version]/tamaya-[version]-source-release.zip
-// close the repository
+* Add the distributiong artifacts to the dev repositories:
 
-// push the release-branch and tag to a third-party git repo
-git remote add vote https://github.com/[user]/tamaya-vote
-git push -u vote master
-git push vote tamaya-[release version]
-git push vote --tags
+[listing,text]
+
+svn co

[06/11] incubator-tamaya git commit: Reset version, integrated docs into site.

2016-03-19 Thread anatole 
Reset version, integrated docs into site.


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

Branch: refs/heads/master
Commit: 3854cc223e849e7257cfccbbe42586622a5b1783
Parents: 078d93b
Author: anatole 
Authored: Wed Mar 16 21:54:18 2016 +0100
Committer: anatole 
Committed: Wed Mar 16 21:54:18 2016 +0100

--
 buildconfigurations/pom.xml |   2 +-
 code/api/pom.xml|   2 +-
 code/core/pom.xml   |   2 +-
 code/pom.xml|   2 +-
 distribution/pom.xml|   2 +-
 docs/pom.xml|   2 +-
 docs/src/main/asciidoc/API.adoc | 659 ---
 docs/src/main/asciidoc/Core.adoc| 249 ---
 docs/src/main/asciidoc/HighLevelDesign.adoc | 209 --
 docs/src/main/asciidoc/Requirements.adoc| 267 
 docs/src/main/asciidoc/examples.adoc|  82 ---
 docs/src/main/asciidoc/index.adoc   | 204 --
 .../asciidoc/misc/PossibleContributions.adoc| 315 -
 .../main/asciidoc/misc/examples.adoc.nonfunc|  91 ---
 .../asciidoc/releaseguide/ReleaseGuide.adoc | 273 
 docs/src/main/asciidoc/uc/combine-configs.adoc  |  14 -
 .../uc/context-dependent-configuration.adoc |   7 -
 .../main/asciidoc/uc/dynamic-provisioning.adoc  |  18 -
 .../asciidoc/uc/external-configuration.adoc |   6 -
 docs/src/main/asciidoc/uc/formats.adoc  |   8 -
 docs/src/main/asciidoc/uc/injection.adoc|  31 -
 docs/src/main/asciidoc/uc/java8.adoc|  14 -
 docs/src/main/asciidoc/uc/locations.adoc|  10 -
 docs/src/main/asciidoc/uc/management.adoc   |   7 -
 .../asciidoc/uc/minimal-propertysource.adoc |   6 -
 .../asciidoc/uc/multiple-configurations.adoc|  14 -
 .../main/asciidoc/uc/scannable-properties.adoc  |   4 -
 docs/src/main/asciidoc/uc/service-context.adoc  |  15 -
 docs/src/main/asciidoc/uc/simple-access.adoc|  25 -
 .../asciidoc/uc/simple-property-access.adoc |   9 -
 docs/src/main/asciidoc/uc/templates.adoc|  12 -
 .../main/asciidoc/uc/type-safe-properties.adoc  |  10 -
 .../main/asciidoc/uc/value-placeholders.adoc|   8 -
 docs/src/main/asciidoc/usecases.adoc|  58 --
 docs/src/main/assembly/documentation.xml|   4 +-
 docs/src/main/images/CoreDesign.png | Bin 43759 -> 0 bytes
 examples/1-minimal-example/pom.xml  |   2 +-
 .../2-simple-propertysource-example/pom.xml |   2 +-
 examples/3-resources-example/pom.xml|   2 +-
 examples/4-resolver-example/pom.xml |   2 +-
 examples/5-injection-example/pom.xml|   2 +-
 examples/6-fileobserver-example/pom.xml |   2 +-
 examples/7-builder-example/pom.xml  |   2 +-
 examples/8-remote-example/client/pom.xml|   2 +-
 examples/8-remote-example/pom.xml   |   2 +-
 examples/8-remote-example/server/pom.xml|   2 +-
 examples/pom.xml|   2 +-
 modules/builder/pom.xml |   2 +-
 modules/classloader-support/pom.xml |   2 +-
 modules/collections/pom.xml |   2 +-
 modules/events/pom.xml  |   2 +-
 modules/filter/pom.xml  |   2 +-
 modules/formats/pom.xml |   2 +-
 modules/functions/pom.xml   |   2 +-
 modules/injection-api/pom.xml   |   2 +-
 modules/injection/pom.xml   |   2 +-
 modules/integration/camel/pom.xml   |   2 +-
 modules/integration/cdi-se/pom.xml  |   2 +-
 modules/integration/cdi/pom.xml |   2 +-
 modules/integration/consul/pom.xml  |   2 +-
 modules/integration/etcd/pom.xml|   2 +-
 modules/integration/osgi/pom.xml|   2 +-
 modules/integration/pom.xml |   2 +-
 modules/integration/spring/pom.xml  |   2 +-
 modules/json/pom.xml|   2 +-
 modules/management/pom.xml  |   2 +-
 modules/model/pom.xml   |   2 +-
 modules/mutable-config/pom.xml  |   2 +-
 modules/optional/pom.xml|   2 +-
 modules/pom.xml |   2 +-
 modules/resolver/pom.xml|   2 +-
 modules/resources/pom.xml   |   2 +-
 modules/server/pom.xml  |   2 +-
 modules/spi-support/pom.xml

[05/11] incubator-tamaya git commit: Reset version, integrated docs into site.

2016-03-19 Thread anatole 
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3854cc22/docs/src/main/asciidoc/misc/PossibleContributions.adoc
--
diff --git a/docs/src/main/asciidoc/misc/PossibleContributions.adoc 
b/docs/src/main/asciidoc/misc/PossibleContributions.adoc
deleted file mode 100644
index 9a6c78d..000
--- a/docs/src/main/asciidoc/misc/PossibleContributions.adoc
+++ /dev/null
@@ -1,315 +0,0 @@
-Apache Tamaya - Possible Tasks
-==
-:name: Tamaya
-:rootpackage: org.apache.tamaya
-:title: Apache Tamaya
-:revnumber: 0.1-SNAPSHOT
-:revremark: Draft
-:revdate: October 2014
-:longversion: {revnumber} ({revremark}) {revdate}
-:authorinitials: ATR
-:author: Anatole Tresch
-:email: 
-:source-highlighter: coderay
-:website: http://tamaya.apache.org/
-:toc:
-:toc-placement: manual
-:encoding: UTF-8
-:numbered:
-
-'''
-
-<<<
-
--> add image : : 
https://raw.githubusercontent.com/JavaConfig/config-api/master/src/main/asciidoc/images/javaconfig.jpg[]
-
-toc::[]
-
-<<<
-:numbered!:

-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.

-
-:numbered:
-
-<<<
-
-== Introduction
-
-== What is Tamaya
-
-{name} is the Apache standard for flexible and powerful configuration. 
Objective is to provide flavors for
-Java SE, ME as well as to ship with powerful features for Java EE and Cloud 
Solutions. All functions provided
-is build on top of a small but very powerful, flexible and extendible API. 
This API is implemented by a core implementation,
-which then can be extended or adapted for use in different runtime scenarios, 
such as SE, ME, EE, Spring, OSGI
-and more. Similarly additional modules may be provided that help also existing 
solution to be plugged into
-{name}, so you can start right away using {name} without having to 
rebuild/change your existing application.
-
-
-=== Purpose of this Document
-
-The document should help to organize people and ideas around the Apache Tamaya 
Library. It list possible features,
-ideas and tasks that need to be done. Everybody can have a look at and see, 
where hos contribution and capabilities
-would fit best.
-
-
-== Main Features
-
-=== Metadata Model
-
-Currently +MetaInfo+ models metadata as a separate constuct. It has been shown 
that this leads to more complex
-handling when creating composites and makes the API overall more complex. The 
idea is to model metadata as simple
-key/value pairs, that are part of the provider/configuration data as well, but 
handled separately. Metadata hereby
-is identified by a starting '_' character in its key. For example refer to the 
following configuration properties:
-
-[source,listing]
-.Basic Properties
-
-a.b.Foo=foo
-a.b.Bar=bar
-a.AnyOther=whatelse
-Something=none
-
-
-Now we can model meta-data as follows:
-
-[source,listing]
-.Metadata Properties
-
-[a.b].info=An area info
-[a.b.Foo].auth=role1,role2
-[a.b.Foo].encrypt=PGP
-[a.b.Foo].sensitive=true
-[].info=This is a test configuration example.
-
-
-The above would model the following:
-
-* The area +a.b+ has the meta property +info+.
-* The entry +a.b.Foo+ has three meta properties +auth,encrypt+ and 
+sensitive+. These could be interpreted by a security
-  view and used to encrypt the values returned by the configuration instance, 
if not the current user has one of the
-  specified roles.
-* The last meta data defines an attribute +info+ for the whole 
provider/configuration (the root area).
-
-Given that the overall entries would be as follows:
-
-[source,listing]
-.Full Properties with Meta Properties
-
-[a.b].info=An area info
-a.b.Foo=foo
-[a.b.Foo].auth=role1,role2
-[a.b.Foo].encrypt=PGP
-[a.b.Foo].sensitive=true
-a.b.Bar=bar
-[].info=This is a test configuration example.
-a.AnyOther=whatelse
-Something=none

Jenkins build is back to stable : Tamaya-Master-branch #518

2016-03-19 Thread Apache Jenkins Server 
See

[2/2] incubator-tamaya git commit: Fixed image inclusion, e.g. in HighLevelDesign.adoc

2016-03-19 Thread anatole 
Fixed image inclusion, e.g. in HighLevelDesign.adoc


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

Branch: refs/heads/master
Commit: 9e6f040df7ebb7ed7453f14eaaad3ea086febb05
Parents: 4215a1b
Author: anatole 
Authored: Fri Mar 18 00:48:46 2016 +0100
Committer: anatole 
Committed: Fri Mar 18 00:48:46 2016 +0100

--
 docs/pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9e6f040d/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index c2fe19c..34bb0a9 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -137,6 +137,7 @@ under the License.
 process-asciidoc
 
 
+
${project.basedir}/../src/site/asciidoc/images
 
${project.basedir}/../src/site/asciidoc
 
 
${project.version}