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 2014/12/08 00:54:38 UTC
[2/2] incubator-tamaya git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Conflicts:
api/src/main/java/org/apache/tamaya/ConfigFunctions.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/1c11c0f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/1c11c0f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/1c11c0f0
Branch: refs/heads/master
Commit: 1c11c0f0954e9e00f434e437aeb1d2b426de529f
Parents: 889bf37 67f27e1
Author: anatole <an...@apache.org>
Authored: Mon Dec 8 00:53:38 2014 +0100
Committer: anatole <an...@apache.org>
Committed: Mon Dec 8 00:53:38 2014 +0100
----------------------------------------------------------------------
.../apache/tamaya/PropertyProviderBuilder.java | 83 ++++++++++++--------
api/src/test/resources/META-INF/beans.xml | 25 ++++++
....tamaya.spi.ConfigurationManagerSingletonSpi | 18 +++++
...he.tamaya.spi.EnvironmentManagerSingletonSpi | 18 +++++
...ache.tamaya.spi.PropertyAdaptersSingletonSpi | 18 +++++
...DependentApplicationEnvironmentProvider.java | 2 +-
...ssLoaderDependentEarEnvironmentProvider.java | 2 +-
.../DefaultConfigFormatsSingletonSpi.java | 6 +-
.../internal/inject/ConfigurationInjector.java | 2 +-
.../core/internal/inject/ConfiguredField.java | 2 +-
.../logging/AbstractDelegatingLogger.java | 4 +-
.../core/internal/logging/Log4jLogger.java | 4 +-
.../properties/AggregatedPropertyProvider.java | 2 +-
.../properties/BuildablePropertyProvider.java | 20 ++++-
.../DefaultPropertyAdaptersSingletonSpi.java | 2 +-
.../IntersectingPropertyProvider.java | 2 +-
.../properties/ReplacingPropertyProvider.java | 8 +-
.../properties/SubtractingPropertyProvider.java | 4 +-
.../resources/AntPathClasspathResolver.java | 2 +-
.../internal/resources/AntPathFileResolver.java | 2 +-
.../resources/DefaultPathResourceLoader.java | 8 +-
.../internal/resources/io/AntPathMatcher.java | 16 ++--
.../core/internal/resources/io/ClassUtils.java | 8 +-
.../io/PathMatchingResourcePatternResolver.java | 19 +++--
.../core/internal/resources/io/StringUtils.java | 6 +-
.../tamaya/core/config/MutableConfigTest.java | 4 +-
.../java/org/apache/tamaya/package-info.java | 20 ++++-
.../samples/annotations/ConfiguredTest.java | 6 +-
.../apache/tamaya/ucs/UC1ReadProperties.java | 2 +-
.../UC1ReadProperties/UC1ReadPropertiesTest.ini | 20 ++++-
.../UC1ReadPropertiesTest.properties | 20 ++++-
.../ucs/UC2CombineProperties/props1.properties | 20 ++++-
.../ucs/UC2CombineProperties/props2.properties | 18 +++++
.../java/metamodel/ext/cdi/ConfiguredClass.java | 20 +++++
.../java/metamodel/ext/cdi/ConfiguredTest.java | 27 ++++---
.../metamodel/ext/cdi/TestConfigProvider.java | 21 ++++-
36 files changed, 354 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1c11c0f0/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
----------------------------------------------------------------------