You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by st...@apache.org on 2015/01/03 19:07:43 UTC
[2/9] incubator-tamaya git commit: Merge remote-tracking branch
'rsandtner/TAMAYA-38' into TAMAYA-38
Merge remote-tracking branch 'rsandtner/TAMAYA-38' into TAMAYA-38
Conflicts:
core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/78732d44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/78732d44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/78732d44
Branch: refs/heads/master
Commit: 78732d44cfbf18a300ac071276a03204407b7d83
Parents: ced3463 51960ef
Author: Mark Struberg <st...@apache.org>
Authored: Sat Jan 3 14:43:02 2015 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Jan 3 14:43:02 2015 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/spi/PropertySource.java | 7 ++
core/pom.xml | 33 +-----
.../core/propertysource/BasePropertySource.java | 76 +++++++++++++
.../core/propertysource/DefaultOrdinal.java | 46 ++++++++
.../EnvironmentPropertySource.java | 47 ++++++++
.../propertysource/SystemPropertySource.java | 82 ++++++++++++++
.../propertysource/BasePropertySourceTest.java | 107 +++++++++++++++++++
.../EnvironmentPropertySourceTest.java | 70 ++++++++++++
.../SystemPropertySourceTest.java | 103 ++++++++++++++++++
9 files changed, 539 insertions(+), 32 deletions(-)
----------------------------------------------------------------------