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


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

Branch: refs/heads/master
Commit: 2b1ef40f17527e5734c2205e7bc22807529e6bfb
Parents: eaa8788 e5a84e3
Author: anatole <[email protected]>
Authored: Fri Oct 28 00:25:54 2016 +0200
Committer: anatole <[email protected]>
Committed: Fri Oct 28 00:25:54 2016 +0200

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 builder/pom.xml                                 | 104 +++
 .../tamaya/builder/ConfigurationBuilder.java    | 605 +++++++++++++
 .../ProgrammaticConfigurationContext.java       | 388 ++++++++
 .../tamaya/builder/PropertySourceBuilder.java   | 118 +++
 .../tamaya/builder/SimplePropertySource.java    |  86 ++
 .../org/apache/tamaya/builder/package-info.java |  28 +
 .../builder/ConfigurationBuilderTest.java       | 907 +++++++++++++++++++
 .../builder/TestANonSPIPropertyFilter.java      |  35 +
 .../builder/TestBNonSPIPropertyFilter.java      |  35 +
 .../tamaya/builder/TestPropertyFilter.java      |  35 +
 .../tamaya/builder/TestPropertySource.java      |  59 ++
 .../builder/TestPropertySourceProvider.java     |  91 ++
 .../builder/TestPropertySourceProviderB.java    |  91 ++
 .../builder/util/mockito/NotMockedAnswer.java   |  57 ++
 .../tamaya/builder/util/types/CustomTypeA.java  |  34 +
 .../tamaya/builder/util/types/CustomTypeB.java  |  39 +
 .../tamaya/builder/util/types/CustomTypeC.java  |  36 +
 .../types/CustomTypeCPropertyConverter.java     |  29 +
 .../org.apache.tamaya.spi.PropertyConverter     |  19 +
 .../org.apache.tamaya.spi.PropertyFilter        |  19 +
 .../org.apache.tamaya.spi.PropertySource        |  19 +
 ...org.apache.tamaya.spi.PropertySourceProvider |  19 +
 .../test/resources/configfiles/json/first.json  |   4 +
 .../test/resources/configfiles/json/second.json |   4 +
 .../test/resources/configfiles/json/simple.json |   4 +
 .../test/resources/configfiles/json/third.json  |   4 +
 .../test/resources/configfiles/other/simple.oml |  19 +
 readme.md                                       |   8 +-
 tamaya-classloader-support/pom.xml              |  73 ++
 .../AbstractClassloaderAwareItemLoader.java     | 268 ++++++
 .../clsupport/CLAwareConfigurationContext.java  | 105 +++
 .../tamaya/clsupport/CLAwareServiceContext.java | 248 +++++
 .../tamaya/clsupport/ServiceContainer.java      | 306 +++++++
 .../apache/tamaya/clsupport/package-info.java   |  22 +
 .../org.apache.tamaya.spi.ServiceContext        |  19 +
 ...he.tamaya.environment.spi.ContextProviderSpi |  23 +
 ...org.apache.tamaya.environment.spi.ContextSpi |  19 +
 38 files changed, 3976 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


Reply via email to