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/05/21 09:40:32 UTC
[14/15] 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/4927cad8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4927cad8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4927cad8
Branch: refs/heads/master
Commit: 4927cad8acb7d06ed2edfd2f937c713a9bb0e326
Parents: f534cb6 f49c07c
Author: anatole <an...@apache.org>
Authored: Thu May 21 06:46:19 2015 +0200
Committer: anatole <an...@apache.org>
Committed: Thu May 21 06:46:19 2015 +0200
----------------------------------------------------------------------
.gitignore | 3 ++-
.../tamaya/spi/ServiceContextManager.java | 7 ++++-
.../internal/DefaultConfigurationProvider.java | 6 ++++-
....apache.tamaya.core.resources.ResourceLoader | 19 -------------
...pache.tamaya.spi.ConfigurationContextBuilder | 19 +++++++++++++
.../org.apache.tamaya.spi.PropertySource | 3 +--
...tServiceContextTest$InvalidPriorityInterface | 3 +--
...efaultServiceContextTest$MultiImplsInterface | 2 +-
.../internal/DefaultConfigurationContext.java | 9 ++++++-
.../internal/DefaultConfigurationProvider.java | 9 ++++++-
....apache.tamaya.core.resources.ResourceLoader | 19 -------------
...pache.tamaya.spi.ConfigurationContextBuilder | 19 +++++++++++++
.../org.apache.tamaya.spi.PropertySource | 2 +-
jqassistant/default.xml | 1 +
jqassistant/serviceloader-rules.xml | 28 ++++++++++++++++++--
.../org.apache.tamaya.spi.PropertySource | 2 +-
...org.apache.tamaya.spi.PropertySourceProvider | 19 -------------
17 files changed, 99 insertions(+), 71 deletions(-)
----------------------------------------------------------------------