You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2015/03/18 00:49:17 UTC
[5/6] incubator-tamaya git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-tamaya
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/a3c702e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/a3c702e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/a3c702e2
Branch: refs/heads/master
Commit: a3c702e2b94e56aa9094f97695eb3d6574ec8fe0
Parents: ded8115 ff3faca
Author: anatole <an...@apache.org>
Authored: Mon Mar 16 01:43:29 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Mon Mar 16 01:43:29 2015 +0100
----------------------------------------------------------------------
docs/misc/examples.adoc | 76 ++
docs/misc/examples.adocoff | 76 --
docs/mod_builder.adoc | 50 ++
docs/modules.adoc | 1 +
.../converters/LocalDateConverterTest.java | 41 +
modules/builder/pom.xml | 14 +
.../tamaya/builder/ConfigurationBuilder.java | 580 ++++++++++++
.../ProgrammaticConfigurationContext.java | 406 +++++++++
.../org/apache/tamaya/builder/package-info.java | 28 +
.../modules/builder/ConfigurationBuilder.java | 251 ------
.../ProgrammaticConfigurationContext.java | 406 ---------
.../builder/ConfigurationBuilderTest.java | 896 +++++++++++++++++++
.../builder/TestNonSPIPropertyFilterA.java | 34 +
.../builder/TestNonSPIPropertyFilterB.java | 34 +
.../tamaya/builder/TestPropertyFilter.java | 34 +
.../tamaya/builder/TestPropertySource.java | 58 ++
.../builder/TestPropertySourceProvider.java | 89 ++
.../builder/TestPropertySourceProviderB.java | 89 ++
.../builder/util/mockito/NotMockedAnswer.java | 55 ++
.../tamaya/builder/util/types/CustomTypeA.java | 34 +
.../tamaya/builder/util/types/CustomTypeB.java | 39 +
.../tamaya/builder/util/types/CustomTypeC.java | 36 +
.../types/CustomTypeCPropertyConverter.java | 28 +
.../builder/ConfigurationBuilderTest.java | 762 ----------------
.../builder/TestNonSPIPropertyFilterA.java | 34 -
.../builder/TestNonSPIPropertyFilterB.java | 34 -
.../modules/builder/TestPropertyFilter.java | 34 -
.../modules/builder/TestPropertySource.java | 58 --
.../builder/TestPropertySourceProvider.java | 89 --
.../builder/TestPropertySourceProviderB.java | 89 --
.../builder/util/mockito/NotMockedAnswer.java | 55 --
.../modules/builder/util/types/CustomTypeA.java | 34 -
.../modules/builder/util/types/CustomTypeB.java | 39 -
.../modules/builder/util/types/CustomTypeC.java | 36 -
.../types/CustomTypeCPropertyConverter.java | 28 -
.../org.apache.tamaya.PropertyConverter | 2 +-
.../org.apache.tamaya.spi.PropertyFilter | 2 +-
.../org.apache.tamaya.spi.PropertySource | 2 +-
...org.apache.tamaya.spi.PropertySourceProvider | 2 +-
.../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 +
.../tamaya/json/JSONConfigurationFormat.java | 42 +
.../java/org/apache/tamaya/json/JSONFormat.java | 71 ++
.../apache/tamaya/json/JSONPropertySource.java | 199 ++++
.../tamaya/json/JSONPropertySourceProvider.java | 64 ++
.../org/apache/tamaya/json/JSONVisitor.java | 107 +++
.../modules/json/JSONConfigurationFormat.java | 42 -
.../apache/tamaya/modules/json/JSONFormat.java | 71 --
.../tamaya/modules/json/JSONPropertySource.java | 199 ----
.../json/JSONPropertySourceProvider.java | 64 --
.../apache/tamaya/modules/json/JSONVisitor.java | 107 ---
...org.apache.tamaya.format.ConfigurationFormat | 2 +-
.../json/CommonJSONTestCaseCollection.java | 173 ++++
.../tamaya/json/ConfigurationDataUCD.java | 44 +
.../org/apache/tamaya/json/JSONFormatIT.java | 47 +
.../org/apache/tamaya/json/JSONFormatTest.java | 75 ++
...pertySourceProviderExistingConfigFileIT.java | 87 ++
...opertySourceProviderMissingConfigFileIT.java | 69 ++
.../tamaya/json/JSONPropertySourceTest.java | 49 +
.../tamaya/json/JSONPropertySourceUCD.java | 39 +
.../apache/tamaya/json/UnifiedConfigData.java | 32 +
.../json/CommonJSONTestCaseCollection.java | 173 ----
.../modules/json/ConfigurationDataUCD.java | 44 -
.../tamaya/modules/json/JSONFormatIT.java | 47 -
.../tamaya/modules/json/JSONFormatTest.java | 75 --
...pertySourceProviderExistingConfigFileIT.java | 87 --
...opertySourceProviderMissingConfigFileIT.java | 69 --
.../modules/json/JSONPropertySourceTest.java | 49 -
.../modules/json/JSONPropertySourceUCD.java | 39 -
.../tamaya/modules/json/UnifiedConfigData.java | 32 -
pom.xml | 12 +-
74 files changed, 3768 insertions(+), 3132 deletions(-)
----------------------------------------------------------------------