[2/2] incubator-tamaya git commit: Merge branch 'enumconverter-vs-null' of https://github.com/peculater/incubator-tamaya

[pottlinger]

Merge branch 'enumconverter-vs-null' of 
https://github.com/peculater/incubator-tamaya


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

Branch: refs/heads/master
Commit: 69090c547ffd1f7ccd1e22a44cb56ff7ffea678d
Parents: e7e02c4 e977ab2
Author: Phil Ottlinger 
Authored: Thu Nov 29 22:08:55 2018 +0100
Committer: Phil Ottlinger 
Committed: Thu Nov 29 22:08:55 2018 +0100

--
 .../apache/tamaya/spisupport/EnumConverter.java | 20 +---
 .../tamaya/spisupport/EnumConverterTest.java|  6 ++
 2 files changed, 19 insertions(+), 7 deletions(-)
--

[2/2] incubator-tamaya git commit: TAMAYA-349: Ensure Tamaya builds on JDK 9-11

[pottlinger]

TAMAYA-349: Ensure Tamaya builds on JDK 9-11


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

Branch: refs/heads/master
Commit: bf18659a52bf9256e4a41452606be3b9628fe83c
Parents: 653
Author: Phil Ottlinger 
Authored: Thu Sep 20 21:36:34 2018 +0200
Committer: Phil Ottlinger 
Committed: Thu Sep 20 21:36:34 2018 +0200

--
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bf18659a/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 3219bf8..ba5b242 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: java
 jdk:
   - oraclejdk8
+  - oraclejdk9
+  - oraclejdk10
   - oraclejdk11
 
 #before_script:

[2/2] incubator-tamaya git commit: TAMAYA-344 Added lazy initialization to core.

[anatole]

TAMAYA-344 Added lazy initialization to core.

Signed-off-by: Anatole Tresch 


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

Branch: refs/heads/configjsr
Commit: 2bebc0e4e574330aee142c5b0f9230afbdbb1019
Parents: cf11395
Author: Anatole Tresch 
Authored: Tue Jul 10 15:51:53 2018 +0200
Committer: Anatole Tresch 
Committed: Tue Jul 10 15:51:53 2018 +0200

--
 code/core/bnd.bnd | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2bebc0e4/code/core/bnd.bnd
--
diff --git a/code/core/bnd.bnd b/code/core/bnd.bnd
index 4ce56bb..acf249c 100644
--- a/code/core/bnd.bnd
+++ b/code/core/bnd.bnd
@@ -21,6 +21,7 @@ Bundle-Vendor: Apache Software Foundation
 Bundle-ContactAddress: dev-tam...@incubator.apache.org
 Bundle-DocURL: http://tamaya.apache.org
 Bundle-Activator: org.apache.tamaya.core.OSGIActivator
+Bundle-ActivationPolicy: lazy
 Export-Package: \
org.apache.tamaya.core
 Import-Package: \

[2/2] incubator-tamaya git commit: TAMAYA-340: Eliminate sysout from test

[pottlinger]

TAMAYA-340: Eliminate sysout from test

* Tried to understand ignored test case that initializes by sysproperties
but seems to ignore the given prefix.


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

Branch: refs/heads/master
Commit: ab914033ac5066a0577169a6859911299689ea9a
Parents: f33d454
Author: Phil Ottlinger 
Authored: Tue Jun 5 21:50:10 2018 +0200
Committer: Phil Ottlinger 
Committed: Tue Jun 5 21:50:10 2018 +0200

--
 .../EnvironmentPropertySourceTest.java  | 23 
 1 file changed, 14 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ab914033/code/spi-support/src/test/java/org/apache/tamaya/spisupport/propertysource/EnvironmentPropertySourceTest.java
--
diff --git 
a/code/spi-support/src/test/java/org/apache/tamaya/spisupport/propertysource/EnvironmentPropertySourceTest.java
 
b/code/spi-support/src/test/java/org/apache/tamaya/spisupport/propertysource/EnvironmentPropertySourceTest.java
index 10cb2fd..01e23ee 100644
--- 
a/code/spi-support/src/test/java/org/apache/tamaya/spisupport/propertysource/EnvironmentPropertySourceTest.java
+++ 
b/code/spi-support/src/test/java/org/apache/tamaya/spisupport/propertysource/EnvironmentPropertySourceTest.java
@@ -18,16 +18,16 @@
  */
 package org.apache.tamaya.spisupport.propertysource;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
-import org.apache.tamaya.spi.PropertyValue;
-import org.junit.Test;
-
 import java.util.Map;
 
-import static org.assertj.core.api.Assertions.*;
+import org.apache.tamaya.spi.PropertyValue;
 import org.junit.Ignore;
