Hi Anatole!
Please always do a $> git pull --rebase otherwise we will have all those nasty merge noise in the log. Isn't exactly helping when tracking changes... LieGrue, strub > On Tuesday, 6 January 2015, 17:23, "[email protected]" <[email protected]> > wrote: > > 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/1bdd4b71 > Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/1bdd4b71 > Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/1bdd4b71 > > Branch: refs/heads/master > Commit: 1bdd4b7195b6882713d0be2b6acf32686751edd6 > Parents: e53022e a2a36f1 > Author: anatole <[email protected]> > Authored: Tue Jan 6 17:22:53 2015 +0100 > > Committer: anatole <[email protected]> > Committed: Tue Jan 6 17:22:53 2015 +0100 > > ---------------------------------------------------------------------- > .../apache/tamaya/spi/ConfigurationContext.java | 2 +- > .../core/internal/DefaultConfiguration.java | 2 +- > .../internal/DefaultConfigurationContext.java | 3 - > .../core/internal/PropertiesFileLoader.java | 102 ++++++++++++++++++ > .../core/internal/PropertyConverterManager.java | 21 ++-- > .../core/propertysource/DefaultOrdinal.java | 7 +- > .../PropertiesFilePropertySource.java | 47 +++++++++ > .../PropertiesPropertySource.java | 51 +++++++++ > .../propertysource/SystemPropertySource.java | 15 ++- > .../provider/JavaConfigurationProvider.java | 60 +++++++++++ > .../test/internal/PropetiesFileLoaderTest.java | 76 ++++++++++++++ > .../PropertiesFilePropertySourceTest.java | 71 +++++++++++++ > .../provider/JavaConfigurationProviderTest.java | 53 ++++++++++ > ...org.apache.tamaya.spi.PropertySourceProvider | 3 +- > .../test/resources/javaconfiguration.properties | 22 ++++ > .../test/resources/overrideOrdinal.properties | 25 +++++ > core/src/test/resources/testfile.properties | 22 ++++ > extras/json/pom.xml | 63 +++++++++++ > .../tamaya/extras/json/FileBasedResource.java | 50 +++++++++ > .../tamaya/extras/json/InputResource.java | 27 +++++ > .../tamaya/extras/json/JSONPropertySource.java | 104 +++++++++++++++++++ > .../apache/tamaya/extras/json/JSONVisitor.java | 76 ++++++++++++++ > .../resources/configs/valid/simple-config.json | 5 + > extras/pom.xml | 41 ++++++++ > pom.xml | 8 ++ > 25 files changed, 930 insertions(+), 26 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1bdd4b71/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java > > ---------------------------------------------------------------------- >