+import org.junit.Test;
 
 /**
  * Tests for {@link EnvironmentPropertySource}.
@@ -49,7 +49,7 @@ public class EnvironmentPropertySourceTest {
 System.setProperty("tamaya.envprops.prefix", "fakeprefix");
 System.setProperty("tamaya.envprops.disable", "true");
 localEnvironmentPropertySource = new EnvironmentPropertySource();
-
//assertThat(environmentSource.getPrefix()).isEqualTo("fakeprefix");
+assertThat(localEnvironmentPropertySource.getPrefix()).isNull(); 
// is not fakeprefix because disabled
 assertThat(localEnvironmentPropertySource.isDisabled()).isTrue();
 
assertThat(localEnvironmentPropertySource.get(System.getenv().entrySet().iterator().next().getKey())).isNull();
 
assertThat(localEnvironmentPropertySource.getName().contains("(disabled)")).isTrue();
@@ -103,12 +103,18 @@ public class EnvironmentPropertySourceTest {
 }
 }
 
-@Ignore
+@Ignore("Why is this test case disabled?")
 @Test
 public void testPrefixedGet() throws Exception {
-EnvironmentPropertySource localEnvironmentPropertySource = new 
EnvironmentPropertySource("fancyprefix");
+   System.setProperty("tamaya.envprops.prefix", "fancyprefix");
+System.setProperty("tamaya.envprops.disable", "false");
+System.setProperty("tamaya.defaults.disable", "false");
+  // works: EnvironmentPropertySource localEnvironmentPropertySource = new 
EnvironmentPropertySource("fancyprefix");
+  EnvironmentPropertySource localEnvironmentPropertySource = new 
EnvironmentPropertySource();
+  System.out.println(localEnvironmentPropertySource);
+  
assertThat(localEnvironmentPropertySource.getPrefix()).isEqualTo("fancyprefix");
 localEnvironmentPropertySource.setPropertiesProvider(new 
MockedSystemPropertiesProvider());
-
assertThat(localEnvironmentPropertySource.get("somekey").getValue()).isEqualTo("fancyprefix.somekey.value");
+
assertThat(localEnvironmentPropertySource.get("somekey").getValue()).isEqualTo("somekey.value");
 }
 
 @Test
@@ -142,7 +148,6 @@ public class EnvironmentPropertySourceTest {
 private class MockedSystemPropertiesProvider extends 
EnvironmentPropertySource.SystemPropertiesProvider {
 @Override
 String getenv(String key) {
-System.out.println("Called with key " + key);
 return key + ".value";
 }
 }

[2/2] incubator-tamaya git commit: Merge branch 'TAMAYA-334' of https://github.com/acoburn/incubator-tamaya

[pottlinger]

Merge branch 'TAMAYA-334' of https://github.com/acoburn/incubator-tamaya


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

Branch: refs/heads/master
Commit: 4c73bad2e46ccc63c720b828de5676b5bf2d0c1b
Parents: 9181202 6bc669e
Author: Phil Ottlinger 
Authored: Fri Mar 30 23:12:36 2018 +0200
Committer: Phil Ottlinger 
Committed: Fri Mar 30 23:12:36 2018 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4c73bad2/pom.xml
--

[2/2] incubator-tamaya git commit: Merge branch 'TAMAYA-331' of https://github.com/acoburn/incubator-tamaya

[pottlinger]

Merge branch 'TAMAYA-331' of https://github.com/acoburn/incubator-tamaya


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

Branch: refs/heads/master
Commit: 3a50d2e6eb06b7463e85a6f872463c28bc1142b0
Parents: 4aadb0f 8fb0047
Author: Phil Ottlinger 
Authored: Mon Mar 19 21:24:07 2018 +0100
Committer: Phil Ottlinger 
Committed: Mon Mar 19 21:24:07 2018 +0100

--
 code/api/bnd.bnd | 1 +
 code/core/bnd.bnd| 3 ++-
 code/spi-support/bnd.bnd | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
--

[2/2] incubator-tamaya git commit: Merge branch 'TAMAYA-330' of https://github.com/acoburn/incubator-tamaya

[pottlinger]

Merge branch 'TAMAYA-330' of https://github.com/acoburn/incubator-tamaya


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

Branch: refs/heads/master
Commit: 4aadb0f894d3e66d0b427bd3a12e57cf736b2b4c
Parents: 4af00a3 b2af8c7
Author: Phil Ottlinger 
Authored: Mon Mar 19 21:23:23 2018 +0100
Committer: Phil Ottlinger 
Committed: Mon Mar 19 21:23:23 2018 +0100

--
 pom.xml | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)
--

[2/2] incubator-tamaya git commit: Merge branch 'documentation_fixes' of https://github.com/acoburn/incubator-tamaya

[pottlinger]

Merge branch 'documentation_fixes' of 
https://github.com/acoburn/incubator-tamaya


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

Branch: refs/heads/master
Commit: 4af00a3b85ebb2f7f07adcf29600f3f528408fb7
Parents: 99ea556 904ce25
Author: Phil Ottlinger 
Authored: Mon Mar 19 21:22:51 2018 +0100
Committer: Phil Ottlinger 
Committed: Mon Mar 19 21:22:51 2018 +0100

--
 .../java/org/apache/tamaya/ConfigOperator.java  |  6 +--
 .../java/org/apache/tamaya/ConfigQuery.java |  4 +-
 .../java/org/apache/tamaya/Configuration.java   |  6 +--
 .../apache/tamaya/ConfigurationProvider.java|  4 +-
 .../java/org/apache/tamaya/TypeLiteral.java |  2 +-
 .../apache/tamaya/spi/ConfigurationBuilder.java | 30 ++---
 .../apache/tamaya/spi/ConfigurationContext.java | 46 ++--
 .../tamaya/core/internal/CoreConfiguration.java |  2 +
 .../core/internal/CoreConfigurationBuilder.java |  1 +
 .../internal/converters/DoubleConverter.java|  4 ++
 .../core/internal/converters/FileConverter.java |  2 +-
 .../internal/converters/FloatConverter.java |  4 ++
 .../internal/converters/InstantConverter.java   |  2 +-
 .../internal/converters/LocalDateConverter.java |  2 +-
 .../converters/LocalDateTimeConverter.java  |  2 +-
 .../internal/converters/LocalTimeConverter.java |  2 +-
 .../converters/OffsetDateTimeConverter.java |  2 +-
 .../converters/OffsetTimeConverter.java |  2 +-
 .../internal/converters/OptionalConverter.java  |  2 +-
 .../core/internal/converters/PathConverter.java |  2 +-
 .../internal/converters/SupplierConverter.java  |  2 +-
 .../core/internal/converters/URLConverter.java  |  2 +-
 .../tamaya/spisupport/ConfigValueEvaluator.java |  2 +-
 .../tamaya/spisupport/ConfigurationBuilder.java | 28 ++--
 .../spisupport/DefaultConfigValueEvaluator.java |  2 +-
 .../tamaya/spisupport/DefaultConfiguration.java | 12 ++---
 .../spisupport/DefaultConfigurationBuilder.java |  2 +-
 .../spisupport/DefaultConfigurationContext.java |  2 +-
 .../DefaultConfigurationContextBuilder.java |  4 +-
 .../apache/tamaya/spisupport/EnumConverter.java |  2 +-
 .../spisupport/PriorityServiceComparator.java   |  2 +-
 .../spisupport/PropertyConverterManager.java| 22 +-
 .../spisupport/PropertyFilterComparator.java|  2 +-
 .../tamaya/spisupport/PropertyFiltering.java|  4 +-
 .../spisupport/PropertySourceComparator.java|  6 +--
 .../propertysource/BasePropertySource.java  |  6 +--
 .../propertysource/CLIPropertySource.java   |  4 +-
 .../propertysource/MapPropertySource.java   |  4 +-
 .../PropertiesResourcePropertySource.java   |  3 +-
 .../propertysource/SimplePropertySource.java|  3 +-
 40 files changed, 129 insertions(+), 112 deletions(-)
--

[2/2] incubator-tamaya git commit: Merge branch 'TAMAYA-328' of https://github.com/peculater/incubator-tamaya

[pottlinger]

Merge branch 'TAMAYA-328' of https://github.com/peculater/incubator-tamaya


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

Branch: refs/heads/master
Commit: d9406e58f3afce3972bcb3d334d4a3f2c5aa0383
Parents: 47972d8 a606c87
Author: Phil Ottlinger 
Authored: Mon Feb 12 22:35:19 2018 +0100
Committer: Phil Ottlinger 
Committed: Mon Feb 12 22:35:19 2018 +0100

--
 .../tamaya/core/internal/converters/CharConverter.java   | 3 +++
 .../tamaya/core/internal/converters/CharConverterTest.java   | 8 
 .../internal/converters/ConverterTestsPropertySource.java| 2 ++
 3 files changed, 13 insertions(+)
--

[2/2] incubator-tamaya git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya

[pottlinger]

Merge branch 'master' of 
https://git-wip-us.apache.org/repos/asf/incubator-tamaya


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

Branch: refs/heads/master
Commit: 3f52504407ad4f3d1806fb1e684475069da7962f
Parents: 3f6b34a 014001b
Author: Phil Ottlinger 
Authored: Mon Jan 8 20:33:25 2018 +0100
Committer: Phil Ottlinger 
Committed: Mon Jan 8 20:33:25 2018 +0100

--

--

[2/2] incubator-tamaya git commit: .

[plexus]

.


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

Branch: refs/heads/tamaya-289
Commit: 966900e724d4a443fdfe90cbfec9049ee3c09db2
Parents: 7e63b95
Author: Oliver B. Fischer 
Authored: Sat Sep 16 15:35:30 2017 +0200
Committer: Oliver B. Fischer 
Committed: Sat Sep 16 15:35:30 2017 +0200

--
 .../org/apache/tamaya/ConfigExceptionTest.java  |  4 ++--
 .../org/apache/tamaya/ConfigurationTest.java| 10 -
 .../java/org/apache/tamaya/TypeLiteralTest.java | 18 
 .../tamaya/core/internal/BannerManagerTest.java |  2 +-
 .../DefaultConfigurationContextTest.java| 16 +++---
 .../internal/DefaultServiceContextTest.java |  6 +++---
 .../converters/DoubleConverterTest.java | 22 ++--
 .../propertysource/BasePropertySourceTest.java  |  4 ++--
 8 files changed, 41 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/966900e7/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
--
diff --git a/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java 
b/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
index 8cb7df6..0cd344f 100644
--- a/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
+++ b/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
@@ -28,14 +28,14 @@ import static org.junit.Assert.*;
  */
 public class ConfigExceptionTest {
 
-@Test @Ignore
+@Test
 public void testCreationMessage(){
 ConfigException ex = new ConfigException("test");
 assertNull(ex.getCause());
 assertEquals(ex.getMessage(), "test");
 }
 
-@Test @Ignore
+@Test
 public void testCreationMessageThrowable(){
 Exception e = new IllegalStateException("blabla");
 ConfigException ex = new ConfigException("test", e);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/966900e7/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
--
diff --git a/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java 
b/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
index 433ac87..d618374 100644
--- a/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
+++ b/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.*;
  */
 public class ConfigurationTest {
 
-@Test @Ignore
+@Test
 public void testget() throws Exception {
 assertEquals(Boolean.TRUE, 
ConfigurationProvider.getConfiguration().get("booleanTrue", Boolean.class));
 assertEquals(Boolean.FALSE, 
ConfigurationProvider.getConfiguration().get("booleanFalse", Boolean.class));
@@ -39,24 +39,24 @@ public class ConfigurationTest {
 assertEquals(Double.MAX_VALUE, 
ConfigurationProvider.getConfiguration().get("double", Double.class), 0.0d);
 }
 
-@Test @Ignore
+@Test
 public void testGetBoolean() throws Exception {
 assertTrue(ConfigurationProvider.getConfiguration().get("booleanTrue", 
Boolean.class));
 
assertFalse(ConfigurationProvider.getConfiguration().get("booleanFalse", 
Boolean.class));
 assertFalse(ConfigurationProvider.getConfiguration().get("foorBar", 
Boolean.class));
 }
 
-@Test @Ignore
+@Test
 public void testGetInteger() throws Exception {
 assertEquals(Integer.MAX_VALUE,(int) 
ConfigurationProvider.getConfiguration().get("int", Integer.class));
 }
 
-@Test @Ignore
+@Test
 public void testGetLong() throws Exception {
 assertEquals(Long.MAX_VALUE,(long) 
ConfigurationProvider.getConfiguration().get("long", Long.class));
 }
 
-@Test @Ignore
+@Test
 public void testGetDouble() throws Exception {
 
assertEquals(Double.MAX_VALUE,ConfigurationProvider.getConfiguration().get("double",
 Double.class), 0.0d);
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/966900e7/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
--
diff --git a/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java 
b/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
index 90d4484..18a19cb 100644
--- a/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
+++ b/code/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
@@ -35,19 +35,19 @@ import static 

[2/2] incubator-tamaya git commit: Disabled all tests in core.

[plexus]

Disabled all tests in core.


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

Branch: refs/heads/tamaya-289
Commit: 5080c04e3b9bcb6823b47cb59e0076a62a2b9df4
Parents: 32be37e
Author: Oliver B. Fischer 
Authored: Sat Sep 16 15:19:21 2017 +0200
Committer: Oliver B. Fischer 
Committed: Sat Sep 16 15:19:21 2017 +0200

--
 .../org/apache/tamaya/ConfigExceptionTest.java  |  5 +-
 .../org/apache/tamaya/ConfigurationTest.java| 11 ++--
 .../java/org/apache/tamaya/TypeLiteralTest.java | 19 +++---
 .../tamaya/spi/ConversionContextTest.java   | 15 ++---
 .../apache/tamaya/spi/FilterContextTest.java| 19 +++---
 .../tamaya/spi/PropertyValueBuilderTest.java| 57 +-
 .../apache/tamaya/spi/PropertyValueTest.java| 63 ++--
 .../tamaya/spi/ServiceContextManagerTest.java   |  5 +-
 .../apache/tamaya/spi/ServiceContextTest.java   | 11 ++--
 .../core/ConfigurationContextBuilderTest.java   | 47 ---
 .../apache/tamaya/core/ConfigurationTest.java   |  5 +-
 .../tamaya/core/internal/BannerManagerTest.java |  4 +-
 .../DefaultConfigurationContextBuilderTest.java | 18 +++---
 .../DefaultConfigurationContextTest.java| 24 
 .../DefaultConfigurationProviderTest.java   | 15 ++---
 .../core/internal/DefaultConfigurationTest.java | 31 +-
 .../internal/DefaultServiceContextTest.java | 15 ++---
 .../internal/PriorityServiceComparatorTest.java |  3 +-
 .../internal/PropertyConverterManagerTest.java  | 19 +++---
 .../converters/BigDecimalConverterTest.java | 11 ++--
 .../converters/BooleanConverterTest.java|  3 +-
 .../internal/converters/ByteConverterTest.java  |  7 ++-
 .../internal/converters/CharConverterTest.java  | 15 ++---
 .../internal/converters/ClassConverterTest.java | 11 ++--
 .../converters/CurrencyConverterTest.java   | 17 +++---
 .../converters/DoubleConverterTest.java | 23 +++
 .../internal/converters/EnumConverterTest.java  |  9 +--
 .../internal/converters/FloatConverterTest.java | 23 +++
 .../converters/IntegerConverterTest.java| 13 ++--
 .../internal/converters/LongConverterTest.java  | 13 ++--
 .../converters/NumberConverterTest.java | 11 ++--
 .../internal/converters/ShortConverterTest.java | 13 ++--
 .../internal/converters/URIConverterTest.java   | 11 ++--
 .../internal/converters/URLConverterTest.java   | 11 ++--
 .../propertysource/BasePropertySourceTest.java  |  5 +-
 .../propertysource/CLIPropertySourceTest.java   |  3 +-
 .../EnvironmentPropertySourceTest.java  | 11 ++--
 .../PropertiesFilePropertySourceTest.java   |  7 ++-
 .../SimplePropertySourceTest.java   |  9 +--
 .../SystemPropertySourceTest.java   |  9 +--
 .../provider/JavaConfigurationProviderTest.java |  3 +-
 .../distributed/DisplayRegistrationTest.java| 12 ++--
 42 files changed, 337 insertions(+), 299 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5080c04e/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
--
diff --git a/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java 
b/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
index fa7da0a..8cb7df6 100644
--- a/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
+++ b/code/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tamaya;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -27,14 +28,14 @@ import static org.junit.Assert.*;
  */
 public class ConfigExceptionTest {
 
-@Test
+@Test @Ignore
 public void testCreationMessage(){
 ConfigException ex = new ConfigException("test");
 assertNull(ex.getCause());
 assertEquals(ex.getMessage(), "test");
 }
 
-@Test
+@Test @Ignore
 public void testCreationMessageThrowable(){
 Exception e = new IllegalStateException("blabla");
 ConfigException ex = new ConfigException("test", e);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5080c04e/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
--
diff --git a/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java 
b/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
index ecbb75c..433ac87 100644
--- a/code/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
+++ 

[2/2] incubator-tamaya git commit: [TAMAYA-288] Set coverage threshold and mutation coverage to 49%. That means that a covrage build with less then 50% will fail.

[plexus]

[TAMAYA-288] Set coverage threshold and mutation coverage to 49%. That means 
that a covrage build with less then 50% will fail.


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

Branch: refs/heads/master
Commit: 19e0a0bf7b949113d0bc5f30f1f4b4323443cf1e
Parents: efd03e1
Author: Oliver B. Fischer 
Authored: Sat Sep 16 13:29:21 2017 +0200
Committer: Oliver B. Fischer 
Committed: Sat Sep 16 13:29:21 2017 +0200

--
 pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/19e0a0bf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 432302a..976 100644
--- a/pom.xml
+++ b/pom.xml
@@ -748,6 +748,10 @@
 
 mutationCoverage
 
+
+49
+49
+
 
 
 

[2/2] incubator-tamaya git commit: Merge branch 'release-0.3-incubating'

[plexus]

Merge branch 'release-0.3-incubating'


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

Branch: refs/heads/master
Commit: 91c8eb438e775bc0488cd9895f1238f346e8c835
Parents: 0402fd3 77933f5
Author: Oliver B. Fischer 
Authored: Sun Aug 13 02:09:36 2017 +0200
Committer: Oliver B. Fischer 
Committed: Sun Aug 13 02:09:36 2017 +0200

--

--

[2/2] incubator-tamaya git commit: [TAMAYA-231] Mark Struberg is an PPMC eremitus.

[plexus]

[TAMAYA-231] Mark Struberg is an PPMC eremitus.


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

Branch: refs/heads/master
Commit: f6cac3a9dbcfd9557b999d0d690b47af66454d78
Parents: fa61cd6
Author: Oliver B. Fischer 
Authored: Thu Apr 6 23:38:27 2017 +0200
Committer: Oliver B. Fischer 
Committed: Wed Apr 26 21:30:11 2017 +0200

--
 pom.xml | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f6cac3a9/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3403c7b..be7a1ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,16 @@
 wkeil AT apache.org
 +1
 
+
+
+struberg
+Mark Struberg
+struberg at apache.org
+
+PPMC Emeritus
+
++1
+
 
 
 

[2/2] incubator-tamaya git commit: [TAMAYA-257] The core API does not enforce non-null parameters as document by the API documentation.

[plexus]

[TAMAYA-257] The core API does not enforce non-null parameters as document by 
the API documentation.


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

Branch: refs/heads/master
Commit: 0cb070ec21c3b4f4cfc4187f950f38cb875bbd65
Parents: 8ad767b
Author: Oliver B. Fischer 
Authored: Sun Mar 12 14:08:23 2017 +0100
Committer: Oliver B. Fischer 
Committed: Sun Mar 12 14:08:23 2017 +0100

--
 .../java/org/apache/tamaya/ConfigException.java |   4 +-
 .../java/org/apache/tamaya/ConfigOperator.java  |   4 +-
 .../java/org/apache/tamaya/ConfigQuery.java |   2 +-
 .../java/org/apache/tamaya/Configuration.java   |  28 +--
 .../apache/tamaya/ConfigurationProvider.java|  10 +-
 .../java/org/apache/tamaya/TypeLiteral.java |  20 +-
 .../apache/tamaya/spi/ConfigurationContext.java |   4 +-
 .../tamaya/spi/ConfigurationContextBuilder.java |  16 +-
 .../tamaya/spi/ConfigurationProviderSpi.java|   2 +-
 .../apache/tamaya/spi/ConversionContext.java|  24 +--
 .../org/apache/tamaya/spi/FilterContext.java|  21 ++-
 .../org/apache/tamaya/spi/PropertyFilter.java   |   2 +-
 .../org/apache/tamaya/spi/PropertySource.java   |   6 +-
 .../org/apache/tamaya/spi/PropertyValue.java|  69 ---
 .../apache/tamaya/spi/PropertyValueBuilder.java |  43 +++--
 .../org/apache/tamaya/spi/ServiceContext.java   |   6 +-
 .../tamaya/spi/ServiceContextManager.java   |   4 +-
 .../java/org/apache/tamaya/TypeLiteralTest.java |  31 +++-
 .../apache/tamaya/spi/FilterContextTest.java|  27 +++
 .../tamaya/spi/PropertyValueBuilderTest.java|  78 +++-
 .../apache/tamaya/spi/PropertyValueTest.java|  77 +++-
 .../tamaya/spi/ServiceContextManagerTest.java   |   7 +-
 .../core/internal/ConfigValueEvaluator.java |   6 +-
 .../core/internal/DefaultConfiguration.java |  31 +++-
 .../core/internal/DefaultServiceContext.java|   2 +-
 .../core/internal/OSGIServiceComparator.java|   4 +-
 .../internal/PriorityServiceComparator.java |   4 +-
 .../core/internal/PropertyConverterManager.java |   8 +-
 .../tamaya/core/internal/PropertyFiltering.java |   8 +-
 .../core/internal/PropertySourceComparator.java |   2 +-
 .../core/propertysource/BasePropertySource.java |  10 +-
 .../core/propertysource/CLIPropertySource.java  |   2 +-
 .../propertysource/SimplePropertySource.java|  10 +-
 .../tamaya/core/internal/BannerManagerTest.java |   1 +
 .../DefaultConfigurationContextBuilderTest.java |   1 +
 .../DefaultConfigurationContextTest.java|   2 +-
 .../core/internal/DefaultConfigurationTest.java | 181 +++
 37 files changed, 605 insertions(+), 152 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0cb070ec/code/api/src/main/java/org/apache/tamaya/ConfigException.java
--
diff --git a/code/api/src/main/java/org/apache/tamaya/ConfigException.java 
b/code/api/src/main/java/org/apache/tamaya/ConfigException.java
index bac2ef4..38b0801 100644
--- a/code/api/src/main/java/org/apache/tamaya/ConfigException.java
+++ b/code/api/src/main/java/org/apache/tamaya/ConfigException.java
@@ -27,7 +27,7 @@ public class ConfigException extends RuntimeException{
 
 /**
  * Creates a new configuration exception.
- * @param message the exception message, not null.
+ * @param message the exception message, not {@code null}.
  */
 public ConfigException(String message){
 super(message);
@@ -35,7 +35,7 @@ public class ConfigException extends RuntimeException{
 
 /**
  * Creates a new configuration exception.
- * @param message the exception message, not null.
+ * @param message the exception message, not {@code null}.
  * @param t the throwable.
  */
 public ConfigException(String message, Throwable t){

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0cb070ec/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java
--
diff --git a/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java 
b/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java
index 2295b07..2144218 100644
--- a/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java
+++ b/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java
@@ -30,8 +30,8 @@ public interface ConfigOperator {
  * decorators, whereas operated instances may have non compatible 
behaviour, e.g. by applying security constraints
  * or view restrictions.
  *
- * @param config the 

[2/2] incubator-tamaya git commit: Corrected module name.

[plexus]

Corrected module name.


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

Branch: refs/heads/master
Commit: ad770e6eebcc54a845c1e32589c09f1a23723f08
Parents: 9ac3fbb
Author: Oliver B. Fischer 
Authored: Sat Dec 10 16:08:02 2016 +0100
Committer: Oliver B. Fischer 
Committed: Sat Dec 17 15:24:29 2016 +0100

--
 examples/01-minimal/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ad770e6e/examples/01-minimal/pom.xml
--
diff --git a/examples/01-minimal/pom.xml b/examples/01-minimal/pom.xml
index e137377..e8dad25 100644
--- a/examples/01-minimal/pom.xml
+++ b/examples/01-minimal/pom.xml
@@ -32,7 +32,7 @@ under the License.
 01-minimal
 0.3-incubating-SNAPSHOT
 
-Apache Tamaya Minimal Examples
+Apache Tamaya Minimal Example
 
 
 

[2/2] incubator-tamaya git commit: Fixed registration issue with converters. Improved toString formatting.

[anatole]

Fixed registration issue with converters.
Improved toString formatting.


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

Branch: refs/heads/master
Commit: 77850ea316369b3d259ffd174cc80bac3c47dedd
Parents: 05b6514
Author: anatole 
Authored: Mon Dec 12 17:06:22 2016 +0100
Committer: anatole 
Committed: Mon Dec 12 17:14:15 2016 +0100

--
 buildconfigurations/pom.xml |   2 +-
 .../core/internal/DefaultConfiguration.java |   7 ++
 .../internal/DefaultConfigurationContext.java   | 103 ---
 .../DefaultConfigurationContextBuilder.java |   4 +-
 .../internal/DefaultConfigurationProvider.java  |   3 +-
 .../core/internal/PropertyConverterManager.java |   2 +-
 .../core/ConfigurationContextBuilderTest.java   |   8 +-
 .../DefaultConfigurationContextBuilderTest.java |   4 +-
 .../internal/PropertyConverterManagerTest.java  |  15 +--
 9 files changed, 72 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/77850ea3/buildconfigurations/pom.xml
--
diff --git a/buildconfigurations/pom.xml b/buildconfigurations/pom.xml
index 3973395..c53d8df 100644
--- a/buildconfigurations/pom.xml
+++ b/buildconfigurations/pom.xml
@@ -47,5 +47,5 @@ under the License.
 
   vote02-tamaya-0.2-incubating
   
-
+
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/77850ea3/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
--
diff --git 
a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
 
b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
index 1b37233..268d825 100644
--- 
a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
+++ 
b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
@@ -222,4 +222,11 @@ public class DefaultConfiguration implements Configuration 
{
 public ConfigurationContext getConfigurationContext() {
 return configurationContext;
 }
+
+@Override
+public String toString() {
+return "Configuration{\n " +
+configurationContext +
+'}';
+}
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/77850ea3/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
--
diff --git 
a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
 
b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
index 280793a..c3031f0 100644
--- 
a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
+++ 
b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
@@ -81,33 +81,10 @@ public class DefaultConfigurationContext implements 
ConfigurationContext {
 propertySources.addAll(builder.propertySources);
 // now sort them according to their ordinal values
 immutablePropertySources = 
Collections.unmodifiableList(propertySources);
-StringBuilder b= new StringBuilder();
-b.append("Registered " + immutablePropertySources.size() + " property 
sources: \n");
-b.append("   NAME [TYPE]\n");
-b.append("   ---\n");
-for(PropertySource ps: immutablePropertySources){
-b.append("   ").append(ps.getName()).append("  
[").append(ps.getClass().getSimpleName()).append("],\n");
-}
-if(b.length()>0) {
-b.setLength(b.length() - 2);
-}
-LOG.info(b.toString());
-b.setLength(0);
 
 // as next step we pick up the PropertyFilters pretty much the same way
 List propertyFilters = new 
ArrayList<>(builder.getPropertyFilters());
 immutablePropertyFilters = 
Collections.unmodifiableList(propertyFilters);
-b.append("Registered " + immutablePropertyFilters.size() + " property 
filters: \n");
-b.append("   TYPE\n");
-b.append("   
--\n");
-for(PropertyFilter pf: immutablePropertyFilters){
-b.append("   ").append(pf.getClass().getName()).append(",\n");
-}
-if(b.length()>0) {
-b.setLength(b.length() - 

[2/2] incubator-tamaya git commit: TAMAYA-205: Prevent local build failure

[pottlinger]

TAMAYA-205: Prevent local build failure

* Add missing findbugs config for 01-minimal example.


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

Branch: refs/heads/master
Commit: ac0c083805caf9e2bbaca5ddc1c23b884c90cbfc
Parents: 3be9891
Author: Phil Ottlinger 
Authored: Mon Nov 28 22:40:51 2016 +0100
Committer: Phil Ottlinger 
Committed: Mon Nov 28 22:40:51 2016 +0100

--
 .../01-minimal/findbugs/findbugs-exclude.xml| 136 +++
 1 file changed, 136 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ac0c0838/examples/01-minimal/findbugs/findbugs-exclude.xml
--
diff --git a/examples/01-minimal/findbugs/findbugs-exclude.xml 
b/examples/01-minimal/findbugs/findbugs-exclude.xml
new file mode 100644
index 000..50255d9
--- /dev/null
+++ b/examples/01-minimal/findbugs/findbugs-exclude.xml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

[2/2] incubator-tamaya git commit: [TAMAYA-164] All classes related to the output of the banner are now only within the org.apache.tamaya package available.

[plexus]

[TAMAYA-164] All classes related to the output of the banner are now only 
within the org.apache.tamaya package available.


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

Branch: refs/heads/master
Commit: dcd3e69e302ef597c16fa2379c50ecaff6d4ff29
Parents: 4bce88a
Author: Oliver B. Fischer 
Authored: Sat Nov 19 21:25:32 2016 +0100
Committer: Oliver B. Fischer 
Committed: Thu Nov 24 21:20:57 2016 +0100

--
 .../java/org/apache/tamaya/BannerManager.java   | 136 +++
 .../java/org/apache/tamaya/BannerPrinter.java   |  21 +++
 .../apache/tamaya/ConfigurationProvider.java|   1 -
 .../tamaya/banner/AbstractBannerPrinter.java|  59 
 .../org/apache/tamaya/banner/BannerManager.java |  58 
 .../org/apache/tamaya/banner/BannerPrinter.java |  31 -
 .../tamaya/banner/ConsoleBannerPrinter.java |  29 
 .../tamaya/banner/LoggingBannerPrinter.java |  33 -
 .../tamaya/banner/SilentBannerPrinter.java  |  28 
 .../org/apache/tamaya/BannerManagerTest.java|  74 ++
 .../apache/tamaya/banner/BannerManagerTest.java |  74 --
 11 files changed, 231 insertions(+), 313 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/dcd3e69e/code/api/src/main/java/org/apache/tamaya/BannerManager.java
--
diff --git a/code/api/src/main/java/org/apache/tamaya/BannerManager.java 
b/code/api/src/main/java/org/apache/tamaya/BannerManager.java
new file mode 100644
index 000..9ae81bc
--- /dev/null
+++ b/code/api/src/main/java/org/apache/tamaya/BannerManager.java
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+package org.apache.tamaya;
+
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class BannerManager {
+enum BannerTarget {
+OFF, CONSOLE, LOGGER
+}
+
+private BannerTarget bannerTarget;
+
+public BannerManager(String value) {
+value = Objects.requireNonNull(value).toUpperCase(Locale.getDefault());
+
+try {
+bannerTarget = BannerTarget.valueOf(value);
+} catch (NullPointerException | IllegalArgumentException e) {
+bannerTarget = BannerTarget.OFF;
+}
+}
+
+public void outputBanner() {
+BannerPrinter bp = new SilentBannerPrinter();
+
+switch (bannerTarget) {
+case CONSOLE:
+bp = new ConsoleBannerPrinter();
+break;
+case LOGGER:
+bp = new LoggingBannerPrinter();
+break;
+case OFF:
+default:
+break;
+}
+
+bp.outputBanner();
+}
+}
+
+abstract class AbstractBannerPrinter implements BannerPrinter {
+private static final Logger log = 
Logger.getLogger(AbstractBannerPrinter.class.getName());
+
+@Override
+public void outputBanner() {
+try {
+URL url = 
ConfigurationProvider.class.getResource("/tamaya-banner.txt");
+
+if (url != null) {
+Path path = Paths.get(url.toURI());
+List content = Files.readAllLines(path, 
StandardCharsets.UTF_8);
+
+for (String line : content) {
+outputSingleLine(line);
+}
+}
+} catch (Exception e) {
+log.log(Level.FINE, "Failed to output the banner of tamaya.", e);
+}
+}
+
+abstract void outputSingleLine(String line);
+}
+
+
+/**
+ * Outputs the Tamaya banner to an implementation 

[2/2] incubator-tamaya git commit: [TAMAYA-180] Removed the examples from the master branch.

[plexus]

[TAMAYA-180] Removed the examples from the master branch.


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

Branch: refs/heads/master
Commit: 7aafa22609a77fcca5c264e26317732e9b255b57
Parents: 973e62e
Author: Oliver B. Fischer 
Authored: Thu Oct 6 00:11:39 2016 +0200
Committer: Oliver B. Fischer 
Committed: Thu Oct 6 00:11:39 2016 +0200

--
 examples/1-minimal-example/pom.xml  |  50 --
 .../tamaya/examples/resolver/ExampleMain.java   |  58 ---
 .../META-INF/javaconfiguration.properties   |  26 
 .../tamaya/examples/minimal/MinimalTests.java   |  99 
 .../org/tamaya/examples/minimal/TestEnum.java   |  26 
 .../META-INF/javaconfiguration.properties   |  27 
 .../2-simple-propertysource-example/pom.xml |  46 --
 .../tamaya/examples/simple/ExampleMain.java |  63 
 .../examples/simple/SimplePropertySource.java   |  62 
 .../simple/SimplePropertySourceProvider.java|  48 --
 .../META-INF/MyOtherConfigProperties.properties |  21 ---
 .../META-INF/javaconfiguration.properties   |  25 ---
 .../org.apache.tamaya.spi.PropertySource|  20 ---
 ...org.apache.tamaya.spi.PropertySourceProvider |  19 ---
 .../src/main/resources/cfgOther/a.properties|  19 ---
 .../src/main/resources/cfgOther/b.properties|  19 ---
 .../src/main/resources/cfgOther/c.properties|  20 ---
 examples/3-resources-example/pom.xml|  52 ---
 .../tamaya/examples/resources/ExampleMain.java  |  63 
 .../resources/MyPathPropertySourceProvider.java |  42 -
 .../META-INF/MyOtherConfigProperties.properties |  21 ---
 .../META-INF/javaconfiguration.properties   |  25 ---
 ...org.apache.tamaya.spi.PropertySourceProvider |  19 ---
 .../main/resources/cfgOther/subs/a.properties   |  19 ---
 .../main/resources/cfgOther/subs/b.properties   |  19 ---
 .../main/resources/cfgOther/subs/c.properties   |  19 ---
 examples/4-resolver-example/pom.xml |  55 ---
 .../tamaya/examples/resolver/ExampleMain.java   |  63 
 .../META-INF/javaconfiguration.properties   |  32 
 .../src/main/resources/buildata |  19 ---
 .../tamaya/examples/minimal/MinimalTests.java   |  98 
 .../org/tamaya/examples/minimal/TestEnum.java   |  26 
 .../META-INF/javaconfiguration.properties   |  24 ---
 examples/5-injection-example/pom.xml|  71 -
 .../tamaya/examples/injection/Example.java  |  48 --
 .../tamaya/examples/injection/ExampleMain.java  |  51 ---
 .../examples/injection/ExampleTemplate.java |  40 -
 .../META-INF/javaconfiguration.properties   |  27 
 .../tamaya/examples/minimal/MinimalTests.java   |  98 
 .../org/tamaya/examples/minimal/TestEnum.java   |  26 
 .../META-INF/javaconfiguration.properties   |  25 ---
 examples/6-fileobserver-example/pom.xml |  67 
 .../fileobserver/ObservedConfigExampleTest.java | 139 -
 .../examples/fileobserver/TestConfigView.java   | 153 ---
 .../fileobserver/TestObservingProvider.java |  38 -
 ...org.apache.tamaya.spi.PropertySourceProvider |  20 ---
 .../src/test/resources/test.properties  |  21 ---
 examples/7-builder-example/pom.xml  |  65 
 .../examples/builder/UsingABuilderExample.java  |  45 --
 examples/8-remote-example/client/pom.xml|  80 --
 .../tamaya/examples/remote/client/Client.java   |  98 
 .../remote/client/PrintConfigServlet.java   |  78 --
 .../org.apache.tamaya.spi.PropertySource|  19 ---
 examples/8-remote-example/pom.xml   |  69 -
 examples/8-remote-example/server/pom.xml| 135 
 .../server/src/main/java/ExampleServer.java |  33 
 .../META-INF/javaconfiguration.properties   |  31 
 .../server/src/main/resources/config-server.yml |  29 
 examples/pom.xml|  83 --
 pom.xml |   1 -
 60 files changed, 2834 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7aafa226/examples/1-minimal-example/pom.xml
--
diff --git a/examples/1-minimal-example/pom.xml 
b/examples/1-minimal-example/pom.xml
deleted file mode 100644
index c9d157f..000
--- a/examples/1-minimal-example/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-http://maven.apache.org/POM/4.0.0; 

[2/2] incubator-tamaya git commit: TAMAYA-163: Fixed issues with both injection variants running on JBoss EAP 7.0.0.GA (WildFly Core 2.1.2.Final-redhat-1).

[anatole]

TAMAYA-163: Fixed issues with both injection variants running on JBoss EAP 
7.0.0.GA (WildFly Core 2.1.2.Final-redhat-1).


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

Branch: refs/heads/master
Commit: 4e54af6c577b3c0520ccb851fbbae32ecbce3567
Parents: dba3421
Author: anatole 
Authored: Fri Aug 26 09:08:05 2016 +0200
Committer: anatole 
Committed: Fri Aug 26 09:08:29 2016 +0200

--
 .../integration/cdi/CDIAwareServiceContext.java | 169 
 .../cdi/DefaultConfigurationContext.java| 286 +
 .../cdi/DefaultConfigurationContextBuilder.java | 152 +++
 .../tamaya/integration/cdi/EnumConverter.java   |  71 +++
 .../cdi/PropertyConverterManager.java   | 427 +++
 .../integration/cdi/SEInjectorCDIExtension.java | 112 +
 .../cdi/ServiceLoaderServiceContext.java| 151 +++
 .../integration/cdi/TamayaCDIIntegration.java   |  52 +++
 .../integration/cdi/TamayaConfigProvider.java   |  54 +++
 .../cdi/internal/CDIAwareServiceContext.java| 166 ---
 .../internal/DefaultConfigurationContext.java   | 286 -
 .../DefaultConfigurationContextBuilder.java | 152 ---
 .../integration/cdi/internal/EnumConverter.java |  71 ---
 .../cdi/internal/PropertyConverterManager.java  | 427 ---
 .../cdi/internal/SEInjectorCDIExtension.java| 112 -
 .../cdi/internal/TamayaCDIIntegration.java  |  52 ---
 .../cdi/internal/TamayaConfigProvider.java  |  54 ---
 .../javax.enterprise.inject.spi.Extension   |   4 +-
 .../org.apache.tamaya.spi.ServiceContext|   2 +-
 modules/integration/cdi/pom.xml | 120 +++---
 .../integration/cdi/ConfigurationExtension.java |  12 +
 .../javax.enterprise.inject.spi.Extension   |   1 +
 .../cdi/ConfigurationResolverTest.java  |  32 +-
 23 files changed, 1567 insertions(+), 1398 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4e54af6c/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/CDIAwareServiceContext.java
--
diff --git 
a/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/CDIAwareServiceContext.java
 
b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/CDIAwareServiceContext.java
new file mode 100644
index 000..566d00e
--- /dev/null
+++ 
b/modules/integration/cdi-se/src/main/java/org/apache/tamaya/integration/cdi/CDIAwareServiceContext.java
@@ -0,0 +1,169 @@
+/*
+ * 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.
+ */
+package org.apache.tamaya.integration.cdi;
+
+import org.apache.tamaya.ConfigException;
+import org.apache.tamaya.spi.ServiceContext;
+
+import javax.annotation.Priority;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+/**
+ * This class implements a {@link ServiceContext}, which basically provides 
a similar loading mechanism as used
+ * by the {@link java.util.ServiceLoader}. Whereas the {@link 
java.util.ServiceLoader} only loads configurations
+ * and instances from one classloader, this loader manages configs found and 
the related instances for each
+ * classloader along the classloader hierarchies individually. It ensures 
instances are loaded on the classloader
+ * level, where they first are visible. Additionally it ensures the same 
configuration resource (and its
+ * declared services) are loaded multiple times, when going up the classloader 
hierarchy.
+ *
+ * Finally classloaders are not stored 

[2/2] incubator-tamaya git commit: TAMAYA-156: Bugfix: now honoring the enabled/disabled setting for usage reporting (added test as well).

[anatole]

TAMAYA-156: Bugfix: now honoring the enabled/disabled setting for usage 
reporting (added test as well).


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

Branch: refs/heads/master
Commit: e9a406b949321cb233ceb1dba6489f79472a830d
Parents: 9f07d41
Author: anatole 
Authored: Sat Apr 30 21:51:48 2016 +0200
Committer: anatole 
Committed: Sat Apr 30 21:51:48 2016 +0200

--
 .../java/org/apache/tamaya/model/internal/DefaultUsageTracker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e9a406b9/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
--
diff --git 
a/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
 
b/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
index 03b5bd5..9a502a4 100644
--- 
a/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
+++ 
b/modules/model/src/main/java/org/apache/tamaya/model/internal/DefaultUsageTracker.java
@@ -107,7 +107,7 @@ public class DefaultUsageTracker implements UsageTrackerSpi{
 @Override
 public void trackSingleKeyAccess(String key, String value){
 // Ignore meta-entries
-if(key.startsWith("_")){
+if(!isUsageTrackingEnabled() || key.startsWith("_")){
 return;
 }
 Usage usage = this.usages.get(key);

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

[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/abff0e5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/abff0e5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/abff0e5f

Branch: refs/heads/vote02-tamaya-0.2-incubating
Commit: abff0e5f16afac3fa102a4c692de6213c4a3d1f1
Parents: e684d7e
Author: anatole 
Authored: Tue Apr 5 18:57:04 2016 +0200
Committer: anatole 
Committed: Tue Apr 5 18:57:04 2016 +0200

--
 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/abff0e5f/buildconfigurations/pom.xml
--
diff --git a/buildconfigurations/pom.xml b/buildconfigurations/pom.xml
index 8e42cf8..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
 
-  vote02-tamaya-0.2-incubating
+  HEAD
   
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/abff0e5f/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/abff0e5f/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: [maven-release-plugin] prepare for next development iteration

[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/1864bb75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/1864bb75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/1864bb75

Branch: refs/heads/vote-tamaya-0.2-incubating
Commit: 1864bb75a12ab06f0438af74377da2501f5bf25f
Parents: 8f461db
Author: anatole 
Authored: Wed Mar 23 23:50:57 2016 +0100
Committer: anatole 
Committed: Wed Mar 23 23:50:57 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/1864bb75/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/1864bb75/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/1864bb75/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.

[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
 
 
 

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

[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}

[2/2] incubator-tamaya git commit: Fixed several build warnings.

[anatole]

Fixed several build warnings.


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

Branch: refs/heads/master
Commit: 5a5d637cbd3d3286c5dcc0e5dac624d6c1177219
Parents: 8f37dd7
Author: anatole 
Authored: Tue Mar 15 10:42:00 2016 +0100
Committer: anatole 
Committed: Tue Mar 15 10:42:00 2016 +0100

--
 modules/integration/cdi-se/pom.xml  | 3 +--
 .../org/apache/tamaya/integration/cdi/DefaultDynamicValue.java  | 1 -
 modules/integration/osgi/pom.xml| 5 +
 .../main/java/org/apache/tamaya/model/spi/ParameterModel.java   | 2 +-
 .../java/org/apache/tamaya/optional/OptionalConfiguration.java  | 4 +---
 modules/server/pom.xml  | 3 ---
 .../java/org/apache/tamaya/server/ConfigurationResource.java| 3 ---
 .../main/java/org/apache/tamaya/server/VersionProperties.java   | 2 +-
 8 files changed, 5 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/integration/cdi-se/pom.xml
--
diff --git a/modules/integration/cdi-se/pom.xml 
b/modules/integration/cdi-se/pom.xml
index c3bda9a..a0dfc3f 100644
--- a/modules/integration/cdi-se/pom.xml
+++ b/modules/integration/cdi-se/pom.xml
@@ -60,8 +60,7 @@ under the License.
 
 
 
-org.apache.tamaya.integration.cdi,
-org.apache.tamaya.integration.cdi.config,
+org.apache.tamaya.integration.cdi.config
 
 
 org.apache.tamaya.integration.cdi.internal

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
--
diff --git 
a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
 
b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
index 3b436a5..98ee05a 100644
--- 
a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
+++ 
b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java
@@ -20,7 +20,6 @@ package org.apache.tamaya.integration.cdi;
 
 import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.TypeLiteral;
 import org.apache.tamaya.inject.api.BaseDynamicValue;
 import org.apache.tamaya.inject.api.DynamicValue;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/integration/osgi/pom.xml
--
diff --git a/modules/integration/osgi/pom.xml b/modules/integration/osgi/pom.xml
index f668edc..3d25028 100644
--- a/modules/integration/osgi/pom.xml
+++ b/modules/integration/osgi/pom.xml
@@ -48,11 +48,8 @@
 
 
 
-
org.apache.tamaya.integration.osgi.genereal.Activator
+org.apache.tamaya.integration.osgi.Activator
 
-
-org.tamaya.integration.osgi.general
-
 
 org.osgi.service.cm.ConfigurationAdmin
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5a5d637c/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
--
diff --git 
a/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java 
b/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
index 7e28682..43d7174 100644
--- 
a/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
+++ 
b/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterModel.java
@@ -169,7 +169,7 @@ public class ParameterModel extends AbstractModel {
 try {
 this.type = Class.forName("java.lang."+type);
 } catch (ClassNotFoundException e2) {
-Logger.getLogger(getClass().getName()).log(Level.WARNING, 
"Failed to load parameter type: " + type, e2);

[2/2] incubator-tamaya git commit: Fixed javadocs issues.

[anatole]

Fixed javadocs issues.


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

Branch: refs/heads/master
Commit: 38b4a967b6bcae9f00e1b58663b7b61b1dd348a4
Parents: 9b7fed4
Author: anatole 
Authored: Tue Mar 15 00:52:20 2016 +0100
Committer: anatole 
Committed: Tue Mar 15 01:42:50 2016 +0100

--
 .../tamaya/consul/ConsulPropertySource.java |   4 +-
 .../apache/tamaya/etcd/EtcdPropertySource.java  |   4 +-
 .../mutableconfig/MutableConfiguration.java |   6 +-
 .../MutableConfigurationProvider.java   |   3 +
 .../AbstractMutablePropertySource.java  |  23 +--
 .../propertysources/ConfigChangeContext.java| 152 +++
 .../MutablePropertiesPropertySource.java|   9 +-
 .../MutableXmlPropertiesPropertySource.java |   9 +-
 .../propertysources/TransactionContext.java | 152 ---
 .../spi/MutablePropertySource.java  |   8 +
 .../PropertiesFileConfigBackendTest.java|  10 --
 11 files changed, 190 insertions(+), 190 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/38b4a967/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
--
diff --git 
a/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
 
b/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
index b4227a8..9b61840 100644
--- 
a/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
+++ 
b/modules/integration/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
@@ -24,7 +24,7 @@ import com.orbitz.consul.Consul;
 import com.orbitz.consul.KeyValueClient;
 import com.orbitz.consul.model.kv.Value;
 import 
org.apache.tamaya.mutableconfig.propertysources.AbstractMutablePropertySource;
-import org.apache.tamaya.mutableconfig.propertysources.TransactionContext;
+import org.apache.tamaya.mutableconfig.propertysources.ConfigChangeContext;
 import org.apache.tamaya.spi.PropertyValue;
 import org.apache.tamaya.spi.PropertyValueBuilder;
 
@@ -165,7 +165,7 @@ public class ConsulPropertySource extends 
AbstractMutablePropertySource {
 }
 
 @Override
-protected void commitInternal(TransactionContext context) {
+protected void commitInternal(ConfigChangeContext context) {
 for(HostAndPort hostAndPort: ConsulBackends.getConsulBackends()){
 try{
 Consul consul = 
Consul.builder().withHostAndPort(hostAndPort).build();

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/38b4a967/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
--
diff --git 
a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
 
b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
index 9434f65..f84fd0d 100644
--- 
a/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
+++ 
b/modules/integration/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.etcd;
 
 import 
org.apache.tamaya.mutableconfig.propertysources.AbstractMutablePropertySource;
-import org.apache.tamaya.mutableconfig.propertysources.TransactionContext;
+import org.apache.tamaya.mutableconfig.propertysources.ConfigChangeContext;
 import org.apache.tamaya.spi.PropertyValue;
 import org.apache.tamaya.spi.PropertyValueBuilder;
 
@@ -167,7 +167,7 @@ public class EtcdPropertySource extends 
AbstractMutablePropertySource{
 }
 
 @Override
-protected void commitInternal(TransactionContext context) {
+protected void commitInternal(ConfigChangeContext context) {
 for(EtcdAccessor accessor: EtcdBackends.getEtcdBackends()){
 try{
 for(String k: context.getRemovedProperties()){

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/38b4a967/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
--
diff --git 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfiguration.java
index 4108928..ac0b10d 100644
--- 

[2/2] incubator-tamaya git commit: Fixed quality issues and compile errors.

[anatole]

Fixed quality issues and compile errors.


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

Branch: refs/heads/master
Commit: cb425996a7ecb8eddeb55cd8e0d09a9f80ce0f73
Parents: 8873c20
Author: anatole 
Authored: Mon Mar 14 19:25:05 2016 +0100
Committer: anatole 
Committed: Mon Mar 14 19:25:05 2016 +0100

--
 .../tamaya/mutableconfig/MutableConfigurationProvider.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cb425996/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
--
diff --git 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
index 56c0e2a..67e971f 100644
--- 
a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
+++ 
b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java
@@ -43,7 +43,7 @@ public final class MutableConfigurationProvider {
 /**
  * URIs used by this query instance to identify the backends to use for 
write operations.
  */
-private static final MutableConfigurationProviderSpi 
mutableConfigurationProviderSpi = loadSpi();
+private static MutableConfigurationProviderSpi 
mutableConfigurationProviderSpi = loadSpi();
 
 /**
  * SPI loader method.
@@ -53,8 +53,8 @@ public final class MutableConfigurationProvider {
 private static MutableConfigurationProviderSpi loadSpi() {
 try{
 return ServiceContextManager.getServiceContext().getService(
-MutableConfigurationProviderSpi.class)  ;  }
-catch(Exception e){
+MutableConfigurationProviderSpi.class)  ;
+} catch(Exception e){
 throw new ConfigException("Failed to initialize 
MutableConfigurationProviderSpi - " +
 "mutable configuration support.");
 }

[2/2] incubator-tamaya git commit: TAMAYA-87 Implemeted support for org.joda.time.DateTimeZone.

[plexus]

TAMAYA-87 Implemeted support for org.joda.time.DateTimeZone.


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

Branch: refs/heads/master
Commit: 80ece9835c210c23cb0c5dcec79bb3fb9af8bbab
Parents: e4971a1
Author: Oliver B. Fischer 
Authored: Sun Mar 6 23:24:01 2016 +0100
Committer: Oliver B. Fischer 
Committed: Sun Mar 6 23:24:01 2016 +0100

--
 .../tamaya/jodatime/DateTimeZoneConverter.java  | 22 +---
 .../jodatime/DateTimeZoneConverterTest.java | 20 ++
 2 files changed, 35 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80ece983/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java
--
diff --git 
a/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java
 
b/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java
index bf18393..198a345 100644
--- 
a/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java
+++ 
b/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/DateTimeZoneConverter.java
@@ -26,14 +26,25 @@ import java.util.regex.Pattern;
 
 import static java.util.Objects.requireNonNull;
 
+/**
+ * Converter, converting from {@code String} to Joda-Time's
+ * {@code DateTimeZone}.
+ *
+ * This converter supports the conversion from a numerich time zone
+ * information in the format {@code [+-]hh:mm} as well as from
+ * all time zone ids supported by Joda Time.
+ *
+ * @see DateTimeZone
+ * @see DateTimeZone#getAvailableIDs()
+ */
 public class DateTimeZoneConverter implements PropertyConverter {
-private static final Pattern IS_INTEGER_VALUE = 
Pattern.compile("(\\+|-)?\\d+");
+private static final String PATTERN_REGEX = "(\\+|-)?\\d+";
+private static final Pattern IS_INTEGER_VALUE = 
Pattern.compile(PATTERN_REGEX);
 
 @Override
 public DateTimeZone convert(String value, ConversionContext context) {
-if (true == true) throw new RuntimeException("Method must catch up 
with the current API!");
-
 String trimmed = requireNonNull(value).trim();
+addSupportedFormats(context);
 
 DateTimeZone result = null;
 
@@ -52,6 +63,11 @@ public class DateTimeZoneConverter implements 
PropertyConverter {
 return result;
 }
 
+private void addSupportedFormats(ConversionContext context) {
+context.addSupportedFormats(DateTimeZoneConverter.class, "Time zone in 
the form [+-]hh:mm via the regex " + PATTERN_REGEX);
+context.addSupportedFormats(DateTimeZoneConverter.class, "All time 
zone ids supported by Joda Time");
+}
+
 private boolean isSingleIntegerValue(String value) {
 boolean match = IS_INTEGER_VALUE.matcher(value).matches();
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80ece983/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterTest.java
--
diff --git 
a/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterTest.java
 
b/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterTest.java
index 6620044..babbe06 100644
--- 
a/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterTest.java
+++ 
b/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterTest.java
@@ -18,7 +18,9 @@
  */
 package org.apache.tamaya.jodatime;
 
+import org.apache.tamaya.TypeLiteral;
 import org.apache.tamaya.spi.ConversionContext;
+import org.apache.tamaya.spi.ConversionContext.Builder;
 import org.joda.time.DateTimeZone;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -28,11 +30,13 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
 
 public class DateTimeZoneConverterTest {
 private DateTimeZoneConverter converter = new DateTimeZoneConverter();
 
-@Ignore
 @Test
 public void canConvertDateTimeZoneInformation() {
 Object[][] inputResultPairs = {
@@ -63,7 +67,6 @@ public class DateTimeZoneConverterTest {
 }
 }
 
-@Ignore
 @Test
 public void invalidInputValuesResultInReturningNull() {
 String[] 

[2/2] incubator-tamaya git commit: TAMAYA-114: Tested and implemented base functionality.

[anatole]

TAMAYA-114: Tested and implemented base functionality.


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

Branch: refs/heads/master
Commit: d35748875c0fba5c417a7bedb0e8e7ba4044a4e2
Parents: 7c60a96
Author: anatole 
Authored: Mon Feb 15 17:25:02 2016 +0100
Committer: anatole 
Committed: Mon Feb 15 17:25:02 2016 +0100

--
 .../internal/AdaptiveCombinationPolicy.java |  12 +-
 .../internal/ArrayListConverter.java|  10 +-
 .../internal/CollectionConverter.java   |  30 ++-
 .../internal/ConcurrentHashMapConverter.java|  14 +-
 .../collections/internal/HashMapConverter.java  |   4 +-
 .../collections/internal/HashSetConverter.java  |   4 +-
 .../internal/LinkedListConverter.java   |  13 +-
 .../collections/internal/ListConverter.java |  21 +-
 .../collections/internal/MapConverter.java  |  25 ++-
 .../collections/internal/SetConverter.java  |  21 +-
 .../collections/internal/TreeSetConverter.java  |   2 +-
 .../org.apache.tamaya.spi.PropertyConverter |   1 +
 .../collections/CollectionsBaseTests.java   | 202 ++-
 .../CollectionsTypedReadOnlyTests.java  | 199 +++---
 .../collections/CollectionsTypedTests.java  | 165 ---
 .../META-INF/javaconfiguration.properties   |  34 
 16 files changed, 525 insertions(+), 232 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d3574887/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
--
diff --git 
a/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
 
b/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
index 161e874..63fea76 100644
--- 
a/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
+++ 
b/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
@@ -24,6 +24,7 @@ import org.apache.tamaya.spi.PropertyValue;
 import org.apache.tamaya.spi.PropertyValueCombinationPolicy;
 
 import javax.annotation.Priority;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -88,14 +89,21 @@ public class AdaptiveCombinationPolicy implements 
PropertyValueCombinationPolicy
 case "SortedMap":
 PropertyValue newValue = propertySource.get(key);
 if(newValue!=null){
-Map newMapValue = new 
HashMap<>(currentValue);
+Map newMapValue = new HashMap<>();
+if(currentValue!=null){
+newMapValue.putAll(currentValue);
+}
 String oldVal = newMapValue.get(key);
+newMapValue.putAll(newValue.getConfigEntries());
 if(oldVal!=null){
 newMapValue.put(key,oldVal + ',' + 
newValue.getValue());
 }
 return newMapValue;
 }else{
-return newValue.getConfigEntries();
+if(currentValue!=null){
+return currentValue;
+}
+return Collections.emptyMap();
 }
 default:
 LOG.log(Level.SEVERE, "Unsupported collection-type for 
key: " + key + ": " + collectionType);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d3574887/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java
--
diff --git 
a/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java
 
b/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java
index 4c6b06d..e55b44a 100644
--- 
a/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java
+++ 
b/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java
@@ -47,8 +47,8 @@ public class ArrayListConverter implements 
PropertyConverter {
 
 @Override
 public ArrayList convert(String value, ConversionContext context) {
-

[2/2] incubator-tamaya git commit: Added test and fixes for collection support.

[anatole]

Added test and fixes for collection support.


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

Branch: refs/heads/master
Commit: 609b476485fc75aafbc099c2a6678004b7e76f67
Parents: 30ad130
Author: anatole 
Authored: Mon Feb 15 01:51:23 2016 +0100
Committer: anatole 
Committed: Mon Feb 15 01:51:23 2016 +0100

--
 .../java/org/apache/tamaya/TypeLiteral.java | 10 
 .../core/internal/PropertyConverterManager.java | 13 ++
 .../internal/AdaptiveCombinationPolicy.java |  7 +
 .../collections/internal/HashMapConverter.java  | 27 
 .../internal/LinkedListConverter.java   |  2 +-
 .../collections/internal/SetConverter.java  |  2 +-
 .../collections/internal/TreeMapConverter.java  |  6 ++---
 .../collections/internal/TreeSetConverter.java  |  4 +--
 8 files changed, 54 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/609b4764/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
--
diff --git a/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java 
b/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
index 597c27c..729f2b6 100644
--- a/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
+++ b/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
@@ -48,14 +48,14 @@ public class TypeLiteral implements Serializable {
  * Constructor.
  * @param definedType the defined type.
  */
-protected TypeLiteral(Type definedType) {
+public TypeLiteral(Type definedType) {
 this.definedType = definedType;
 }
 
 /**
  * Constructor only for directly implemeting a TypeLiteral hereby 
dynamically implementing a generic interface.
  */
-protected TypeLiteral() {
+public TypeLiteral() {
 this.definedType = getDefinedType(this.getClass());
 }
 
@@ -140,9 +140,7 @@ public class TypeLiteral implements Serializable {
 
 Type superClazz = clazz.getGenericSuperclass();
 
-if (superClazz.equals(Object.class)) {
-throw new RuntimeException("Super class must be parametrized 
type");
-} else if (superClazz instanceof ParameterizedType) {
+if (superClazz instanceof ParameterizedType) {
 ParameterizedType pt = (ParameterizedType) superClazz;
 Type[] actualArgs = pt.getActualTypeArguments();
 
@@ -153,6 +151,8 @@ public class TypeLiteral implements Serializable {
 throw new RuntimeException("More than one parametric type");
 }
 
+} else if (superClazz.equals(Object.class)) {
+throw new RuntimeException("Super class must be parametrized 
type");
 } else {
 type = getDefinedType((Class) superClazz);
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/609b4764/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
--
diff --git 
a/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
 
b/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
index eb18cfb..72facc4 100644
--- 
a/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
+++ 
b/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
@@ -273,6 +273,19 @@ public class PropertyConverterManager {
 converterList.addAll(converters);
 }
 }
+// check for parametrized types, ignoring param type
+// direct mapped converters
+if(targetType.getType()!=null) {
+try {
+readLock.lock();
+converters = 
List.class.cast(this.converters.get(TypeLiteral.of(targetType.getRawType(;
+} finally {
+readLock.unlock();
+}
+if (converters != null) {
+converterList.addAll(converters);
+}
+}
 return converterList;
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/609b4764/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
--
diff --git 
a/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
 

[2/2] incubator-tamaya git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya

[anatole]

Merge branch 'master' of 
https://git-wip-us.apache.org/repos/asf/incubator-tamaya


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

Branch: refs/heads/master
Commit: af2255afd85fed94cd57d15e23083891ac0d19f4
Parents: ddd2955 2e7933a
Author: anatole 
Authored: Tue Jan 19 08:45:51 2016 +0100
Committer: anatole 
Committed: Tue Jan 19 08:45:51 2016 +0100

--
 code/api/pom.xml|  2 +-
 code/core/pom.xml   |  2 +-
 .../etcd/internal/EtcdConfigChangeRequest.java  | 24 +++---
 .../mutableconfig/ConfigChangeRequest.java  |  2 +-
 src/site/asciidoc/extensions/index.adoc | 33 ++-
 src/site/asciidoc/extensions/mod_camel.adoc | 32 +-
 src/site/asciidoc/extensions/mod_cdi.adoc   | 32 +-
 .../extensions/mod_classloader_support.adoc | 32 +-
 .../asciidoc/extensions/mod_environment.adoc| 32 +-
 src/site/asciidoc/extensions/mod_etcd.adoc  | 32 +-
 src/site/asciidoc/extensions/mod_events.adoc| 34 +++-
 src/site/asciidoc/extensions/mod_formats.adoc   | 34 +++-
 src/site/asciidoc/extensions/mod_functions.adoc | 34 +++-
 src/site/asciidoc/extensions/mod_injection.adoc | 34 +++-
 src/site/asciidoc/extensions/mod_jodatime.adoc  | 34 +++-
 src/site/asciidoc/extensions/mod_json.adoc  | 17 ++
 .../asciidoc/extensions/mod_management.adoc | 34 +++-
 .../extensions/mod_metamodel-staged.adoc| 32 +-
 src/site/asciidoc/extensions/mod_model.adoc | 34 +++-
 .../asciidoc/extensions/mod_mutable_config.adoc | 34 +++-
 src/site/asciidoc/extensions/mod_optional.adoc  | 34 +++-
 src/site/asciidoc/extensions/mod_osgi.adoc  | 34 +++-
 src/site/asciidoc/extensions/mod_remote.adoc| 34 +++-
 .../asciidoc/extensions/mod_spi-support.adoc| 32 +-
 src/site/asciidoc/extensions/mod_spring.adoc| 31 +-
 25 files changed, 382 insertions(+), 327 deletions(-)
--

[2/2] incubator-tamaya git commit: Adapted comments to changes in events module.

[anatole]

Adapted comments to changes in events 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/cb08b1e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/cb08b1e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/cb08b1e4

Branch: refs/heads/master
Commit: cb08b1e4338059dca5072c5a1715f5534a10590a
Parents: ef44f42
Author: anatole 
Authored: Sun Dec 20 11:54:04 2015 +0100
Committer: anatole 
Committed: Sun Dec 20 11:54:04 2015 +0100

--
 src/site/asciidoc/extensions/mod_events.adoc | 233 +-
 1 file changed, 134 insertions(+), 99 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cb08b1e4/src/site/asciidoc/extensions/mod_events.adoc
--
diff --git a/src/site/asciidoc/extensions/mod_events.adoc 
b/src/site/asciidoc/extensions/mod_events.adoc
index 237b47c..ffed04a 100644
--- a/src/site/asciidoc/extensions/mod_events.adoc
+++ b/src/site/asciidoc/extensions/mod_events.adoc
@@ -75,30 +75,24 @@ for event handling and observation:
 [source,java]
 .ConfigEvent
 
-public final class ConfigEvent {
-
-public ConfigEvent() {
-}
-
-public static void addListener(ConfigEventListener l);
-public static void removeListener(ConfigEventListener l);
-public static void fireEvent(Object event);
-public static  void fireEvent(T event, Class eventType);
+public final interface ConfigEvent {
 
+Class getResourceType();
+T getResource();
+String getVersion();
+long getTimestamp();
 }
 
 // @FunctionalInterface
-public interface ConfigEventListener {
-/**
- * Called if an event occurred.
- * @param event the event, not null.
- */
-void onConfigEvent(T event);
+public interface ConfigEventListener {
+
+void onConfigEvent(ConfigEvent event);
 
 }
 
 
-This mechanism can now be used to propagate configuration changes to all 
interested stakeholders. The next sections
+This mechanism can now be used to propagate configuration changes to all 
interested stakeholders. Hereby the payloed
+can be basically arbitrary as long as it implements the +ConfigEvent+ 
interface. The next sections
 give more details on the the provided event implementations and abstractions 
that are used to implement such
 features.
 
@@ -123,24 +117,34 @@ public enum ChangeType {
 }
 ---
 
-This enum type is used within the +ConfigurationChange+ class:
+This enum type is used within the +ConfigurationChange+ class, which 
implements the event sent for a changed
++Configuration+:
 
 [source,java]
 ---
-public final class ConfigurationChange implements Serializable{
+public final class ConfigurationChange implements ConfigEvent, 
Serializable{
 
 public static ConfigurationChange emptyChangeSet(Configuration 
configuration);
 
-public Configuration getConfiguration();
-
+@Override
+public Configuration getResource();
+@Override
+public Class getResourceType();
+@Override
 public String getVersion();
+@Override
+public long getTimestamp();
+@Override
 public long getTimestamp();
-public Collection getEvents();
 
+// Event specific methods
+
+public Collection getChanges();
 public int getRemovedSize();
 public int getAddedSize();
 public int getUpdatedSize();
 
+public boolean isKeyAffected(String key);
 public boolean isRemoved(String key);
 public boolean isAdded(String key);
 public boolean isUpdated(String key);
@@ -184,9 +188,11 @@ public final class MyConfigChangeListener implements 
ConfigChangeListener event){
+ if(event.getResourceTspe()==Configuration.class){
+ if(event.getConfiguration()==config){
+   // do something
+ }
  }
   }
 
@@ -195,16 +201,18 @@ public final class MyConfigChangeListener implements 
ConfigChangeListener, Serializable{
 
 public static ConfigurationContextChange emptyChangeSet();
 
+@Override
+public ConfigurationContext getResource();
+@Override
+public Class getResourceType();
+@Override
 public String getVersion();
+@Override
 public long getTimestamp();
+
+// specific methods
 public Collection getPropertySourceChanges();
 public Collection getPropertySourceUpdates();
 public Collection getRemovedPropertySources();
@@ -234,40 +249,53 @@ public final class ConfigurationContextChange implements 
Serializable{
 Similar to the +ConfigurationChange+ class you also must use a 

[2/2] incubator-tamaya git commit: Added Spring tests and ensured a minimal implementation.

[anatole]

Added Spring tests and ensured a minimal implementation.


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

Branch: refs/heads/master
Commit: 6fab0f93223056c5de48b07759e230ccbaae7002
Parents: 043a3e6
Author: anatole 
Authored: Thu Nov 12 01:24:52 2015 +0100
Committer: anatole 
Committed: Thu Nov 12 01:24:52 2015 +0100

--
 .../SpringConfigInjectionPostProcessor.java |  3 ++
 .../integration/spring/TamayaEnvironment.java   | 18 
 .../integration/spring/TamayaSpringConfig.java  | 10 +++-
 .../spring/TamayaSpringPropertySource.java  |  1 +
 .../spring/ConfiguredSpringBean.java| 10 
 .../integration/spring/SpringConfigTest2.java   | 48 
 .../META-INF/javaconfiguration.properties   |  3 +-
 .../test/resources/spring-config-scanOnly.xml   | 35 ++
 .../spring/src/test/resources/spring-config.xml |  2 -
 9 files changed, 126 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6fab0f93/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
--
diff --git 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
index 1193b8d..91f0047 100644
--- 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
+++ 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/SpringConfigInjectionPostProcessor.java
@@ -21,10 +21,13 @@ package org.apache.tamaya.integration.spring;
 import org.apache.tamaya.inject.ConfigurationInjection;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
 
 /**
  * PostProcessor that performs injection of configured values using Tamaya 
{@link ConfigurationInjection}.
  */
+@Component
 public class SpringConfigInjectionPostProcessor implements BeanPostProcessor{
 
 @Override

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6fab0f93/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaEnvironment.java
--
diff --git 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaEnvironment.java
 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaEnvironment.java
new file mode 100644
index 000..6f3214f
--- /dev/null
+++ 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaEnvironment.java
@@ -0,0 +1,18 @@
+package org.apache.tamaya.integration.spring;
+
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.env.SystemEnvironmentPropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by atsticks on 12.11.15.
+ */
+public class TamayaEnvironment extends StandardEnvironment{
+
+protected void customizePropertySources(MutablePropertySources 
propertySources) {
+super.customizePropertySources(propertySources);
+propertySources.addLast(new TamayaSpringPropertySource());
+}
+}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6fab0f93/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
--
diff --git 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
index e3adf3f..15e616e 100644
--- 
a/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
+++ 
b/modules/integration/spring/src/main/java/org/apache/tamaya/integration/spring/TamayaSpringConfig.java
@@ -24,6 +24,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import 
org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import 

[2/2] incubator-tamaya git commit: Quality fixes.

[anatole]

Quality fixes.


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

Branch: refs/heads/master
Commit: ceffee089884d76cca49e81f141e6a5cbffb23db
Parents: bc3c94a
Author: Anatole Tresch 
Authored: Thu Oct 29 13:33:13 2015 +0100
Committer: Anatole Tresch 
Committed: Thu Oct 29 13:33:13 2015 +0100

--
 .../aspache/tamaya/examples/fileobserver/TestConfigView.java  | 5 -
 .../org/apache/tamaya/integration/osgi/general/Activator.java | 6 --
 .../integration/osgi/general/TamayaConfigAdminImpl.java   | 7 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ceffee08/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
--
diff --git 
a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
 
b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
index 06a7733..0fdecbb 100644
--- 
a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
+++ 
b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
@@ -24,6 +24,7 @@ import org.apache.tamaya.ConfigQuery;
 import org.apache.tamaya.Configuration;
 import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.TypeLiteral;
+import org.apache.tamaya.spi.ConversionContext;
 import org.apache.tamaya.spi.PropertyConverter;
 
 import java.util.List;
@@ -109,9 +110,11 @@ public class TestConfigView implements ConfigOperator{
 if (value != null) {
 List converters = 
ConfigurationProvider.getConfigurationContext()
 .getPropertyConverters(type);
+ConversionContext ctx = new 
ConversionContext.Builder(ConfigurationProvider.getConfiguration(),
+key, type).build();
 for (PropertyConverter converter : converters) {
 try {
-T t = converter.convert(value);
+T t = converter.convert(value, ctx);
 if (t != null) {
 return t;
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ceffee08/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
--
diff --git 
a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
 
b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
index 564ac8a..c896c73 100644
--- 
a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
+++ 
b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
@@ -18,8 +18,10 @@
  */
 package org.apache.tamaya.integration.osgi.general;
 
-import org.apache.tamaya.inject.ConfigurationInjection;
-import org.osgi.framework.*;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ConfigurationAdmin;
 
 import java.util.Dictionary;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ceffee08/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java
--
diff --git 
a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java
 
b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java
index 6a75dfe..8454e08 100644
--- 
a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java
+++ 
b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java
@@ -26,7 +26,12 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.osgi.framework.*;
+import org.osgi.framework.BundleContext;
+import 

[2/2] incubator-tamaya git commit: TAMAYA 111: Add Classloader aware ServiceContext (Documentation).

[anatole]

TAMAYA 111: Add Classloader aware ServiceContext (Documentation).


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

Branch: refs/heads/master
Commit: d6e48286c7cac996e1f240abddfa67fcfb2159a2
Parents: 668a2ca
Author: anatole 
Authored: Sun Sep 27 23:53:30 2015 +0200
Committer: anatole 
Committed: Sun Sep 27 23:53:30 2015 +0200

--
 .../main/asciidoc/mod_classloader_support.adoc  | 109 +++
 docs/src/main/asciidoc/modules.adoc |   1 +
 2 files changed, 110 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d6e48286/docs/src/main/asciidoc/mod_classloader_support.adoc
--
diff --git a/docs/src/main/asciidoc/mod_classloader_support.adoc 
b/docs/src/main/asciidoc/mod_classloader_support.adoc
new file mode 100644
index 000..441ff7c
--- /dev/null
+++ b/docs/src/main/asciidoc/mod_classloader_support.adoc
@@ -0,0 +1,109 @@
+= Apache Tamaya -- Extension: Classloader Isolation Support
+
+:name: Tamaya
+:rootpackage: org.apache.tamaya.clsupport
+:title: Apache Tamaya Extension: Classloader Isolation Support
+:revdate: September 2015
+:authorinitials: ATR
+:author: Anatole Tresch
+: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::[]
+
+<<<
+:numbered!:
+<<<
+[[Remote]]
+== Tamaya Classloader Aware ServiceContext (Extension Module)
+=== Overview
+
+The Tamaya classloader support provides an alternative implementation of 
+java.util.ServiceLoader+, which is aware
+of classloaders, hereby preventing multiple loading of components within a 
classloader hierarchy.
+
+
+=== Compatibility
+
+The module is based on Java 7, so it will not run on Java 7 and beyond.
+
+
+=== Installation
+
+To benefit from configuration server support you only must add the 
corresponding dependency to your module:
+
+[source, xml]
+---
+
+  org.apache.tamaya.ext
+  tamaya-classloader-support
+  {tamayaVersion}
+
+---
+
+The component will auto.register its components and override the default 
+ServicceContext+ in use by default
+with an instance of type 
+org.apache.tamaya.clsupport.internal.CLAwareServiceContext+. This 
implementation returns
+a priority of +10+.
+
+=== How it Works
+
+Basically the component manages a +Map+ of all classloaders encountered. When 
services are accessed, the component
+will evaluate the services as follows:
+
+* the component walks up the class loader hierarchy.
+* in a next step the hierarchy is traversed down from the parent to the 
current classloader. Hereby it is checked
+  if the service list for the required type has been loaded already. If not 
the service configuration files are
+  evaluated.
+* This configuration file evaluation will ignore all resources already loaded 
by any of the already traversed parent
+  classloaders.
+* For each configuration file newly visible to the classloader currently 
traversed, the corresponding services are
+  loaded unleyy, the same service class already has been loaded by one its 
parent classloaders or another file
+  loaded with this classloader.
+* Finally all services found are returned as the full collection of services 
valid for the given context (classloader).
+
+This ensures no service is loaded multiple times, even when it is referenced 
multiple times in several service
+configurations. Additionally every service is loaded on the classloader where 
it is also declared the first time.
+
+
+=== Control Logging
+
+The service component by default only logs errors. But it is possible to 
change 

[2/2] incubator-tamaya git commit: Added CDI support module.

[anatole]

Added CDI support 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/54404e47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/54404e47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/54404e47

Branch: refs/heads/master
Commit: 54404e478ac63e6184a90a45b6028229ac9b7aea
Parents: 66c2ef6
Author: anatole 
Authored: Thu Sep 17 03:18:26 2015 +0200
Committer: anatole 
Committed: Thu Sep 17 03:18:26 2015 +0200

--
 modules/json/pom.xml|   4 +-
 sandbox/integration/cdi/pom.xml |   9 +-
 .../tamaya/integration/cdi/annot/Webapp.java|  37 --
 .../cdi/config/ConfiguredVetoExtension.java |  42 ++
 .../cdi/internal/CDIAwareServiceContext.java|   2 +-
 .../cdi/internal/CDIManagedConfiguration.java   |  37 --
 .../CDIManagedConfigurationContext.java |  74 
 .../CDIManagedSessionConfiguration.java |  51 ---
 .../cdi/internal/ConfigurationProducer.java |  52 ---
 .../cdi/internal/ConfiguredVetoExtension.java   |  42 --
 .../cdi/internal/DefaultConfiguration.java  | 268 
 .../internal/DefaultConfigurationContext.java   | 279 +
 .../DefaultConfigurationContextBuilder.java | 155 +++
 .../integration/cdi/internal/EnumConverter.java |  68 +++
 .../cdi/internal/PropertyConverterManager.java  | 409 +++
 .../cdi/internal/TamayaCDIIntegration.java  | 101 +
 .../internal/TamayaCDIIntegrationExtension.java |  34 --
 .../javax.enterprise.inject.spi.Extension   |   2 +-
 .../org.apache.tamaya.spi.ServiceContext|  19 +
 .../tamaya/integration/cdi/ConfiguredClass.java |  13 +-
 .../tamaya/integration/cdi/ConfiguredTest.java  |   6 +-
 .../integration/cdi/TestConfigProvider.java |  69 
 .../cdi/cfg/ProvidedPropertySource.java |  48 +++
 .../integration/cdi/cfg/TestConfigProvider.java |  50 +++
 .../integration/cdi/cfg/TestPropertySource.java |  59 +++
 sandbox/metamodels/simple/pom.xml   |   2 +-
 26 files changed, 1520 insertions(+), 412 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/54404e47/modules/json/pom.xml
--
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index 1ed1874..fb843c8 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -57,7 +57,7 @@ under the License.
 
 
 org.apache.tamaya.ext
-tamaya-resources
+tamaya-items
 ${project.version}
 
 
@@ -121,7 +121,7 @@ under the License.
 
 
 copyMain
-process-test-resources
+process-test-items
 
 copy
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/54404e47/sandbox/integration/cdi/pom.xml
--
diff --git a/sandbox/integration/cdi/pom.xml b/sandbox/integration/cdi/pom.xml
index 8433517..ffcdb12 100644
--- a/sandbox/integration/cdi/pom.xml
+++ b/sandbox/integration/cdi/pom.xml
@@ -74,8 +74,15 @@ under the License.
 
 
 org.apache.tamaya
-tamaya-core
+tamaya-java7-core
 ${project.version}
+test
+
+
+org.apache.tamaya
+tamaya-java7-api
+${project.version}
+provided
 
 
 org.apache.tamaya.ext

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/54404e47/sandbox/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/annot/Webapp.java
--
diff --git 
a/sandbox/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/annot/Webapp.java
 
b/sandbox/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/annot/Webapp.java
deleted file mode 100644
index 94ebe22..000
--- 
a/sandbox/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/annot/Webapp.java
+++ /dev/null
@@ -1,37 +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 

[2/2] incubator-tamaya git commit: TAMAYA-92: Removed dep on Jackson.

[anatole]

TAMAYA-92: Removed dep on Jackson.


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

Branch: refs/heads/master
Commit: 80995f40cc7e88aa22f347a1d30d7caa73f05ca7
Parents: 171b92d
Author: anatole anat...@apache.org
Authored: Tue Aug 25 14:02:38 2015 +0200
Committer: anatole anat...@apache.org
Committed: Tue Aug 25 14:02:38 2015 +0200

--
 pom.xml | 22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80995f40/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 990ac55..11ba8b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,8 @@ under the License.
 maven.javadoc.skipfalse/maven.javadoc.skip
 project.build.sourceEncodingUTF-8/project.build.sourceEncoding
 
project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
-jackson.version2.5.1/jackson.version
+json.spec.version1.0-alpha-1/json.spec.version
+johnzon.version0.9-incubating/johnzon.version
 junit.version4.12/junit.version
 
 !-- Dependency and plugin relate version properties go here --
@@ -301,20 +302,17 @@ under the License.
 /dependency
 
 dependency
-groupIdcom.fasterxml.jackson.core/groupId
-artifactIdjackson-databind/artifactId
-version${jackson.version}/version
-/dependency
-dependency
-groupIdcom.fasterxml.jackson.core/groupId
-artifactIdjackson-core/artifactId
-version${jackson.version}/version
+groupIdorg.apache.geronimo.specs/groupId
+artifactIdgeronimo-json_1.0_spec/artifactId
+version${json.spec.version}/version
 /dependency
+
 dependency
-groupIdcom.fasterxml.jackson.core/groupId
-artifactIdjackson-annotations/artifactId
-version${jackson.version}/version
+groupIdorg.apache.johnzon/groupId
+artifactIdjohnzon-core/artifactId
+version${johnzon.version}/version
 /dependency
+
 /dependencies
 /dependencyManagement
 

[2/2] incubator-tamaya git commit: Added NOTICE, DISCLAIMER, LICENSE to top firectory of bin distribution.

[anatole]

Added NOTICE, DISCLAIMER, LICENSE to top firectory of bin distribution.


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

Branch: refs/heads/master
Commit: 6f90739de77ae715db9cecef2e100dcf5430c697
Parents: a886bbd
Author: anatole anat...@apache.org
Authored: Sun Aug 16 15:40:09 2015 +0200
Committer: anatole anat...@apache.org
Committed: Sun Aug 16 15:40:09 2015 +0200

--
 distribution/src/main/assembly/distribution-bin.xml | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/6f90739d/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 ba880a3..ad3f179 100644
--- a/distribution/src/main/assembly/distribution-bin.xml
+++ b/distribution/src/main/assembly/distribution-bin.xml
@@ -222,6 +222,20 @@ under the License.
 outputDirectory//outputDirectory
 
directory${project.build.directory}/generated-documentation/apache-tamaya-docs-${project.version}/directory
 /fileSet
+fileSet
+directory${project.parent.basedir}/directory
+
+excludes
+exclude**/target/**/exclude
+/excludes
+
+includes
+includeDISCLAIMER/include
+includeNOTICE/include
+includeLICENSE/include
+/includes
+outputDirectory//outputDirectory
+/fileSet
 /fileSets
 
 

[2/2] incubator-tamaya git commit: Merge branch '0.1-incubating' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya into 0.1-incubating

[anatole]

Merge branch '0.1-incubating' of 
https://git-wip-us.apache.org/repos/asf/incubator-tamaya into 0.1-incubating


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

Branch: refs/heads/0.1-incubating
Commit: 498093dd119e9531035b99675cac180a3919bfe5
Parents: 37a5de0 5b0860f
Author: anatole atsti...@gmail.com
Authored: Thu Aug 6 07:23:13 2015 +0200
Committer: anatole atsti...@gmail.com
Committed: Thu Aug 6 07:23:13 2015 +0200

--

--

[2/2] incubator-tamaya git commit: TAMAYA-82: Added doc for json module.

[anatole]

TAMAYA-82: Added doc for json 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/c1c1122c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/c1c1122c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/c1c1122c

Branch: refs/heads/master
Commit: c1c1122cec6fde37c9bed5b6b96e2a7e38a0a602
Parents: 96d8066
Author: anatole atsti...@gmail.com
Authored: Thu Aug 6 00:50:06 2015 +0200
Committer: anatole atsti...@gmail.com
Committed: Thu Aug 6 00:50:06 2015 +0200

--
 docs/src/main/asciidoc/mod_json.adoc | 98 +++
 docs/src/main/asciidoc/modules.adoc  |  1 +
 2 files changed, 99 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c1c1122c/docs/src/main/asciidoc/mod_json.adoc
--
diff --git a/docs/src/main/asciidoc/mod_json.adoc 
b/docs/src/main/asciidoc/mod_json.adoc
new file mode 100644
index 000..8b2eace
--- /dev/null
+++ b/docs/src/main/asciidoc/mod_json.adoc
@@ -0,0 +1,98 @@
+= Apache Tamaya -- Extension: Builder
+
+:name: Tamaya
+:rootpackage: org.apache.tamaya.builder
+:title: Apache Tamaya Extension: JSON
+:revnumber: 0.1.1
+:revremark: Incubator
+:revdate: March 2015
+:longversion: {revnumber} ({revremark}) {revdate}
+:authorinitials: ATR
+:author: Anatole Tresch
+:email: anat...@apache.org
+: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::[]
+
+
+:numbered!:
+
+[[BuilderCore]]
+== Tamaya JSON (Extension Module)
+=== Overview
+
+The Tamaya json module provides support for reading configuration using the 
JSON format:
+
+
+=== Compatibility
+
+The module is based on Java 7, so it will not run on Java 7 and beyond.
+
+
+=== Installation
+
+To benefit from configuration builder support you only must add the 
corresponding dependency to your module:
+
+[source, xml]
+---
+dependency
+  groupIdorg.apache.tamaya.ext/groupId
+  artifactIdtamaya-json/artifactId
+  version{tamayaVersion}/version
+/dependency
+---
+
+
+=== Reading configuration in JSON
+
+For reading JSON based onfiguration most easily a +JSONFormat+ can be provided:
+
+[source, java]
+---
+ConfigurationData dataRead = ConfigurationFormats.readConfig(
+getClassLoader().getResource(myFileConfig.json), new JSonFOrmat()));
+---
+
+=== Examples
+
+The JSON module adds instances of +ConfigurationFormat+ so JSON configuration 
can be read and mapped to the
+according property maps. E.g. the following file is a simple and correct JSON 
configuration:
+
+[source,listing]
+
+{
+  a : A,
+  b : B,
+  c : C,
+  d : {
+  o : O,
+  p : P
+}
+}
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c1c1122c/docs/src/main/asciidoc/modules.adoc
--
diff --git a/docs/src/main/asciidoc/modules.adoc 
b/docs/src/main/asciidoc/modules.adoc
index e76c408..064560b 100644
--- a/docs/src/main/asciidoc/modules.adoc
+++ b/docs/src/main/asciidoc/modules.adoc
@@ -61,6 +61,7 @@ NOTE All extensions, despite the _tamaya-builder_ module, 
currently run on Java
 |+org.apache.tamaya.ext:tamaya-events+|Provides support for publishing 
configuration changes  |link:mod_events.html[Documentation]
 |+org.apache.tamaya.ext:tamaya-formats+   |Provides an abstract model for 
configuration formats   |link:mod_formats.html[Documentation]
 |+org.apache.tamaya.ext:tamaya-injection+ |Provides configuration 
injection services and congiruation template support.  
|link:mod_injection.html[Documentation]

[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'

[anatole]

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 0469103bf04a28a5057bcf70261d8289e97869a0
Parents: d0fea28 4e62b05
Author: anatole atsti...@gmail.com
Authored: Thu Jul 2 00:59:36 2015 +0200
Committer: anatole atsti...@gmail.com
Committed: Thu Jul 2 00:59:36 2015 +0200

--
 distribution/pom.xml|   4 +-
 .../src/main/assembly/distribution-bin.xml  | 131 +++
 distribution/src/main/assembly/distribution.xml | 131 ---
 .../tamaya/events/spi/ConfigEventSpi.java   |   3 +-
 4 files changed, 134 insertions(+), 135 deletions(-)
--

[2/2] incubator-tamaya git commit: Added full documentation for the event module.

[anatole]

Added full documentation for the event 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/c822baf9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/c822baf9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/c822baf9

Branch: refs/heads/master
Commit: c822baf98bf4fd28967860e61bfccfc47596b97f
Parents: 0729d1c
Author: anatole atsti...@gmail.com
Authored: Fri Jun 26 01:26:09 2015 +0200
Committer: anatole atsti...@gmail.com
Committed: Fri Jun 26 01:26:09 2015 +0200

--
 docs/src/main/asciidoc/mod_events.adoc | 263 +++-
 1 file changed, 262 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c822baf9/docs/src/main/asciidoc/mod_events.adoc
--
diff --git a/docs/src/main/asciidoc/mod_events.adoc 
b/docs/src/main/asciidoc/mod_events.adoc
index 68ad90a..78d10cc 100644
--- a/docs/src/main/asciidoc/mod_events.adoc
+++ b/docs/src/main/asciidoc/mod_events.adoc
@@ -52,6 +52,267 @@ about modules.
 
 Tamaya Events provides an abstraction for events like change events, when 
configuration has bee changed.
 
+The core of the module are the +ConfigEventListener+ interface and the 
+ConfigEvent+ class, which defines an abstraction
+for event handling and observation:
 
+[source,java]
+.ConfigEvent
+
+public final class ConfigEvent {
 
-tbc...
\ No newline at end of file
+public ConfigEvent() {
+}
+
+public static void addListener(ConfigEventListener? l);
+public static void removeListener(ConfigEventListener? l);
+public static void fireEvent(Object event);
+public static T void fireEvent(T event, ClassT eventType);
+
+}
+
+@FunctionalInterface
+public interface ConfigEventListenerT {
+/**
+ * Called if an event occurred.
+ * @param event the event, not null.
+ */
+void onConfigEvent(T event);
+
+}
+
+
+This mechanism can now be used to propagate configuration changes to all 
interested stakeholders. The next sections
+give more details on the the provided event implementations and abstractions 
that are used to implement such
+features.
+
+
+=== Modelling Configuration Changes
+
+This module provides a serializable and thread-safe abstraction modlling a 
configuration change. A change hereby may
+be
+
+* additional configuration entries
+* removed configuration entries
+* changes on entries
+
+This is also reflected in the +ChangeType+ enum
+
+[source,java]
+---
+public enum ChangeType {
+NEW,
+DELETED,
+UPDATED,
+}
+---
+
+This enum type is used within the +ConfigurationChange+ class:
+
+[source,java]
+---
+public final class ConfigurationChange implements Serializable{
+
+public static ConfigurationChange emptyChangeSet(Configuration 
configuration);
+
+public Configuration getConfiguration();
+
+public String getVersion();
+public long getTimestamp();
+public CollectionPropertyChangeEvent getEvents();
+
+public int getRemovedSize();
+public int getAddedSize();
+public int getUpdatedSize();
+
+public boolean isRemoved(String key);
+public boolean isAdded(String key);
+public boolean isUpdated(String key);
+public boolean containsKey(String key);
+public boolean isEmpty();
+}
+
+---
+
+New instances of this class hereby are created using a fluent builder:
+
+[source,java]
+---
+Configuration config = ...;
+ConfigurationChange change = ConfigurationChangeBuilder.of(config)
+  .addChange(MyKey, newValue)
+  .removeKeys(myRemovedKey).build();
+---
+
+Also it is possible to directly compare 2 instances of configurations to 
create a matching +ConfigurationChange+
+instance:
+
+[source,java]
+Comparing 2 configurations
+---
+Configuration config = ...;
+Configuration changedConfig = ...;
+ConfigurationChange change = ConfigurationChangeBuilder.of(config)
+  .addChanges(changedConfig).build();
+---
+
+So a +ConfigurationChange+ allows you to evaluate the changes on a 
configuration. This allows you to listen to changes
+and react in your client code as useful, once you encounter changes that are 
relevant to you, e.g. by reconfiguring
+your component. Of course, your code has to register itself to listen for 
appropriate changes by 

[2/2] incubator-tamaya git commit: TAMAYA-80 AsciiDoctor documentation is now a part of the dist.

[plexus]

TAMAYA-80 AsciiDoctor documentation is now a part of the dist.


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

Branch: refs/heads/master
Commit: eb28de000650bcec0f87d06f602384496fbe06cd
Parents: 8a50a55
Author: Oliver B. Fischer ple...@apache.org
Authored: Fri Jun 19 20:29:31 2015 +0200
Committer: Oliver B. Fischer ple...@apache.org
Committed: Fri Jun 19 20:29:31 2015 +0200

--
 distribution/pom.xml| 33 +++-
 distribution/src/main/assembly/distribution.xml |  8 +
 2 files changed, 40 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/eb28de00/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 05f7b9c..39a166b 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -34,7 +34,17 @@ under the License.
 
 dependencies
 
- !--Java 7 related artifacts--
+!-- The documentation of Tamaya --
+
+dependency
+groupIdorg.apache.tamaya/groupId
+artifactIdtamaya-docs/artifactId
+version${project.version}/version
+classifierdocumentation/classifier
+typezip/type
+/dependency
+
+ !-- Java 7 related artifacts--
 dependency
 groupIdorg.apache.tamaya/groupId
 artifactIdtamaya-java7-api/artifactId
@@ -137,6 +147,27 @@ under the License.
 plugins
 plugin
 groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-dependency-plugin/artifactId
+executions
+execution
+idunpack-asciidoc/id
+goals
+goalunpack-dependencies/goal
+/goals
+phasegenerate-resources/phase
+configuration
+
outputDirectory${project.build.directory}/generated-documentation/outputDirectory
+includeTypeszip/includeTypes
+
includeClassifiersdocumentation/includeClassifiers
+stripVersiontrue/stripVersion
+stripClassifiertrue/stripClassifier
+/configuration
+/execution
+/executions
+/plugin
+
+plugin
+groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-assembly-plugin/artifactId
 executions
 execution

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/eb28de00/distribution/src/main/assembly/distribution.xml
--
diff --git a/distribution/src/main/assembly/distribution.xml 
b/distribution/src/main/assembly/distribution.xml
index fc11b4b..a58c475 100644
--- a/distribution/src/main/assembly/distribution.xml
+++ b/distribution/src/main/assembly/distribution.xml
@@ -23,6 +23,7 @@ under the License.
 
 iddistribution/id
 formats
+formatdir/format
 formatzip/format
 formattar.gz/format
 /formats
@@ -91,5 +92,12 @@ under the License.
 
 /dependencySets
 
+fileSets
+fileSet
+outputDirectory//outputDirectory
+
directory${project.build.directory}/generated-documentation/apache-tamaya-docs-${project.version}/directory
+/fileSet
+/fileSets
+
 
 /assembly
\ No newline at end of file

[2/2] incubator-tamaya git commit: TAMAYA-74 Added support for type narowwing on property conversion.

[anatole]

TAMAYA-74 Added support for type narowwing on property conversion.


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

Branch: refs/heads/master
Commit: 4d560984822e4ccc0b8bae0b00a98e278518a39e
Parents: eef4efe
Author: Anatole Tresch atsti...@java.net
Authored: Sun Jun 14 00:17:03 2015 +0200
Committer: Anatole Tresch atsti...@java.net
Committed: Sun Jun 14 00:17:03 2015 +0200

--
 .../core/internal/DefaultServiceContext.java|  21 ++-
 .../core/internal/PropertyConverterManager.java | 186 ++-
 .../java/org/apache/tamaya/core/internal/A.java |  29 +++
 .../java/org/apache/tamaya/core/internal/B.java |  29 +++
 .../java/org/apache/tamaya/core/internal/C.java |  56 ++
 .../tamaya/core/internal/CTestConverter.java|  31 
 .../internal/PropertyConverterManagerTest.java  |  85 +
 .../org.apache.tamaya.spi.PropertyConverter |  19 ++
 .../core/internal/DefaultServiceContext.java|  20 +-
 .../core/internal/PropertyConverterManager.java | 131 ++---
 .../java/org/apache/tamaya/core/internal/A.java |  29 +++
 .../java/org/apache/tamaya/core/internal/B.java |  29 +++
 .../java/org/apache/tamaya/core/internal/C.java |  56 ++
 .../tamaya/core/internal/CTestConverter.java|  31 
 .../internal/PropertyConverterManagerTest.java  |  85 +
 .../org.apache.tamaya.spi.PropertyConverter |  19 ++
 16 files changed, 778 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4d560984/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
--
diff --git 
a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
 
b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
index 2e59fa2..15bbcef 100644
--- 
a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
+++ 
b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
@@ -90,6 +90,20 @@ public final class DefaultServiceContext implements 
ServiceContext {
 return previousServices != null ? previousServices : services;
 }
 
+/**
+ * Checks the given instance for a @Priority annotation. If present the 
annotation's value s evaluated. If no such
+ * annotation is present, a default priority is returned (1);
+ * @param o the instance, not null.
+ * @return a priority, by default 1.
+ */
+public static int getPriority(Object o){
+int prio = 1; //X TODO discuss default priority
+Priority priority = o.getClass().getAnnotation(Priority.class);
+if (priority != null) {
+prio = priority.value();
+}
+return prio;
+}
 
 /**
  * @param services to scan
@@ -111,12 +125,7 @@ public final class DefaultServiceContext implements 
ServiceContext {
 T highestService = null;
 
 for (T service : services) {
-int prio = 1; //X TODO discuss default priority
-Priority priority = 
service.getClass().getAnnotation(Priority.class);
-if (priority != null) {
-prio = priority.value();
-}
-
+int prio = getPriority(service);
 if (highestPriority == null || highestPriority  prio) {
 highestService = service;
 highestPriorityServiceCount = 1;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4d560984/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
--
diff --git 
a/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
 
b/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
index 31a05b2..7fe6b11 100644
--- 
a/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
+++ 
b/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,12 +46,38 @@ import org.apache.tamaya.spi.ServiceContextManager;
  * This class is thread-safe.
  */
 public class PropertyConverterManager {
-/** The logger used. */
+/**
+ * The logger used.
+ */
 private static final Logger LOG = 

[2/2] incubator-tamaya git commit: The AsciiDoctor plugin will preserve the directory structure of the documentation folder.

[plexus]

The AsciiDoctor plugin will preserve the directory structure of the 
documentation folder.


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

Branch: refs/heads/master
Commit: af8b360967df931bac376a07c66d6eefbe755823
Parents: 98f7969
Author: Oliver B. Fischer ple...@apache.org
Authored: Tue Jun 2 20:10:50 2015 +0200
Committer: Oliver B. Fischer ple...@apache.org
Committed: Tue Jun 2 20:10:50 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/af8b3609/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index dc21170..67bac70 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -94,7 +94,7 @@ under the License.
 backendhtml/backend
 embedAssetstrue/embedAssets
 
imagesDir${project.basedir}/images/icons/imagesDir
-sourceDirectory./sourceDirectory
+preserveDirectoriestrue/preserveDirectories
 /configuration
 /execution
 /executions

[2/2] incubator-tamaya git commit: Added introduction section.

[anatole]

Added introduction section.


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

Branch: refs/heads/master
Commit: 4f8d167be6e56497cb409982b32f7df3af4cc53d
Parents: cf7980e
Author: anatole anat...@apache.org
Authored: Fri May 22 00:03:28 2015 +0200
Committer: anatole anat...@apache.org
Committed: Fri May 22 00:03:28 2015 +0200

--
 docs/index.adoc | 72 +++-
 1 file changed, 49 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4f8d167b/docs/index.adoc
--
diff --git a/docs/index.adoc b/docs/index.adoc
index c7ef8ec..5707fc5 100644
--- a/docs/index.adoc
+++ b/docs/index.adoc
@@ -68,24 +68,48 @@ under the License.
 
 
 == Introduction
-This documentation describes the Tamaya Configuration System. It provides an 
overview of the different building blocks and
-links you to more detailed documentations.
+[[WhatIsTamaya]]
+=== What is Apache Tamaya?
+Tamaya is a very powerful yet flexible configuration solution. It's core is 
built based on a few simple concepts.
+Summarizing Tamaya provides you
 
+* a simple _key/value_ configuration model.
+* a uniform API for accessing _configuration_, regardless if you are running 
in a Java SE, Java EE or OSGI environment.
+  This API is capable of hiding all the complexities in configuration 
management, your developers only need to know,
+  where and in which format configuration can be added to the system.
+* A +ConfigurationBuilder+ allowing you to create a configuration completely 
manually and managing the configuration
+  lifecycle on your own.
+* a minimalistic implementation, which in the future might also be targeting 
Java ME environments.
+* a powerful SPI that allows you to extend/adapt Tamaya with all kind of 
additional mechanisms commonly used in
+  many use cases.
+* a bunch of modules that can be added to your classpath thus adding different 
functionality to your system as needed.
 
+
+=== What is Apache Tamaya NOT?
+
+Nevertheless there are a few things that are not part of Tamaya:
+
+* Tamaya comes as a modular framework, where you have to decide, which 
features make sense for you. So you have to do
+  a selection, which modules make sense.
+* Though Tamaya comes with a very minimalistic configuration scheme 
out-of-the-box, it does by default typically not
+  cover your enterprise requirements. Also here Tamaya offers hooks and 
examples showing how you can easily
+  replace your current configuration logic with Tamaya. So you must know how 
you want to organize configuration in
+  your enterprise context, such as supported file locations, formats, 
overriding and filter rules etc.
+
+
+[[WorkingGroup]]
 === Working Group
 This work is being conducted as part of a community lead joint effort under 
the Apache Software Foundation. This
 specification is the result of the collaborative work of the members of the 
Tamaya Users Group and the community at
 large.
 
-
 === Goals
 Configuration is a key feature in all kind of programming languages. Basically 
configuration is the parametrization of
 well defined aspects of a software product without having to recompile/rebuild 
the code. Summarizing configuration
 can affect basically every part of a system, which renders configuration to a 
real cross-cutting concern, usable in
 many facets.
 
-
- Targets
+=== Targets
 Tamaya targets to support all general configuration aspects in a system, e.g.
 
 * application configuration
@@ -109,15 +133,6 @@ Since configuration is implemented and applied in various 
ways Tamaya will allow
 * configuration filtering and property adapters
 * configuration of collections
 
-
-=== Required Java version
-The full API is based on Java SE 8.0 language features, whereas a compatible 
implementation of API and Core
-is similarly available for Java SE 7 as well.
-
-
-== Overview
-=== How is Tamaya organized
-
 The Tamaya project consists of the following parts:
 
 * The link:API.html[API] is a complete SE based configuration API, that 
provides the minimum of functionality needed.
@@ -139,13 +154,26 @@ to go, but you may want to add additional extensions that 
provide more features
   ** Integration with other frameworks as configuration consumer or producer.
 * Finally the *documentation* module provides comprehensive documentation on 
all features provided.
 
-== Further Information
 
-There is further documentation available describing in more detail
-* link:usecases.html[Possible Use Cases]
-* link:requirements.html[Requirements].

[2/2] incubator-tamaya git commit: Added a jQAssistant rule to detect not properly configured service providers.

[plexus]

Added a jQAssistant rule to detect not properly configured service providers.


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

Branch: refs/heads/master
Commit: fd00b28aa815c74e25e2f731c0c20afcfb87a19d
Parents: c4af789
Author: Oliver B. Fischer ple...@apache.org
Authored: Sun Apr 26 00:02:09 2015 +0200
Committer: Oliver B. Fischer ple...@apache.org
Committed: Sun Apr 26 00:02:09 2015 +0200

--
 jqassistant/default.xml |  1 +
 jqassistant/serviceloader-rules.xml | 42 +++-
 2 files changed, 42 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fd00b28a/jqassistant/default.xml
--
diff --git a/jqassistant/default.xml b/jqassistant/default.xml
index 222a685..f35def2 100644
--- a/jqassistant/default.xml
+++ b/jqassistant/default.xml
@@ -56,5 +56,6 @@ under the License.
 includeConstraint refId=naming:namingOfPropertyConverters/
 includeConstraint refId=naming:namingOfPropertyFilters/
 includeConstraint refId=serviceLoader:correctServiceLoaderNaming/
+includeConstraint 
refId=serviceLoader:ServiceImplementationsMustBeListedInServiceConfigurations/
 /group
 /jqa:jqassistant-rules

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fd00b28a/jqassistant/serviceloader-rules.xml
--
diff --git a/jqassistant/serviceloader-rules.xml 
b/jqassistant/serviceloader-rules.xml
index 808b7b2..346ebb8 100644
--- a/jqassistant/serviceloader-rules.xml
+++ b/jqassistant/serviceloader-rules.xml
@@ -50,4 +50,44 @@ under the License.
 ]]/cypher
/constraint
 
-/jqa:jqassistant-rules
\ No newline at end of file
+   constraint 
id=serviceLoader:ServiceImplementationsMustBeListedInServiceConfigurations
+   severity=info
+   requiresConcept refId=java:AnonymousInnerType/
+   requiresConcept refId=serviceLoader:SPI/
+   descriptionAll property converter implementations must be 
declared in a service loader file./description
+cypher![CDATA[
+MATCH
+   (impl)-[:IMPLEMENTS*]-(spi:SPI)
+
+   WHERE
+NOT (:ServiceLoader)-[:CONTAINS]-(impl)
+AND NOT impl:Anonymous:Inner
+AND (impl.abstract=false OR impl.abstract IS NULL)
+
+// Ignore SPI implementations without a default constructor
+// We assume that the developer of this class had to implement 
for some reason
+// this interface but not intended it to be used as service 
provider
+AND NOT (impl)-[:DECLARES]-(:Constructor)-[:HAS]-(:Parameter)
+
+// Do not pay attention to test utilities. We rely on the name 
of the class
+AND NOT (impl.name =~ 'Test.*' OR impl.name =~ '.*\\$Test.*'
+ OR impl.name =~'.*Test\\$.*')
+
+AND NOT impl.fqn IN [// All classes of the builder MUST not 
use the SPI mechanism
+ 
'org.apache.tamaya.builder.ProgrammaticConfigurationContext',
+ // See TAMAYA-77 and TAMAYA-78, Oliver B. 
Fischer, 2015-04-25
+ 
'org.apache.tamaya.core.internal.DefaultConfigurationContextBuilder'
+]
+
+RETURN
+impl.fqn AS undeclaredService
+]]/cypher
+   /constraint
+
+   !-- @todo
+  Constraints to be defined
+  - Empty service configurations
+
+  --
+
+/jqa:jqassistant-rules

[2/2] incubator-tamaya git commit: Removed star import.

[anatole]

Removed star import.


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

Branch: refs/heads/master
Commit: 60ed4daf9e1b0cdb510c95710516bea9a9f39f3b
Parents: 64cb2ff
Author: anatole anat...@apache.org
Authored: Sat Apr 18 23:58:36 2015 +0200
Committer: anatole anat...@apache.org
Committed: Sat Apr 18 23:58:36 2015 +0200

--
 .../org/apache/tamaya/core/internal/DefaultConfiguration.java  | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/60ed4daf/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
--
diff --git 
a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
 
b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
index fe0887f..8eaa5cd 100644
--- 
a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
+++ 
b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
@@ -28,7 +28,6 @@ import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.spi.PropertyValueCombinationPolicy;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,8 +38,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-import static java.util.Map.*;
-
 /**
  * Implementation of the Configuration API. This class uses the current {@link 
ConfigurationContext} to evaluate the
  * chain of {@link org.apache.tamaya.spi.PropertySource} and {@link 
org.apache.tamaya.spi.PropertyFilter}
@@ -143,7 +140,6 @@ public class DefaultConfiguration implements Configuration {
 @Override
 public MapString, String getProperties() {
 ListPropertySource propertySources = new 
ArrayList(configurationContext.getPropertySources());
-Collections.reverse(propertySources);
 MapString, String result = new HashMap();
 for (PropertySource propertySource : propertySources) {
 try {
@@ -199,7 +195,7 @@ public class DefaultConfiguration implements Configuration {
 }
 // Remove null values
 return inputMap.entrySet().parallelStream().filter((e) - e.getValue() 
!= null).collect(
-Collectors.toMap(Entry::getKey, Entry::getValue));
+Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 }
 
 /**

[2/2] incubator-tamaya git commit: Removed outdated service provider configuration file.

[plexus]

Removed outdated service provider configuration file.


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

Branch: refs/heads/master
Commit: 93ff8752dbf8e4242c84c64629f12f842ea070e7
Parents: bf40229
Author: Oliver B. Fischer ple...@apache.org
Authored: Sun Apr 19 02:23:45 2015 +0200
Committer: Oliver B. Fischer ple...@apache.org
Committed: Sun Apr 19 02:23:45 2015 +0200

--
 .../org.apache.tamaya.PropertyConverter | 34 
 1 file changed, 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/93ff8752/java8/core/src/main/resources/META-INF/services/org.apache.tamaya.PropertyConverter
--
diff --git 
a/java8/core/src/main/resources/META-INF/services/org.apache.tamaya.PropertyConverter
 
b/java8/core/src/main/resources/META-INF/services/org.apache.tamaya.PropertyConverter
deleted file mode 100644
index 964843c..000
--- 
a/java8/core/src/main/resources/META-INF/services/org.apache.tamaya.PropertyConverter
+++ /dev/null
@@ -1,34 +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 current 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.
-#
-org.apache.tamaya.core.internal.converters.BooleanConverter
-org.apache.tamaya.core.internal.converters.ByteConverter
-org.apache.tamaya.core.internal.converters.CharConverter
-org.apache.tamaya.core.internal.converters.DoubleConverter
-org.apache.tamaya.core.internal.converters.FloatConverter
-org.apache.tamaya.core.internal.converters.IntegerConverter
-org.apache.tamaya.core.internal.converters.LongConverter
-org.apache.tamaya.core.internal.converters.ShortConverter
-org.apache.tamaya.core.internal.converters.BigDecimalConverter
-org.apache.tamaya.core.internal.converters.BigIntegerConverter
-org.apache.tamaya.core.internal.converters.CurrencyConverter
-org.apache.tamaya.core.internal.converters.LocalDateConverter
-org.apache.tamaya.core.internal.converters.LocalDateTimeConverter
-org.apache.tamaya.core.internal.converters.LocalTimeConverter
-org.apache.tamaya.core.internal.converters.ZoneIdConverter
-org.apache.tamaya.core.internal.converters.NumberConverter

[2/2] incubator-tamaya git commit: Rule to ensure naming of property filters include in the default group.

[plexus]

Rule to ensure naming of property filters include in the default group.


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

Branch: refs/heads/master
Commit: c4db84fd211c4e973674ead5d7caa5f325ade269
Parents: 4bdb8bf
Author: Oliver B. Fischer ple...@apache.org
Authored: Thu Apr 16 18:10:12 2015 +0200
Committer: Oliver B. Fischer ple...@apache.org
Committed: Thu Apr 16 18:10:12 2015 +0200

--
 jqassistant/default.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c4db84fd/jqassistant/default.xml
--
diff --git a/jqassistant/default.xml b/jqassistant/default.xml
index 4afa4bf..c332fe6 100644
--- a/jqassistant/default.xml
+++ b/jqassistant/default.xml
@@ -35,7 +35,7 @@ under the License.
 ]]/cypher
 /constraint
 
-constraint id=naming:namingOfPropertyFilter
+constraint id=naming:namingOfPropertyFilters
 requiresConcept refId=java:AnonymousInnerType/
 descriptionClass name of implementations of PropertyFilter must end 
with 'Filter'/description
 cypher![CDATA[
@@ -54,5 +54,6 @@ under the License.
 
 group id=default
 includeConstraint refId=naming:namingOfPropertyConverters/
+includeConstraint refId=naming:namingOfPropertyFilters/
 /group
 /jqa:jqassistant-rules

[2/2] incubator-tamaya git commit: Disabled Apache Snapshot Repository.

[plexus]

Disabled Apache Snapshot Repository.


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

Branch: refs/heads/master
Commit: 60fd0c4c93c64df775f3a865f9756fcc6ca601f9
Parents: 3272238
Author: Oliver B. Fischer ple...@apache.org
Authored: Wed Apr 15 21:25:51 2015 +0200
Committer: Oliver B. Fischer ple...@apache.org
Committed: Wed Apr 15 21:25:51 2015 +0200

--
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/60fd0c4c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8d97318..7f1fbc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -780,6 +780,7 @@ under the License.
 /plugins
 /reporting
 
+!--
 repositories
 repository
 idorg.apache.people/id
@@ -793,5 +794,5 @@ under the License.
 /releases
 /repository
 /repositories
-
+   --
 /project

[2/2] incubator-tamaya git commit: Removed unused import.

[plexus]

Removed unused import.


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

Branch: refs/heads/master
Commit: a5c1b995e55a3543874288fce4ef0a0c4c62ba59
Parents: ec58985
Author: Oliver B. Fischer ple...@apache.org
Authored: Sat Mar 21 21:15:20 2015 +0100
Committer: Oliver B. Fischer ple...@apache.org
Committed: Sat Mar 21 21:15:20 2015 +0100

--
 .../apache/tamaya/format/BaseFormatPropertySourceProvider.java| 3 ---
 .../main/java/org/apache/tamaya/format/ConfigurationFormats.java  | 1 -
 2 files changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a5c1b995/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
--
diff --git 
a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
 
b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
index d70515d..bc0042d 100644
--- 
a/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
+++ 
b/modules/formats/src/main/java/org/apache/tamaya/format/BaseFormatPropertySourceProvider.java
@@ -18,8 +18,6 @@
  */
 package org.apache.tamaya.format;
 
-import org.apache.tamaya.resource.ResourceResolver;
-import org.apache.tamaya.resource.Resources;
 import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.spi.PropertySourceProvider;
 
@@ -130,7 +128,6 @@ public abstract class BaseFormatPropertySourceProvider 
implements PropertySource
  */
 @Override
 public CollectionPropertySource getPropertySources() {
-ResourceResolver resourceResolver = Resources.getResourceResolver();
 ListPropertySource propertySources = new ArrayList();
 this.paths.forEach(res - {
 try(InputStream is = res.openStream()) {

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a5c1b995/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
--
diff --git 
a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
 
b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
index 84f9456..a6168bc 100644
--- 
a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
+++ 
b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
@@ -33,7 +33,6 @@ import java.util.Set;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**

[2/2] incubator-tamaya git commit: Updated JRuby to the version Asciidoctor uses.

[plexus]

Updated JRuby to the version Asciidoctor uses.


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

Branch: refs/heads/master
Commit: ff3faca16b268f4f338a615255c47a326dfb0cba
Parents: 50e8651
Author: Oliver B. Fischer ple...@apache.org
Authored: Sun Mar 15 15:32:40 2015 +0100
Committer: Oliver B. Fischer ple...@apache.org
Committed: Sun Mar 15 15:32:40 2015 +0100

--
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ff3faca1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9c1cf25..bfcb21d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,8 @@ under the License.
 !-- Dependency and plugin relate version properties go here --
 arquillian.version1.1.7.Final/arquillian.version
 arquillian.deamon.version1.0.0.Alpha1/arquillian.deamon.version
+
+!-- Keep the JRuby version in sync with the one used by Asciidoctor 
--
 asciidoctor.version1.5.0/asciidoctor.version
 asciidoctor-diagramm.version1.2.1/asciidoctor-diagramm.version
 asciidoctorj.version1.5.2/asciidoctorj.version
@@ -70,7 +72,7 @@ under the License.
 hamcrest.version1.3/hamcrest.version
 javadoc.version2.9.1/javadoc.version
 !-- Must/should match the JRuby version used by AsciidoctorJ --
-jruby.version1.7.16.1/jruby.version
+jruby.version1.7.18/jruby.version
 findbugs.version3.0.0/findbugs.version
 mockito.version1.10.19/mockito.version
 rat.version0.11/rat.version

[2/2] incubator-tamaya git commit: TAMAYA-60 JavaDoc...

[plexus]

TAMAYA-60 JavaDoc...


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

Branch: refs/heads/master
Commit: afdd6c8c06651e611a9364c4162f84509246a0ba
Parents: 72e119e
Author: Oliver B. Fischer ple...@apache.org
Authored: Tue Mar 10 22:43:39 2015 +0100
Committer: Oliver B. Fischer ple...@apache.org
Committed: Tue Mar 10 22:43:39 2015 +0100

--
 .../modules/builder/ConfigurationBuilder.java   | 63 ++--
 1 file changed, 57 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/afdd6c8c/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java
--
diff --git 
a/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java
 
b/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java
index cd55a27..173117a 100644
--- 
a/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java
+++ 
b/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java
@@ -157,16 +157,16 @@ public class ConfigurationBuilder {
  * pIf a specific format is supported depends on the available
  * {@link org.apache.tamaya.format.ConfigurationFormat} 
implementations./p
  *
- *pre
- * URL first = new URL(file:/etc/service/config.json);
- * URL second = new URL(file:/etc/defaults/values.properties);
+ *pre{@code URL first = new URL(file:/etc/service/config.json);
+ * URL second = new URL(file:/etc/defaults/values.properties);
  *
- * builder.addPropertySources(first, second);
+ * builder.addPropertySources(first, second);}
  */pre
  *
  * @param url first resource with properties for the the configuration to 
be build.
  * @param urls list additional of resources with properties for the 
configuration to be
  * build.
+ *
  * @return the builder instance currently used
  *
  * @see org.apache.tamaya.format.ConfigurationFormat
@@ -182,8 +182,26 @@ public class ConfigurationBuilder {
 return this;
 }
 
+
 /**
+ * Adds one or more resources with properties in an arbitrary format
+ * to the configuration to be build.
+ *
+ * pIf a specific format is supported depends on the available
+ * {@link org.apache.tamaya.format.ConfigurationFormat} 
implementations./p
+ *
+ *pre{@code builder.addPropertySources(file:/etc/service/config.json,
+ *file:/etc/defaults/values.properties);}
+ */pre
+ *
+ * @param url first resource with properties for the the configuration to 
be build.
+ * @param urls list additional of resources with properties for the 
configuration to be
+ * build.
+ *
  * @return the builder instance currently used
+ *
+ * @see org.apache.tamaya.format.ConfigurationFormat
+ * @see org.apache.tamaya.format.ConfigurationFormats#getFormats()
  */
 public ConfigurationBuilder addPropertySource(String url, String... urls) {
 Stream.of(Collections.singletonList(url), Arrays.asList(urls))
@@ -197,7 +215,20 @@ public class ConfigurationBuilder {
 }
 
 /**
+ * Adds one or more property source instances to the configuration to be 
build.
+ *
+ *pre{@code PropertySource first = new CustomPropertySource();
+ * PropertySource second = new YetAnotherPropertySource();
+ *
+ * builder.addPropertySources(first, second)};
+ */pre
+ *
+ * @param sources list of property source instances with properties for the
+ *configuration to be build.
+ *
  * @return the builder instance currently used
+ *
+ * @see org.apache.tamaya.spi.PropertySource
  */
 public ConfigurationBuilder addPropertySources(PropertySource... sources){
 checkBuilderState();
@@ -213,10 +244,22 @@ public class ConfigurationBuilder {
 }
 
 /**
+ * Adds one or more property source provider instances to the 
configuration to be build.
+ *
+ * pre{@code PropertySourceProvider jc = new JavaConfigurationProvider();
+ *
+ * builder.addPropertySources(jc)};
+ * /pre
+ *
+ * @param providers list of property source provider instances each 
providing a set
+ *  of property source instances for the configuration to 
be build.
+ *
  * @return the builder instance currently used
+ *
+ * @see org.apache.tamaya.spi.PropertySourceProvider
  */
-public 

[2/2] incubator-tamaya git commit: Fixed bugs.

[anatole]

Fixed bugs.


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

Branch: refs/heads/master
Commit: b35b5171844bf9c1aeec108c9365546c8a7d8778
Parents: be94160
Author: anatole anat...@apache.org
Authored: Sat Feb 28 23:22:50 2015 +0100
Committer: anatole anat...@apache.org
Committed: Sat Feb 28 23:22:50 2015 +0100

--
 docs/API.adoc   | 20 +++---
 docs/Core.adoc  |  4 +-
 .../java/org/apache/tamaya/TypeLiteral.java |  3 +-
 .../internal/PropertyConverterManagerTest.java  |  3 +-
 .../org/apache/tamaya/ConfigExceptionTest.java  | 46 ++
 .../tamaya/ConfigurationProviderTest.java   | 66 
 .../tamaya/TestConfigurationProvider.java   |  6 ++
 .../tamaya/spi/ServiceContextManagerTest.java   | 26 +++-
 .../internal/DefaultConfigurationProvider.java  |  1 -
 9 files changed, 158 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b35b5171/docs/API.adoc
--
diff --git a/docs/API.adoc b/docs/API.adoc
index 6977d54..0f0d32a 100644
--- a/docs/API.adoc
+++ b/docs/API.adoc
@@ -585,16 +585,16 @@ The +ServiceContext+ hereby defines access methods to 
obtain components, whereas
 +ServiceContextManager+ singleton:
 
 [source,java]
-.Accessing the +ServiceContext+
-
-ServiceContext serviceContext = ServiceContextManager.getServiceContext();
-
-public interface ServiceContext{
-int ordinal();
-T T getService(ClassT serviceType);
-T ListT getServices(ClassT serviceType);
-}
-
+.Accessing the +ServiceContext+
+

+ServiceContext serviceContext = 
ServiceContextManager.getServiceContext();
+
+public interface ServiceContext{
+int ordinal();
+T T getService(ClassT 
serviceType);
+T ListT 
getServices(ClassT serviceType);
+}
+

 
 With the +ServiceContext+ a component can be accessed in two different ways:
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b35b5171/docs/Core.adoc
--
diff --git a/docs/Core.adoc b/docs/Core.adoc
index 1134f73..6671ae6 100644
--- a/docs/Core.adoc
+++ b/docs/Core.adoc
@@ -64,7 +64,7 @@ For details about the extension modules available and  their 
functionality refer
 
 As said the _Core_ module delivers several default +PropertyConverter+ 
instances out of the box:
 
-[width=100%,frame=1,options=header]
+[width=100%,frame=1,options=header,grid=all]
 |===
 |_Target Type_ |_Class Name_  |_Supported Formats_
 |java.math.BigDecimal|BigDecimalConverter |1.2345, 0xFF
@@ -142,7 +142,7 @@ NOTE: TODO Discuss the defaults provided by core!
 The Tamaya Core implementation provides a couple of default +PropertySource+ 
implementations, which are automatically
 registered. They are all in the package 
+org.apache.tamaya.core.propertysource+:
 
-[width=100%,frame=1,options=header]
+[width=100%,frame=1,options=header,grid=all]
 |===
 |_Type_   |_Class Name_   
|_Ordinal Used_
 |Environment Properties   |EnvironmentPropertySource  |300

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b35b5171/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
--
diff --git a/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java 
b/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
index 174bf36..edd69eb 100644
--- a/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
+++ b/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
@@ -52,10 +52,9 @@ public class TypeLiteralT implements Serializable {
 /**
  * Creates a new TypeLiteral based on a given type.
  * @param type the type , not null.
- * @param R the literal generic type.
  * @return the corresponding TypeLiteral, never null.
  */
-public static R TypeLiteralR of(Type 

[2/2] incubator-tamaya git commit: Extended ConfigurationFormats. Added simple tests.

[anatole]

Extended ConfigurationFormats. Added simple tests.


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

Branch: refs/heads/master
Commit: 1c23467613dd77ecc7b473bc32fa7304b4a5e1a4
Parents: ff7e48a
Author: anatole anat...@apache.org
Authored: Sat Feb 14 17:10:56 2015 +0100
Committer: anatole anat...@apache.org
Committed: Sat Feb 14 17:10:56 2015 +0100

--
 modules/formats/pom.xml | 11 +++
 ...hBasedMultiFormatPropertySourceProvider.java |  5 +-
 .../tamaya/format/ConfigurationFormats.java | 16 -
 ...org.apache.tamaya.format.ConfigurationFormat | 21 ++
 .../tamaya/format/ConfigurationFormatsTest.java | 70 
 modules/formats/src/test/resources/Test.ini | 26 
 .../formats/src/test/resources/Test.properties  | 21 ++
 7 files changed, 165 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1c234676/modules/formats/pom.xml
--
diff --git a/modules/formats/pom.xml b/modules/formats/pom.xml
index 65b40f4..39fca56 100644
--- a/modules/formats/pom.xml
+++ b/modules/formats/pom.xml
@@ -41,5 +41,16 @@ under the License.
 artifactIdtamaya-resources/artifactId
 version${project.version}/version
 /dependency
+!-- Test scope only, do not create a code dependency! --
+dependency
+groupIdorg.apache.tamaya/groupId
+artifactIdtamaya-core/artifactId
+version${project.version}/version
+scopetest/scope
+/dependency
+dependency
+groupIdjunit/groupId
+artifactIdjunit/artifactId
+/dependency
 /dependencies
 /project

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1c234676/modules/formats/src/main/java/org/apache/tamaya/format/BasePathBasedMultiFormatPropertySourceProvider.java
--
diff --git 
a/modules/formats/src/main/java/org/apache/tamaya/format/BasePathBasedMultiFormatPropertySourceProvider.java
 
b/modules/formats/src/main/java/org/apache/tamaya/format/BasePathBasedMultiFormatPropertySourceProvider.java
index cb60d6e..32b25fb 100644
--- 
a/modules/formats/src/main/java/org/apache/tamaya/format/BasePathBasedMultiFormatPropertySourceProvider.java
+++ 
b/modules/formats/src/main/java/org/apache/tamaya/format/BasePathBasedMultiFormatPropertySourceProvider.java
@@ -23,6 +23,7 @@ import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.spi.PropertySourceProvider;
 import org.apache.tamaya.spi.ServiceContext;
 
+import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -108,9 +109,9 @@ public abstract class 
BasePathBasedMultiFormatPropertySourceProvider implements
 for (URL res : resourceResolver.getResources(
 
this.classLoader.orElse(Thread.currentThread().getContextClassLoader()),
 path)) {
-try {
+try(InputStream is = res.openStream()) {
 for (ConfigurationFormat format : configFormats) {
-ConfigurationData entries = 
format.readConfiguration(res);
+ConfigurationData entries = 
format.readConfiguration(res.toString(), is);
 propertySources.addAll(getPropertySources(entries));
 }
 } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1c234676/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
--
diff --git 
a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
 
b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
index 2ec0e0e..4c6f67f 100644
--- 
a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
+++ 
b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
@@ -57,6 +57,16 @@ public class ConfigurationFormats {
 }
 
 /**
+ * Get all currently available formats, ordered by priority.
+ *
+ * @return the currently available formats, never null.
+ */
+public static ListConfigurationFormat getFormats(URL url) {
+ListConfigurationFormat formats = getFormats();
+return formats.stream().filter(f - 
f.accepts(url)).collect(Collectors.toList());
+}
+
+/**
  * Tries to read configuration 

[2/2] incubator-tamaya git commit: Added ConfiguratoinFOrmats singleton to formats module. Moved commons-config related aspects into separate integration module.

[anatole]

Added ConfiguratoinFOrmats singleton to formats module.
Moved commons-config related aspects into separate integration 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/bd997069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/bd997069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/bd997069

Branch: refs/heads/master
Commit: bd9970692dd545f6b526b448f3ae159c3e6786a7
Parents: c15fb1c
Author: anatole anat...@apache.org
Authored: Sat Feb 14 00:49:07 2015 +0100
Committer: anatole anat...@apache.org
Committed: Sat Feb 14 00:49:07 2015 +0100

--
 .gitignore  |   2 +
 dormant/api/PropertyMapSupplier.java|  37 --
 dormant/buildtools/pom.xml  |  35 -
 .../src/main/java/old/AggregationPolicy.java| 133 ---
 .../java/old/EnvPropertiesConfigProvider.java   |  54 
 dormant/core/src/main/java/old/Orderable.java   |  34 -
 .../core/src/main/java/old/OrdinalProvider.java |  37 --
 .../java/old/PropertyAdapterProviderSpi.java|  36 -
 .../old/SystemPropertiesConfigProvider.java |  54 
 .../tamaya/core/internal/format/IniFormat.java  |  98 --
 .../core/internal/format/PropertiesFormat.java  |  61 -
 .../internal/format/PropertiesXmlFormat.java|  62 -
 .../resources/AntPathClasspathResolver.java |  60 -
 .../internal/resources/AntPathFileResolver.java |  61 -
 .../resources/DefaultResourceLoader.java|  81 ---
 .../properties/EnvironmentPropertySource.java   |  48 ---
 .../core/properties/MapBasedPropertySource.java |  98 --
 .../SystemPropertiesPropertySource.java |  55 
 .../apache/tamaya/core/spi/PathResolver.java|  45 ---
 dormant/pom.xml |  35 +
 modules/formats/pom.xml |   5 -
 .../format/CommonsConfigPropertySource.java |  79 ---
 .../tamaya/format/ConfigurationFormat.java  |   4 +
 .../tamaya/format/ConfigurationFormats.java |  88 
 .../format/FlattenedDefaultPropertySource.java  |  60 +
 .../tamaya/format/IniConfigurationFormat.java   |  57 
 .../apache/tamaya/format/PropertiesFormat.java  |  57 
 .../tamaya/format/PropertiesXmlFormat.java  |  56 
 .../format/formats/IniConfigurationFormat.java  |  84 
 .../tamaya/format/formats/PropertiesFormat.java |  61 +
 .../format/formats/PropertiesXmlFormat.java |  60 +
 modules/integration/commons/pom.xml |  50 +++
 .../commons/CommonsConfigPropertySource.java|  81 +++
 .../commons/IniConfigurationFormat.java |  60 +
 modules/integration/pom.xml |   3 +-
 35 files changed, 587 insertions(+), 1344 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bd997069/.gitignore
--
diff --git a/.gitignore b/.gitignore
index b97b7b5..194682a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ release.properties
 .project
 .settings
 .classpath
+
+modules/integration/commons-config/commons-configuration.iml
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bd997069/dormant/api/PropertyMapSupplier.java
--
diff --git a/dormant/api/PropertyMapSupplier.java 
b/dormant/api/PropertyMapSupplier.java
deleted file mode 100644
index 69dd308..000
--- a/dormant/api/PropertyMapSupplier.java
+++ /dev/null
@@ -1,37 +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.
-*/
-package org.apache.tamaya;
-
-import java.util.Map;
-
-/**
- * Supplier for a property map.
- */
-@FunctionalInterface
-public interface PropertyMapSupplier {
-
-/**
- * Access the current properties as Map. The resulting Map may not return 
all items 

[2/2] incubator-tamaya git commit: TAMAYA-49: Fixed some typos.

[anatole]

TAMAYA-49: Fixed some typos.


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

Branch: refs/heads/master
Commit: 7a29ec3d1fcaf9e1a441dd8d7c8370001d15dd1d
Parents: 3942d69
Author: anatole anat...@apache.org
Authored: Tue Jan 13 09:03:08 2015 +0100
Committer: anatole anat...@apache.org
Committed: Tue Jan 13 09:03:08 2015 +0100

--
 docs/pom.xml|  2 +-
 java7/api/pom.xml   |  2 +-
 .../java/org/apache/tamaya/ConfigException.java |  4 +--
 .../java/org/apache/tamaya/Configuration.java   | 18 +-
 .../apache/tamaya/spi/ConfigurationContext.java | 26 +++---
 .../apache/tamaya/spi/PropertyConverter.java|  6 ++--
 .../org/apache/tamaya/spi/PropertyFilter.java   |  4 +--
 .../org/apache/tamaya/spi/PropertySource.java   | 14 
 .../tamaya/spi/PropertySourceProvider.java  | 10 +++---
 .../org/apache/tamaya/spi/ServiceContext.java   |  4 +--
 .../services/org.apache.tamaya.Configuration|  2 +-
 java7/pom.xml   |  2 +-
 java8/api/pom.xml   |  2 +-
 .../java/org/apache/tamaya/ConfigException.java |  4 +--
 .../java/org/apache/tamaya/Configuration.java   | 36 ++--
 .../apache/tamaya/spi/ConfigurationContext.java | 26 +++---
 .../apache/tamaya/spi/PropertyConverter.java|  6 ++--
 .../org/apache/tamaya/spi/PropertyFilter.java   |  4 +--
 .../org/apache/tamaya/spi/PropertySource.java   | 14 
 .../tamaya/spi/PropertySourceProvider.java  | 10 +++---
 .../org/apache/tamaya/spi/ServiceContext.java   |  4 +--
 .../services/org.apache.tamaya.Configuration|  2 +-
 java8/core/pom.xml  |  2 +-
 .../core/internal/DefaultConfiguration.java |  6 ++--
 .../internal/DefaultConfigurationContext.java   |  2 +-
 .../core/internal/PropertyConverterManager.java | 20 +--
 .../core/propertysource/BasePropertySource.java |  6 ++--
 .../EnvironmentPropertySource.java  |  2 +-
 .../services/org.apache.tamaya.Configuration|  2 +-
 .../org.apache.tamaya.spi.ServiceContext|  2 +-
 .../test/internal/PropetiesFileLoaderTest.java  |  2 +-
 .../org.apache.tamaya.spi.PropertyFilter|  2 +-
 .../org.apache.tamaya.spi.PropertySource|  2 +-
 ...org.apache.tamaya.spi.PropertySourceProvider |  2 +-
 .../test/resources/javaconfiguration.properties |  2 +-
 .../test/resources/overrideOrdinal.properties   |  2 +-
 .../core/src/test/resources/testfile.properties |  2 +-
 java8/pom.xml   |  2 +-
 38 files changed, 130 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7a29ec3d/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index fb14e7a..27e98d2 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@ 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 aa_a copy of the License at
+with the License.  You may obtain a copy of the License at
 
http://www.apache.org/licenses/LICENSE-2.0
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7a29ec3d/java7/api/pom.xml
--
diff --git a/java7/api/pom.xml b/java7/api/pom.xml
index 9028d58..50f5576 100644
--- a/java7/api/pom.xml
+++ b/java7/api/pom.xml
@@ -5,7 +5,7 @@ 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 aa_a copy current the License at
+with the License.  You may obtain a copy current the License at
 
http://www.apache.org/licenses/LICENSE-2.0
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7a29ec3d/java7/api/src/main/java/org/apache/tamaya/ConfigException.java
--
diff --git a/java7/api/src/main/java/org/apache/tamaya/ConfigException.java 
b/java7/api/src/main/java/org/apache/tamaya/ConfigException.java
index baf7d4d..bac2ef4 100644
--- a/java7/api/src/main/java/org/apache/tamaya/ConfigException.java
+++ b/java7/api/src/main/java/org/apache/tamaya/ConfigException.java
@@ -26,7 +26,7 @@ public class ConfigException extends 

[2/2] incubator-tamaya git commit: TAMAYA-32 remove unused imports

[struberg]

TAMAYA-32 remove unused imports


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

Branch: refs/heads/master
Commit: ae6667533b751b3acf350465a6cecc7bd50ad29d
Parents: c3441b0
Author: Mark Struberg strub...@apache.org
Authored: Thu Jan 8 08:35:41 2015 +0100
Committer: Mark Struberg strub...@apache.org
Committed: Thu Jan 8 08:35:41 2015 +0100

--
 .../java/org/apache/tamaya/core/testdata/TestPropertyFilter.java   | 1 -
 .../org/apache/tamaya/modules/json/JSONPropertySourceTest.java | 2 --
 2 files changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ae666753/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java
--
diff --git 
a/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java
 
b/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java
index 0713fee..6faa831 100644
--- 
a/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java
+++ 
b/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java
@@ -21,7 +21,6 @@ package org.apache.tamaya.core.testdata;
 import org.apache.tamaya.spi.PropertyFilter;
 
 import javax.annotation.Priority;
-import java.util.function.Function;
 
 /**
  * Simple PropertyFilter that filters exact one value, registered using 
ServiceLoader.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ae666753/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java
--
diff --git 
a/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java
 
b/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java
index 0c48534..ad61374 100644
--- 
a/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java
+++ 
b/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceTest.java
@@ -19,7 +19,6 @@
 package org.apache.tamaya.modules.json;
 
 import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.core.propertysource.DefaultOrdinal;
 import org.apache.tamaya.spi.PropertySource;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
@@ -35,7 +34,6 @@ import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.fail;
 
 public class JSONPropertySourceTest {
 

[2/2] incubator-tamaya git commit: TAMAYA-39 Added ConfigurationContext#context()

[plexus]

TAMAYA-39 Added ConfigurationContext#context()


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

Branch: refs/heads/master
Commit: 40c671e8679308d64c7ff4af12c58592e65ff613
Parents: a1f8565
Author: Oliver B. Fischer ple...@apache.org
Authored: Wed Jan 7 00:04:04 2015 +0100
Committer: Oliver B. Fischer ple...@apache.org
Committed: Wed Jan 7 00:07:19 2015 +0100

--
 .../apache/tamaya/spi/ConfigurationContext.java |  5 ++
 modules/json/pom.xml|  6 +++
 .../JSONPropertySourceConfigurationTest.java| 52 
 3 files changed, 63 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/40c671e8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
--
diff --git a/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java 
b/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
index efad465..5c502cf 100644
--- a/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
+++ b/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
@@ -137,4 +137,9 @@ public interface ConfigurationContext {
  * @return the list of registered PropertyFilters, never null.
  */
 ListPropertyFilter getPropertyFilters();
+
+public static ConfigurationContext current(){
+return 
ServiceContext.getInstance().getService(ConfigurationContext.class).get();
+}
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/40c671e8/modules/json/pom.xml
--
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index 28abec9..16c5f74 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -41,6 +41,12 @@ under the License.
 /dependency
 
 dependency
+groupIdorg.apache.tamaya/groupId
+artifactIdtamaya-core/artifactId
+version${project.version}/version
+/dependency
+
+dependency
 groupIdcom.fasterxml.jackson.core/groupId
 artifactIdjackson-databind/artifactId
 /dependency

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/40c671e8/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceConfigurationTest.java
--
diff --git 
a/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceConfigurationTest.java
 
b/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceConfigurationTest.java
new file mode 100644
index 000..1a4c151
--- /dev/null
+++ 
b/modules/json/src/test/java/org/apache/tamaya/modules/json/JSONPropertySourceConfigurationTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+package org.apache.tamaya.modules.json;
+
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.hamcrest.CoreMatchers;
+import org.junit.Test;
+
+import java.io.File;
+import java.net.URL;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+
+public class JSONPropertySourceConfigurationTest {
+
+
+@Test
+public void testFull() throws Exception {
+URL configURL = 
JSONPropertySourceTest.class.getResource(/configs/valid/simple-flat-string-only-config.json);
+
+assertThat(configURL, CoreMatchers.notNullValue());
+
+File configFile = new File(configURL.toURI());
+
+JSONPropertySource source = new JSONPropertySource(configFile, 10);
+
+assertThat(source.getProperties().keySet(), hasSize(3));
+
+ConfigurationContext context = ConfigurationContext.current();
+
+context.addPropertySources(source);
+
+// @todo Finish!
+}
+}

[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'

[anatole]

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 4b0015048f519b6111586c415a93cceb95157d27
Parents: 3a0bf17 5bd97c9
Author: anatole anat...@apache.org
Authored: Mon Jan 5 10:13:51 2015 +0100
Committer: anatole anat...@apache.org
Committed: Mon Jan 5 10:13:51 2015 +0100

--
 .../org/apache/tamaya/core/internal/PropertyConverterManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] incubator-tamaya git commit: Removed non core functionality, adaptedd tests.

[anatole]

Removed non core functionality, adaptedd tests.


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

Branch: refs/heads/master
Commit: b5731e091ff1f7923dcbfe6fa9000b9db3d26308
Parents: 64a6af7
Author: anatole anat...@apache.org
Authored: Sun Jan 4 19:12:42 2015 +0100
Committer: anatole anat...@apache.org
Committed: Sun Jan 4 19:12:42 2015 +0100

--
 .../core/PathBasedPropertySourceProvider.java   |  93 --
 .../core/ResourcePropertySourceProvider.java| 102 ---
 .../core/formats/ConfigurationFormat.java   |  53 --
 .../tamaya/core/formats/PropertiesFormat.java   | 114 
 .../core/formats/PropertiesXmlFormat.java   | 115 
 .../internal/resource/ClassPathResource.java| 178 ---
 .../resource/DefaultResourceLoader.java |  93 --
 .../core/internal/resource/FileResource.java| 162 -
 .../internal/resource/InputStreamResource.java  | 117 
 .../core/internal/resource/UrlResource.java | 135 --
 .../core/propertysource/BasePropertySource.java |   6 +-
 .../core/propertysource/DefaultOrdinal.java |   2 +
 .../EnvironmentPropertySource.java  |   2 +-
 .../propertysource/SystemPropertySource.java|   6 +-
 .../core/resources/InputStreamSupplier.java |  37 
 .../apache/tamaya/core/resources/Resource.java  | 114 
 .../tamaya/core/resources/ResourceLoader.java   |  90 --
 apache.tamaya.core.resources.ResourceLoader |   2 +-
 .../propertysource/BasePropertySourceTest.java  |   4 +-
 .../testdata/TestPropertyDefaultSource.java |  51 ++
 .../TestPropertyDefaultSourceProvider.java  |  32 
 .../testdata/TestPropertySourceProvider.java|  51 +-
 .../org.apache.tamaya.spi.PropertySource|  19 ++
 ...org.apache.tamaya.spi.PropertySourceProvider |   1 -
 .../resources/cfg/defaults/test1.properties |  20 ---
 .../cfg/final/anotherTestFile.properties|  22 ---
 .../tamaya/format/ConfigurationFormat.java  |  53 ++
 .../apache/tamaya/format/PropertiesFormat.java  | 114 
 .../tamaya/format/PropertiesXmlFormat.java  | 115 
 .../tamaya/resource/InputStreamSupplier.java|  37 
 .../PathBasedPropertySourceProvider.java|  93 ++
 .../org/apache/tamaya/resource/Resource.java| 114 
 .../apache/tamaya/resource/ResourceLoader.java  |  90 ++
 .../ResourcePropertySourceProvider.java | 102 +++
 .../resource/internal/ClassPathResource.java| 178 +++
 .../internal/DefaultResourceLoader.java |  93 ++
 .../tamaya/resource/internal/FileResource.java  | 162 +
 .../resource/internal/InputStreamResource.java  | 117 
 .../tamaya/resource/internal/UrlResource.java   | 135 ++
 39 files changed, 1530 insertions(+), 1494 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/b5731e09/core/src/main/java/org/apache/tamaya/core/PathBasedPropertySourceProvider.java
--
diff --git 
a/core/src/main/java/org/apache/tamaya/core/PathBasedPropertySourceProvider.java
 
b/core/src/main/java/org/apache/tamaya/core/PathBasedPropertySourceProvider.java
deleted file mode 100644
index 31dbf4b..000
--- 
a/core/src/main/java/org/apache/tamaya/core/PathBasedPropertySourceProvider.java
+++ /dev/null
@@ -1,93 +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.
- */
-package org.apache.tamaya.core;
-
-import org.apache.tamaya.core.formats.ConfigurationFormat;
-import org.apache.tamaya.core.resources.Resource;
-import org.apache.tamaya.core.resources.ResourceLoader;
-import org.apache.tamaya.spi.PropertySource;
-import 

[2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'

[anatole]

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 7f39e7d1f748d73d614e665d684d9a383a9c
Parents: 11708a6 dbf8af8
Author: anatole anat...@apache.org
Authored: Sun Jan 4 21:59:49 2015 +0100
Committer: anatole anat...@apache.org
Committed: Sun Jan 4 21:59:49 2015 +0100

--
 pom.xml | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--

[2/2] incubator-tamaya git commit: TAMAYA-47: Activate some modules for overall tamaya build.

[anatole]

TAMAYA-47: Activate some modules for overall tamaya build.


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

Branch: refs/heads/master
Commit: ed3f706387da753ab70748ab087612c6e84d2c83
Parents: 7f3
Author: anatole anat...@apache.org
Authored: Mon Jan 5 01:37:01 2015 +0100
Committer: anatole anat...@apache.org
Committed: Mon Jan 5 01:37:01 2015 +0100

--
 .../org/apache/tamaya/ConfigurationTest.java|   7 ++
 .../src/main/java/old/ConfigurationBuilder.java |   8 +-
 .../config/FallbackSimpleConfigProvider.java|   2 +-
 .../factories/PropertySourcesBuilder.java   |   8 +-
 modules/formats/pom.xml |  40 
 .../tamaya/format/ConfigurationFormat.java  |   8 +-
 .../apache/tamaya/format/PropertiesFormat.java  |  20 ++--
 .../tamaya/format/PropertiesXmlFormat.java  |  20 ++--
 modules/injection/pom.xml   |  11 +-
 .../tamaya/inject/ConfiguredProperties.java |   4 +-
 .../tamaya/inject/ConfiguredProperty.java   |   9 +-
 .../org/apache/tamaya/inject/DefaultAreas.java  |   4 +-
 .../org/apache/tamaya/inject/DefaultValue.java  |   2 +-
 .../org/apache/tamaya/inject/DynamicValue.java  |   8 +-
 .../org/apache/tamaya/inject/LoadPolicy.java|   2 +-
 .../java/org/apache/tamaya/inject/NoConfig.java |   2 +-
 .../tamaya/inject/ObservesConfigChange.java |   6 +-
 .../tamaya/inject/WithConfigOperator.java   |   2 +-
 .../apache/tamaya/inject/WithLoadPolicy.java|   4 +-
 .../tamaya/inject/WithPropertyAdapter.java  |  45 
 .../tamaya/inject/WithPropertyConverter.java|  46 +
 .../internal/ConfigChangeCallbackMethod.java|  10 +-
 .../ConfigTemplateInvocationHandler.java|   4 +-
 .../inject/internal/ConfigurationInjector.java  |   2 +-
 .../tamaya/inject/internal/ConfiguredField.java |  21 ++--
 .../inject/internal/ConfiguredSetterMethod.java |  48 -
 .../tamaya/inject/internal/ConfiguredType.java  |   2 +-
 .../tamaya/inject/internal/InjectionUtils.java  |  79 ++
 .../internal/WeakConfigListenerManager.java |   2 +-
 .../inject/spi/ConfigurationFactorySpi.java |  60 ---
 .../tamaya/inject/spi/ConfigurationSpi.java |  98 --
 .../tamaya/inject/spi/PropertyAdapterSpi.java   |  72 -
 modules/pom.xml |   8 +-
 .../internal/DefaultExpressionEvaluator.java|   7 +-
 .../internal/EnvironmentPropertyResolver.java   |   2 -
 .../internal/ExpressionResolutionFilter.java|  91 +
 .../internal/SystemPropertyResolver.java|   1 -
 .../resolver/spi/ExpressionEvaluator.java   |  17 
 .../tamaya/resolver/spi/ExpressionResolver.java |   2 -
 ...ache.tamaya.resolver.spi.ExpressionEvaluator |  19 
 .../tamaya/resolver/MyResolutionTest.java   |  18 
 .../tamaya/resolver/MyTestPropertySource.java   |  18 
 ...AbstractPathBasedPropertySourceProvider.java |  91 +
 .../AbstractResourcePropertySourceProvider.java | 101 ++
 .../PathBasedPropertySourceProvider.java|  93 -
 .../org/apache/tamaya/resource/Resource.java|  13 +--
 .../apache/tamaya/resource/ResourceLoader.java  |  90 
 .../ResourcePropertySourceProvider.java | 102 ---
 .../tamaya/resource/ResourceResolver.java   |  90 
 .../resource/internal/ClassPathResource.java|  27 +++--
 .../internal/DefaultResourceLoader.java |  93 -
 .../internal/DefaultResourceResolver.java   |  93 +
 .../tamaya/resource/internal/FileResource.java  |  18 +++-
 .../resource/internal/InputStreamResource.java  |   4 +-
 .../tamaya/resource/internal/UrlResource.java   |  11 +-
 pom.xml |   1 +
 56 files changed, 855 insertions(+), 811 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ed3f7063/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
--
diff --git a/api/src/test/java/org/apache/tamaya/ConfigurationTest.java 
b/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
index 71ece83..0e62205 100644
--- a/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
+++ b/api/src/test/java/org/apache/tamaya/ConfigurationTest.java
@@ -68,4 +68,11 @@ public class ConfigurationTest {
 public void testQuery() throws Exception {
 assertEquals(myFooResult, Configuration.current().query(c - 
myFooResult));
 }
+
+@org.junit.Test
+

[2/2] incubator-tamaya git commit: add TODO for PropertyFilters

[struberg]

add TODO for PropertyFilters


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

Branch: refs/heads/master
Commit: 2d508f3dbca93bef97e7670abfde7008210f06e9
Parents: 251432b
Author: Mark Struberg strub...@apache.org
Authored: Tue Dec 30 11:48:55 2014 +0100
Committer: Mark Struberg strub...@apache.org
Committed: Tue Dec 30 11:48:55 2014 +0100

--
 api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/2d508f3d/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
--
diff --git a/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java 
b/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
index 7cfadc7..370683d 100644
--- a/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
+++ b/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
@@ -90,4 +90,6 @@ public interface ConfigurationContext {
  */
 MapClass?, ListPropertyConverter? getPropertyConverters();
 
+
+//X TODO add a way to manage and use PropertyFilters
 }

[2/2] incubator-tamaya git commit: TAMAYA-19: Streamlined API and impl.

[anatole]

TAMAYA-19:  Streamlined API and impl.


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

Branch: refs/heads/master
Commit: 0b5d4feefb8d627a2a1f47984abe391fd781d86a
Parents: 7183623
Author: anatole anat...@apache.org
Authored: Fri Dec 26 01:42:41 2014 +0100
Committer: anatole anat...@apache.org
Committed: Fri Dec 26 01:42:41 2014 +0100

--
 api/src/main/java/org/apache/tamaya/Codec.java  |  96 -
 .../java/org/apache/tamaya/ConfigChangeSet.java | 167 ---
 .../apache/tamaya/ConfigChangeSetBuilder.java   | 432 ---
 .../main/java/org/apache/tamaya/MetaInfo.java   | 161 ---
 .../java/org/apache/tamaya/MetaInfoBuilder.java | 200 -
 .../java/org/apache/tamaya/PropertyAdapter.java |  89 
 .../org/apache/tamaya/spi/ConfigurationSpi.java |  30 +-
 .../core/config/AbstractConfiguration.java  |  35 +-
 .../tamaya/core/config/ConfigChangeSet.java | 169 
 .../core/config/ConfigChangeSetBuilder.java | 359 +++
 .../core/config/ConfigurationBuilder.java   |  36 +-
 .../tamaya/core/config/MappedConfiguration.java |  12 -
 .../config/DefaultConfigurationSpi.java |  17 +-
 .../inject/ConfigChangeCallbackMethod.java  |   4 +-
 .../internal/inject/ConfiguredSetterMethod.java |   2 +-
 .../core/internal/inject/ConfiguredType.java|   2 +-
 .../core/internal/inject/InjectionUtils.java|  25 +-
 .../inject/WeakConfigListenerManager.java   |   2 +-
 .../properties/AggregatedPropertySource.java|  21 +-
 .../properties/ContextualPropertySource.java|  17 +-
 .../properties/DelegatingPropertySource.java|   9 +-
 .../core/properties/FilteredPropertySource.java |  21 +-
 .../core/properties/FreezedPropertySource.java  |  10 -
 .../core/properties/MapBasedPropertySource.java |  31 --
 .../core/properties/PropertySourceBuilder.java  |  40 +-
 .../core/properties/PropertySourceFactory.java  |  18 +-
 .../properties/ReplacingPropertySource.java |  20 +-
 .../properties/SubtractingPropertySource.java   |  20 -
 .../properties/ValueFilteredPropertySource.java |  51 +++
 .../tamaya/core/config/MutableConfigTest.java   | 102 +++--
 .../internal/MutableTestConfigProvider.java |  21 +-
 .../tamaya/ucs/deltaspike/ConfigFiltering.java  |  61 +++
 32 files changed, 865 insertions(+), 1415 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0b5d4fee/api/src/main/java/org/apache/tamaya/Codec.java
--
diff --git a/api/src/main/java/org/apache/tamaya/Codec.java 
b/api/src/main/java/org/apache/tamaya/Codec.java
deleted file mode 100644
index 90b9676..000
--- a/api/src/main/java/org/apache/tamaya/Codec.java
+++ /dev/null
@@ -1,96 +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.
- */
-package org.apache.tamaya;
-
-
-import org.apache.tamaya.annotation.WithCodec;
-import org.apache.tamaya.spi.CodecSpi;
-import org.apache.tamaya.spi.ServiceContext;
-
-/**
- * Interface for an codec that converts a configured String into something 
else and vice versa.
- * This is used for implementing type conversion from a property (String) to a 
certain target
- * type. Hereby the target type can be multivalued (eg eollections), complex 
or even contain
- * full subconfigurations, if needed. The operation converting from a type T 
to a String can be
- * used by mutable configuration/property sources, when applying a {@link 
org.apache.tamaya.ConfigChangeSet}
- * to render the correct String representation of a entry changed.
- */
-public interface CodecT{
-
-/**
- * Adapt the given configuration keys to the required target type.
- * @param value the configuration keys
- * @return adapted keys
- */
-T deserialize(String value);
-
-/**
- * Adapt the given configuration keys to the required