tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ple...@apache.org
Subject [24/24] incubator-tamaya git commit: Removed all modules from the main repository. They will be reborn in separate ASF repository.
Date Thu, 15 Sep 2016 17:26:41 GMT
Removed all modules from the main repository. They will be reborn in separate ASF repository.


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

Branch: refs/heads/master
Commit: 359d3e4a20bbbcfc8b016325bef7fe2056c267cd
Parents: a41d143
Author: Oliver B. Fischer <plexus@apache.org>
Authored: Thu Sep 15 19:26:04 2016 +0200
Committer: Oliver B. Fischer <plexus@apache.org>
Committed: Thu Sep 15 19:26:04 2016 +0200

----------------------------------------------------------------------
 modules/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 -
 modules/classloader-support/pom.xml             |  74 --
 .../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 -
 modules/collections/pom.xml                     |  74 --
 .../internal/AdaptiveCombinationPolicy.java     | 125 ---
 .../internal/ArrayListConverter.java            |  62 --
 .../internal/CollectionConverter.java           |  63 --
 .../internal/ConcurrentHashMapConverter.java    |  63 --
 .../collections/internal/HashMapConverter.java  |  63 --
 .../collections/internal/HashSetConverter.java  |  62 --
 .../collections/internal/ItemTokenizer.java     | 171 ----
 .../internal/LinkedListConverter.java           |  63 --
 .../collections/internal/ListConverter.java     |  55 --
 .../collections/internal/MapConverter.java      |  58 --
 .../collections/internal/SetConverter.java      |  55 --
 .../internal/SortedMapConverter.java            |  36 -
 .../internal/SortedSetConverter.java            |  36 -
 .../collections/internal/TreeMapConverter.java  |  62 --
 .../collections/internal/TreeSetConverter.java  |  63 --
 .../org.apache.tamaya.spi.PropertyConverter     |  31 -
 ...he.tamaya.spi.PropertyValueCombinationPolicy |  19 -
 .../collections/CollectionAdvancedTests.java    | 117 ---
 .../collections/CollectionsBaseTests.java       | 227 -----
 .../CollectionsTypedReadOnlyTests.java          | 173 ----
 .../collections/CollectionsTypedTests.java      | 208 -----
 .../collections/MyUpperCaseConverter.java       |  33 -
 .../META-INF/javaconfiguration.properties       |  73 --
 modules/events/pom.xml                          |  99 --
 .../org/apache/tamaya/events/ChangeType.java    |  31 -
 .../org/apache/tamaya/events/ConfigEvent.java   |  55 --
 .../tamaya/events/ConfigEventListener.java      |  31 -
 .../tamaya/events/ConfigEventManager.java       | 186 ----
 .../tamaya/events/ConfigurationChange.java      | 218 -----
 .../events/ConfigurationChangeBuilder.java      | 274 ------
 .../events/ConfigurationContextChange.java      | 210 -----
 .../ConfigurationContextChangeBuilder.java      | 174 ----
 .../tamaya/events/FrozenConfiguration.java      | 194 ----
 .../tamaya/events/FrozenPropertySource.java     | 126 ---
 .../tamaya/events/PropertySourceChange.java     | 242 -----
 .../events/PropertySourceChangeBuilder.java     | 263 ------
 .../tamaya/events/delta/package-info.java       |  23 -
 .../folderobserver/FileChangeListener.java      | 144 ---
 .../folderobserver/FileChangeObserver.java      |  33 -
 .../ObservingPropertySourceProvider.java        | 209 -----
 .../events/folderobserver/package-info.java     |  24 -
 .../internal/DefaultConfigChangeObserver.java   | 111 ---
 .../internal/DefaultConfigEventManagerSpi.java  | 202 -----
 ...faultConfigurationContextChangeListener.java |  74 --
 .../events/internal/LoggingConfigListener.java  |  40 -
 .../tamaya/events/internal/package-info.java    |  22 -
 .../org/apache/tamaya/events/package-info.java  |  24 -
 .../tamaya/events/spi/BaseConfigEvent.java      |  69 --
 .../events/spi/ConfigEventManagerSpi.java       | 128 ---
 .../apache/tamaya/events/spi/package-info.java  |  23 -
 ...org.apache.tamaya.events.ConfigEventListener |  19 -
 ...ache.tamaya.events.spi.ConfigEventManagerSpi |  19 -
 .../events/ChangeableGlobalPropertySource.java  |  62 --
 .../ChangeableThreadLocalPropertySource.java    |  57 --
 .../tamaya/events/ConfigEventManagerTest.java   |  66 --
 .../tamaya/events/FrozenPropertySourceTest.java | 106 ---
 .../tamaya/events/ObservedConfigTest.java       |  69 --
 .../tamaya/events/RandomPropertySource.java     |  66 --
 .../org/apache/tamaya/events/SimpleEvent.java   |  32 -
 .../apache/tamaya/events/TestConfigView.java    | 156 ----
 .../tamaya/events/TestObservingProvider.java    |  92 --
 .../events/delta/ConfigurationChangeTest.java   | 163 ----
 .../delta/ConfigurationContextChangeTest.java   | 138 ---
 .../events/delta/PropertySourceChangeTest.java  | 209 -----
 .../DefaultConfigEventManagerSpiTest.java       |  66 --
 ...org.apache.tamaya.events.ConfigEventListener |  19 -
 .../org.apache.tamaya.spi.PropertySource        |  19 -
 ...org.apache.tamaya.spi.PropertySourceProvider |  19 -
 .../src/test/resources/data/test1.properties    |  20 -
 .../src/test/resources/data/test1b.properties   |  20 -
 .../src/test/resources/data/test2.properties    |  20 -
 .../src/test/resources/data/test3.properties    |  20 -
 .../events/src/test/resources/test.properties   |  21 -
 modules/filter/pom.xml                          |  81 --
 .../tamaya/filter/ConfigurationFilter.java      | 121 ---
 .../tamaya/filter/ProgrammableFilter.java       | 118 ---
 .../tamaya/filter/RegexPropertyFilter.java      |  56 --
 .../filter/internal/DefaultMetadataFilter.java  |  43 -
 .../org.apache.tamaya.spi.PropertyFilter        |  19 -
 .../tamaya/filter/ConfigurationFilterTest.java  | 122 ---
 .../tamaya/filter/ProgrammableFilterTest.java   | 141 ---
 .../tamaya/filter/RegexPropertyFilterTest.java  |  55 --
 modules/formats/pom.xml                         |  86 --
 .../BaseFormatPropertySourceProvider.java       | 154 ----
 .../apache/tamaya/format/ConfigurationData.java | 206 -----
 .../tamaya/format/ConfigurationDataBuilder.java | 219 -----
 .../tamaya/format/ConfigurationFormat.java      | 103 ---
 .../tamaya/format/ConfigurationFormats.java     | 187 ----
 .../format/FlattenedDefaultPropertySource.java  | 118 ---
 .../tamaya/format/InputStreamFactory.java       |  89 --
 .../format/formats/IniConfigurationFormat.java  |  95 --
 .../tamaya/format/formats/PropertiesFormat.java |  71 --
 .../format/formats/PropertiesXmlFormat.java     |  69 --
 .../tamaya/format/formats/package-info.java     |  23 -
 .../org/apache/tamaya/format/package-info.java  |  28 -
 ...org.apache.tamaya.format.ConfigurationFormat |  21 -
 .../tamaya/format/ConfigurationFormatsTest.java |  68 --
 .../FlattenedDefaultPropertySourceTest.java     |  98 --
 .../tamaya/format/InputStreamFactoryTest.java   | 145 ---
 modules/formats/src/test/resources/Test.ini     |  26 -
 .../formats/src/test/resources/Test.properties  |  21 -
 modules/functions/pom.xml                       |  79 --
 .../tamaya/functions/CombinedConfiguration.java | 146 ---
 .../functions/ConfigWrappingPropertySource.java |  80 --
 .../functions/ConfigurationFunctions.java       | 662 --------------
 .../tamaya/functions/EnrichedConfiguration.java | 159 ----
 .../functions/EnrichedPropertySource.java       |  97 --
 .../tamaya/functions/FilteredConfiguration.java | 126 ---
 .../functions/FilteredPropertySource.java       |  84 --
 .../org/apache/tamaya/functions/KeyMapper.java  |  37 -
 .../tamaya/functions/MappedConfiguration.java   | 132 ---
 .../tamaya/functions/MappedPropertySource.java  |  88 --
 .../org/apache/tamaya/functions/Predicate.java  |  42 -
 .../apache/tamaya/functions/PropertyMapper.java |  36 -
 .../tamaya/functions/PropertyMatcher.java       |  38 -
 .../functions/PropertySourceFunctions.java      | 348 -------
 .../functions/ValueMappedPropertySource.java    |  85 --
 .../apache/tamaya/functions/package-info.java   |  22 -
 .../functions/ConfigurationFunctionsTest.java   | 143 ---
 .../functions/PropertySourceFunctionsTest.java  | 106 ---
 modules/injection-api/pom.xml                   |  79 --
 .../tamaya/inject/api/BaseDynamicValue.java     | 125 ---
 .../org/apache/tamaya/inject/api/Config.java    |  93 --
 .../tamaya/inject/api/ConfigAutoInject.java     |  36 -
 .../inject/api/ConfigDefaultSections.java       |  44 -
 .../inject/api/ConfiguredItemSupplier.java      |  41 -
 .../apache/tamaya/inject/api/DynamicValue.java  | 161 ----
 .../tamaya/inject/api/InjectionUtils.java       | 127 ---
 .../apache/tamaya/inject/api/LoadPolicy.java    |  42 -
 .../org/apache/tamaya/inject/api/NoConfig.java  |  36 -
 .../apache/tamaya/inject/api/UpdatePolicy.java  |  40 -
 .../tamaya/inject/api/WithConfigOperator.java   |  45 -
 .../inject/api/WithPropertyConverter.java       |  46 -
 .../apache/tamaya/inject/api/package-info.java  |  22 -
 .../tamaya/inject/spi/ConfiguredField.java      |  68 --
 .../tamaya/inject/spi/ConfiguredMethod.java     |  70 --
 .../tamaya/inject/spi/ConfiguredType.java       |  63 --
 modules/injection/pom.xml                       | 102 ---
 .../tamaya/inject/ConfigurationInjection.java   |  42 -
 .../tamaya/inject/ConfigurationInjector.java    |  94 --
 .../ConfigTemplateInvocationHandler.java        |  73 --
 .../inject/internal/ConfiguredFieldImpl.java    | 170 ----
 .../inject/internal/ConfiguredSetterMethod.java | 139 ---
 .../inject/internal/ConfiguredTypeImpl.java     | 237 -----
 .../internal/DefaultConfigurationInjector.java  | 179 ----
 .../inject/internal/DefaultDynamicValue.java    | 498 ----------
 .../tamaya/inject/internal/InjectionHelper.java | 244 -----
 .../apache/tamaya/inject/internal/Utils.java    | 128 ---
 .../tamaya/inject/internal/package-info.java    |  22 -
 .../org/apache/tamaya/inject/package-info.java  |  22 -
 ...g.apache.tamaya.inject.ConfigurationInjector |  19 -
 .../java/annottext/AnnotatedConfigBean.java     |  78 --
 .../java/annottext/AnnotatedConfigTemplate.java |  47 -
 .../java/annottext/NonAnnotatedConfigBean.java  |  45 -
 .../tamaya/inject/TamayaInjectionTest.java      |  87 --
 .../tamaya/inject/TestPropertySource.java       |  68 --
 .../internal/DefaultDynamicValueTest.java       | 315 -------
 .../org.apache.tamaya.spi.PropertySource        |  19 -
 modules/integration/camel/pom.xml               | 100 --
 .../camel/TamayaPropertiesComponent.java        |  78 --
 .../camel/TamayaPropertyResolver.java           |  53 --
 .../camel/TamayaPropertyResolverTest.java       | 116 ---
 .../test/resources/META-INF/camelcontext.xml    |  52 --
 .../META-INF/javaconfiguration.properties       |  19 -
 .../src/test/resources/META-INF/routes.xml      |  39 -
 modules/integration/cdi-se/pom.xml              | 210 -----
 .../integration/cdi/CDIAwareServiceContext.java | 169 ----
 .../cdi/DefaultConfigurationContext.java        | 286 ------
 .../cdi/DefaultConfigurationContextBuilder.java | 152 ----
 .../tamaya/integration/cdi/EnumConverter.java   |  71 --
 .../cdi/PropertyConverterManager.java           | 427 ---------
 .../integration/cdi/SEInjectorCDIExtension.java | 112 ---
 .../cdi/ServiceLoaderServiceContext.java        | 151 ---
 .../integration/cdi/TamayaCDIIntegration.java   |  52 --
 .../integration/cdi/TamayaConfigProvider.java   |  54 --
 .../cdi/config/ConfiguredVetoExtension.java     |  42 -
 .../src/main/resources/META-INF/beans.xml       |  24 -
 .../javax.enterprise.inject.spi.Extension       |  20 -
 .../org.apache.tamaya.spi.ServiceContext        |  19 -
 .../tamaya/integration/cdi/ConfiguredClass.java | 112 ---
 .../tamaya/integration/cdi/ConfiguredTest.java  |  83 --
 .../tamaya/integration/cdi/InjectedClass.java   |  62 --
 .../cdi/cfg/ProvidedPropertySource.java         |  67 --
 .../integration/cdi/cfg/TestConfigProvider.java |  45 -
 .../integration/cdi/cfg/TestPropertySource.java |  79 --
 .../src/test/resources/META-INF/beans.xml       |  24 -
 .../META-INF/javaconfiguration.properties       |  20 -
 modules/integration/cdi/pom.xml                 | 224 -----
 .../integration/cdi/CDIConfiguredField.java     |  77 --
 .../integration/cdi/CDIConfiguredMethod.java    |  77 --
 .../integration/cdi/CDIConfiguredType.java      |  94 --
 .../integration/cdi/ConfigurationExtension.java | 287 ------
 .../integration/cdi/ConfigurationProducer.java  | 146 ---
 .../integration/cdi/DefaultDynamicValue.java    | 499 ----------
 .../cdi/src/main/resources/META-INF/beans.xml   |  19 -
 .../javax.enterprise.inject.spi.Extension       |  19 -
 ...onfigurationProducerFailedInjectionTest.java |  33 -
 .../cdi/ConfigurationProducerTest.java          | 168 ----
 .../cdi/ConfigurationResolverTest.java          | 112 ---
 .../integration/cdi/EnvironmentsTest.java       |  83 --
 .../integration/cdi/InterpolationTest.java      |  62 --
 .../integration/cdi/NotFoundNoDefault.java      |  78 --
 .../cdi/src/test/resources/META-INF/beans.xml   |  19 -
 .../META-INF/javaconfiguration.properties       |  32 -
 .../cdi/src/test/resources/base.properties      |  32 -
 .../cdi/src/test/resources/cert.properties      |  20 -
 .../cdi/src/test/resources/dev.properties       |  19 -
 .../cdi/src/test/resources/prod.properties      |  20 -
 .../cdi/src/test/resources/qa.properties        |  20 -
 .../cdi/src/test/resources/test.properties      |  20 -
 modules/integration/consul/pom.xml              | 112 ---
 .../apache/tamaya/consul/ConsulBackends.java    |  59 --
 .../tamaya/consul/ConsulPropertySource.java     | 198 ----
 .../org.apache.tamaya.spi.PropertySource        |  19 -
 .../tamaya/etcd/ConsulPropertySourceTest.java   |  75 --
 .../org/apache/tamaya/etcd/ConsulWriteTest.java |  80 --
 modules/integration/etcd/pom.xml                | 110 ---
 .../org/apache/tamaya/etcd/EtcdAccessor.java    | 520 -----------
 .../org/apache/tamaya/etcd/EtcdBackends.java    |  65 --
 .../apache/tamaya/etcd/EtcdPropertySource.java  | 209 -----
 .../org.apache.tamaya.spi.PropertySource        |  19 -
 .../apache/tamaya/etcd/EtcdAccessorTest.java    | 116 ---
 .../tamaya/etcd/EtcdPropertySourceTest.java     |  74 --
 modules/integration/osgi/pom.xml                | 102 ---
 .../tamaya/integration/osgi/Activator.java      | 134 ---
 .../integration/osgi/OSGIConfigRootMapper.java  |  36 -
 .../osgi/OSGIEnhancedConfiguration.java         | 117 ---
 .../integration/osgi/TamayaConfigAdminImpl.java | 196 ----
 .../osgi/TamayaConfigurationImpl.java           | 127 ---
 .../META-INF/javaconfiguration.properties       |  18 -
 .../osgi/src/test/resources/arquillian.xml      |  27 -
 .../osgi/src/test/resources/felix.properties    |  23 -
 modules/integration/pom.xml                     |  43 -
 modules/integration/spring/pom.xml              | 116 ---
 .../SpringConfigInjectionPostProcessor.java     |  42 -
 .../integration/spring/TamayaEnvironment.java   |  33 -
 .../integration/spring/TamayaSpringConfig.java  |  56 --
 .../spring/TamayaSpringPropertySource.java      |  39 -
 .../spring/src/main/resources/spring-config.xml |  32 -
 .../spring/ConfiguredSpringBean.java            |  62 --
 .../integration/spring/SpringConfigTest.java    |  61 --
 .../integration/spring/SpringConfigTest2.java   |  47 -
 .../META-INF/javaconfiguration.properties       |  20 -
 .../test/resources/spring-config-scanOnly.xml   |  35 -
 .../spring/src/test/resources/spring-config.xml |  31 -
 modules/json/pom.xml                            | 147 ---
 .../java/org/apache/tamaya/json/JSONFormat.java |  85 --
 .../apache/tamaya/json/JSONPropertySource.java  | 149 ---
 .../org/apache/tamaya/json/JSONVisitor.java     | 119 ---
 ...org.apache.tamaya.format.ConfigurationFormat |  19 -
 .../json/CommonJSONTestCaseCollection.java      | 190 ----
 .../org/apache/tamaya/json/JSONFormatIT.java    |  48 -
 .../org/apache/tamaya/json/JSONFormatTest.java  |  75 --
 .../tamaya/json/JSONPropertySourceTest.java     |  56 --
 modules/json/src/test/resources/arquillian.xml  |  30 -
 .../test/resources/configs/invalid/array.json   |  21 -
 .../resources/configs/invalid/empty-file.json   |  18 -
 .../configs/invalid/only-opening-bracket.json   |  19 -
 .../resources/configs/invalid/with-array.json   |  27 -
 .../test/resources/configs/valid/cyrillic.json  |  22 -
 .../configs/valid/empty-object-config.json      |  20 -
 .../valid/simple-flat-string-only-config.json   |  23 -
 .../simple-nested-string-only-config-1.json     |  27 -
 .../simple-nested-string-only-config-2.json     |  26 -
 .../configs/valid/with-explicit-priority.json   |  25 -
 modules/management/pom.xml                      |  81 --
 .../management/ConfigManagementSupport.java     | 128 ---
 .../apache/tamaya/management/ManagedConfig.java | 110 ---
 .../tamaya/management/ManagedConfigMBean.java   | 119 ---
 .../src/main/resources/META-INF/beans.xml       |  24 -
 .../META-INF/javaconfiguration.properties       |  19 -
 ....apache.tamaya.management.ManagedConfigMBean |  19 -
 .../management/internal/ManagedConfigTest.java  | 118 ---
 .../src/test/resources/META-INF/beans.xml       |  24 -
 modules/model/pom.xml                           | 120 ---
 .../org/apache/tamaya/model/ConfigModel.java    |  78 --
 .../apache/tamaya/model/ConfigModelManager.java | 289 ------
 .../apache/tamaya/model/ConfigUsageStats.java   | 129 ---
 .../org/apache/tamaya/model/ModelTarget.java    |  37 -
 .../java/org/apache/tamaya/model/Usage.java     | 312 -------
 .../org/apache/tamaya/model/Validation.java     | 203 -----
 .../apache/tamaya/model/ValidationResult.java   |  59 --
 .../model/internal/ConfigDocumentationBean.java | 197 ----
 .../ConfiguredInlineModelProviderSpi.java       |  69 --
 .../ConfiguredPropertiesModelProviderSpi.java   | 154 ----
 .../ConfiguredResourcesModelProviderSpi.java    | 160 ----
 .../ConfiguredTypeEventsModelPopulator.java     |  90 --
 .../ConfiguredTypeEventsModelProvider.java      |  51 --
 .../model/internal/DefaultConfigUsageStats.java | 176 ----
 .../model/internal/UsageTrackerFilter.java      |  46 -
 .../tamaya/model/spi/AbstractConfigModel.java   |  88 --
 .../model/spi/ConfigDocumentationMBean.java     |  53 --
 .../tamaya/model/spi/ConfigModelReader.java     | 144 ---
 .../tamaya/model/spi/ConfigUsageStatsSpi.java   | 101 ---
 .../org/apache/tamaya/model/spi/GroupModel.java | 110 ---
 .../tamaya/model/spi/ModelProviderSpi.java      |  39 -
 .../apache/tamaya/model/spi/ParameterModel.java | 242 -----
 .../apache/tamaya/model/spi/SectionModel.java   | 202 -----
 .../resources/META-INF/configmodel.properties   |  35 -
 ...org.apache.tamaya.events.ConfigEventListener |  19 -
 ...he.tamaya.model.spi.ConfigDocumentationMBean |  19 -
 ....apache.tamaya.model.spi.ConfigUsageStatsSpi |  19 -
 ...org.apache.tamaya.model.spi.ModelProviderSpi |  22 -
 .../org.apache.tamaya.spi.PropertyFilter        |  19 -
 .../tamaya/model/ConfigModelProviderTest.java   |  68 --
 .../tamaya/model/ConfigUsageStatsTest.java      | 114 ---
 .../apache/tamaya/model/ValidationTests.java    |  52 --
 .../internal/ConfigDocumentationBeanTest.java   | 108 ---
 .../java/test/model/TestConfigAccessor.java     |  45 -
 .../resources/META-INF/configmodel.properties   |  96 --
 .../META-INF/javaconfiguration.properties       |  22 -
 ...org.apache.tamaya.model.spi.ModelProviderSpi |  19 -
 .../src/test/resources/examples/configmodel.ini |  76 --
 .../test/resources/examples/configmodel.json    | 108 ---
 .../resources/examples/configmodel.properties   |  96 --
 .../src/test/resources/examples/configmodel.xml |  97 --
 .../test/resources/examples/configmodel.yaml    | 106 ---
 modules/mutable-config/pom.xml                  |  83 --
 .../mutableconfig/ChangePropagationPolicy.java  |  53 --
 .../mutableconfig/MutableConfiguration.java     | 126 ---
 .../MutableConfigurationProvider.java           | 239 -----
 .../internal/DefaultMutableConfiguration.java   | 170 ----
 .../DefaultMutableConfigurationSpi.java         |  38 -
 .../MutablePropertiesPropertySource.java        | 196 ----
 .../MutableXmlPropertiesPropertySource.java     | 198 ----
 .../mutableconfig/spi/ConfigChangeRequest.java  | 176 ----
 .../spi/MutableConfigurationProviderSpi.java    |  42 -
 .../spi/MutablePropertySource.java              |  47 -
 ...leconfig.spi.MutableConfigurationProviderSpi |  19 -
 .../mutableconfig/MutableConfigurationTest.java | 187 ----
 .../PropertiesFileConfigBackendTest.java        |  29 -
 .../internal/WritablePropertiesSource.java      |  49 -
 .../internal/WritableXmlPropertiesSource.java   |  49 -
 .../org.apache.tamaya.spi.PropertySource        |  20 -
 modules/optional/pom.xml                        |  81 --
 .../tamaya/optional/EvaluationPolicy.java       |  33 -
 .../tamaya/optional/OptionalConfiguration.java  | 214 -----
 .../apache/tamaya/optional/ValueProvider.java   |  40 -
 .../optional/OptionalConfigurationTest.java     | 101 ---
 modules/pom.xml                                 | 119 ---
 modules/resolver/pom.xml                        |  85 --
 .../org/apache/tamaya/resolver/Resolver.java    |  77 --
 .../resolver/internal/ConfigResolver.java       |  43 -
 .../internal/DefaultExpressionEvaluator.java    | 260 ------
 .../internal/EnvironmentPropertyResolver.java   |  42 -
 .../internal/ExpressionResolutionFilter.java    |  86 --
 .../tamaya/resolver/internal/FileResolver.java  | 120 ---
 .../resolver/internal/ResourceResolver.java     | 151 ---
 .../internal/SystemPropertyResolver.java        |  42 -
 .../tamaya/resolver/internal/URLResolver.java   |  66 --
 .../tamaya/resolver/internal/package-info.java  |  23 -
 .../apache/tamaya/resolver/package-info.java    |  22 -
 .../resolver/spi/ExpressionEvaluator.java       |  66 --
 .../tamaya/resolver/spi/ExpressionResolver.java |  48 -
 .../tamaya/resolver/spi/package-info.java       |  23 -
 ...ache.tamaya.resolver.spi.ExpressionEvaluator |  19 -
 ...pache.tamaya.resolver.spi.ExpressionResolver |  24 -
 .../org.apache.tamaya.spi.PropertyFilter        |  19 -
 .../tamaya/resolver/ConfigResolutionTest.java   | 121 ---
 .../tamaya/resolver/MyTestPropertySource.java   | 102 ---
 .../apache/tamaya/resolver/ResolverTest.java    |  41 -
 .../org.apache.tamaya.spi.PropertySource        |  19 -
 .../src/test/resources/Testresource.txt         |  19 -
 .../src/test/resources/Testresource2.txt        |  19 -
 modules/resources/README.md                     |  26 -
 modules/resources/pom.xml                       |  77 --
 .../AbstractPathPropertySourceProvider.java     | 193 ----
 .../tamaya/resource/BaseResourceResolver.java   | 111 ---
 .../apache/tamaya/resource/ConfigResources.java |  51 --
 .../apache/tamaya/resource/ResourceLocator.java |  37 -
 .../tamaya/resource/ResourceResolver.java       | 101 ---
 .../internal/ClassPathResourceLocator.java      |  69 --
 .../resource/internal/ClasspathCollector.java   | 381 --------
 .../internal/DefaultResourceResolver.java       |  60 --
 .../tamaya/resource/internal/FileCollector.java | 178 ----
 .../resource/internal/FileResourceLocator.java  |  69 --
 .../tamaya/resource/internal/Locator.java       | 155 ----
 .../resource/internal/PathResourceLocator.java  |  65 --
 .../resource/internal/URLResourceLocator.java   |  66 --
 .../tamaya/resource/internal/VfsSupport.java    | 252 ------
 .../tamaya/resource/internal/package-info.java  |  23 -
 .../apache/tamaya/resource/package-info.java    |  22 -
 .../org.apache.tamaya.resource.ResourceLocator  |  22 -
 .../org.apache.tamaya.resource.ResourceResolver |  19 -
 .../AbstractPathPropertySourceProviderTest.java | 133 ---
 .../internal/ClasspathCollectorTest.java        |  89 --
 .../internal/DefaultResourceResolverTest.java   |  59 --
 .../resource/internal/FileCollectorTest.java    |  72 --
 .../PathBasedPropertySourceProvider.java        |  97 --
 .../resources/resources_testroot/aa_a/a1_1.file |  18 -
 .../resources/resources_testroot/aa_a/a1_2.file |  18 -
 .../resources/resources_testroot/aa_a/a2.file   |  18 -
 .../resources/resources_testroot/aa_a/a3.file   |  18 -
 .../resources/resources_testroot/aa_a/z3.file   |  18 -
 .../resources_testroot/bb/b1/b2/b12.file        |  18 -
 .../resources_testroot/bb/b2/b2_1.file          |  18 -
 .../resources_testroot/bb/b2/b2_2.datei         |  18 -
 .../resources/resources_testroot/bb/b2/b3.foo   |  18 -
 .../src/test/resources/test.properties          |  18 -
 modules/server/pom.xml                          | 203 -----
 .../apache/tamaya/server/ConfigServiceApp.java  |  77 --
 .../tamaya/server/ConfigurationResource.java    | 310 -------
 .../apache/tamaya/server/VersionProperties.java |  68 --
 .../apache/tamaya/server/spi/ScopeManager.java  |  84 --
 .../apache/tamaya/server/spi/ScopeProvider.java |  40 -
 .../META-INF/tamaya-server-version.properties   |  22 -
 modules/server/src/main/resources/banner.txt    |  14 -
 .../server/src/main/resources/config-server.yml |  31 -
 .../tamaya/server/ConfigServiceAppTest.java     |  32 -
 .../org/apache/tamaya/server/EtcdAccessor.java  | 519 -----------
 .../tamaya/server/VersionPropertiesTest.java    |  46 -
 modules/spi-support/pom.xml                     |  75 --
 .../tamaya/spisupport/BasePropertySource.java   |  86 --
 .../tamaya/spisupport/DefaultConfiguration.java | 228 -----
 .../spisupport/DefaultConfigurationContext.java | 256 ------
 .../apache/tamaya/spisupport/EnumConverter.java |  68 --
 .../tamaya/spisupport/MapPropertySource.java    | 147 ---
 .../spisupport/PriorityServiceComparator.java   |  59 --
 .../PropertiesResourcePropertySource.java       |  78 --
 .../spisupport/PropertyConverterManager.java    | 437 ---------
 .../tamaya/spisupport/PropertyFiltering.java    | 131 ---
 .../spisupport/PropertySourceComparator.java    |  54 --
 modules/yaml/pom.xml                            | 117 ---
 .../java/org/apache/tamaya/json/YAMLFormat.java | 156 ----
 .../apache/tamaya/json/YAMLPropertySource.java  | 100 --
 ...org.apache.tamaya.format.ConfigurationFormat |  19 -
 .../org/apache/tamaya/json/YAMLFormatTest.java  |  73 --
 .../tamaya/json/YAMLPropertySourceTest.java     |  54 --
 .../test/resources/configs/valid/contact.yaml   |  46 -
 .../resources/configs/valid/test-with-prio.yaml |  39 -
 .../src/test/resources/configs/valid/test.yaml  |  35 -
 pom.xml                                         |   1 -
 469 files changed, 43716 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/359d3e4a/modules/builder/pom.xml
----------------------------------------------------------------------
diff --git a/modules/builder/pom.xml b/modules/builder/pom.xml
deleted file mode 100644
index 96f6244..0000000
--- a/modules/builder/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy current the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.tamaya.ext</groupId>
-        <artifactId>tamaya-extensions</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>tamaya-builder</artifactId>
-    <name>Apache Tamaya Modules - Builder</name>
-    <packaging>jar</packaging> <!-- bundle -->
-
-    <inceptionYear>2015</inceptionYear>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tamaya</groupId>
-            <artifactId>tamaya-api</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-formats</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tamaya</groupId>
-            <artifactId>tamaya-core</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-spisupport</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-json</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>java-hamcrest</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
-
-    </dependencies>
-
-    <!--build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>
-                            org.apache.tamaya.builder
-                        </Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build -->
-    
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/359d3e4a/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java b/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
deleted file mode 100644
index afdc121..0000000
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tamaya.builder;
-
-import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.spi.PropertyConverter;
-import org.apache.tamaya.TypeLiteral;
-import org.apache.tamaya.format.ConfigurationData;
-import org.apache.tamaya.format.ConfigurationFormats;
-import org.apache.tamaya.format.FlattenedDefaultPropertySource;
-import org.apache.tamaya.spi.ConfigurationContext;
-import org.apache.tamaya.spi.PropertyFilter;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertySourceProvider;
-import org.apache.tamaya.spi.PropertyValueCombinationPolicy;
-import org.apache.tamaya.spisupport.DefaultConfiguration;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Objects;
-
-import static java.lang.String.format;
-
-/**
- * <p>Builder class used for building a configuration manually without relying
- * only on the Service Provider Interface API.</p>
- *
- * <p><strong>Features of the builder</strong></p>
- *
- * <ol>
- *   <li>Adding of property converters manually</li>
- *   <li>Adding of property sources directly</li>
- *   <li>Adding of property sources via URL</li>
- *   <li>Adding of property source providers directly</li>
- *   <li>Enabling and disabling of via SPI mechanism provided resources as converters,
- *       property sources, etc.</li>
- * </ol>
- *
- * <p><strong>Example</strong></p>
- *
- * <pre>{@code ConfigurationBuilder builder = new ConfigurationBuilder();
- * builder.disableProvidedPropertySources()           // Do not load provided property
- *        .disableProvidedPropertySourceProviders()   // sources and providers automatically
- *        .addPropertySource("file:/etc/conf.properties"); // Load properties from conf.properties
- *
- * Configuration config = builder.build();
- * }</pre>
- *
- * <p><strong>Support for configuration formats</strong></p>
- *
- * The configuration builder allows you to put property resources
- * via a URL, as shown in the code example above, without implementing
- * a {@link org.apache.tamaya.spi.PropertySource PropertySource} or providing an
- * instance of a {@link org.apache.tamaya.spi.PropertySource PropertySource}.
- * If a property resource in
- * a specific format can be added to configuration builder or not depends
- * on the available implementations of
- * {@link org.apache.tamaya.format.ConfigurationFormat} in the classpath.
- * Which formats are available can be checked via
- * {@link org.apache.tamaya.format.ConfigurationFormats#getFormats()}.
- */
-public class ConfigurationBuilder {
-    /** Builder used to create new ConfigurationContext instances. */
-    private final ProgrammaticConfigurationContext.Builder contextBuilder = new ProgrammaticConfigurationContext.Builder();
-
-    /**
-     * Flag if the config has already been built.
-     * Configuration can be built only once
-     */
-    private boolean built;
-
-    /**
-     * Flag if all existing property converter service providers
-     * should be loaded if the configuration is build.
-     */
-    private boolean loadProvidedPropertyConverters = true;
-
-    /**
-     * Flag if all existing property source service providers
-     * will be loaded if the configuration is build.
-     */
-    private boolean loadProvidedPropertySources = false;
-    private boolean loadProvidedPropertySourceProviders = false;
-
-    private boolean isLoadProvidedPropertyFilters = false;
-
-    /**
-     * Creates a new builder instance.
-     */
-    public ConfigurationBuilder() {
-    }
-
-    /**
-     * Allows to set configuration context during unit tests.
-     */
-    ConfigurationBuilder setConfigurationContext(ConfigurationContext configurationContext) {
-        //noinspection deprecation
-        contextBuilder.setConfigurationContext(configurationContext);
-        return this;
-    }
-
-    /**
-     * Adds one resources with properties in an arbitrary format
-     * to the configuration to be build.
-     *
-     * <p>If a specific format is supported depends on the available
-     * {@link org.apache.tamaya.format.ConfigurationFormat} implementations.</p>
-     *
-     * <pre>{@code URL resource = new URL("file:/etc/service/config.json");
-     *
-     * builder.addPropertySources(resource);}
-     * </pre>
-     *
-     * @param url resource with properties for the the configuration to be build.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.format.ConfigurationFormat
-     * @see org.apache.tamaya.format.ConfigurationFormats#getFormats()
-     */
-    public ConfigurationBuilder addPropertySource(URL url) {
-        try {
-            ConfigurationData data = getConfigurationDataFromURL(url);
-
-            FlattenedDefaultPropertySource propertySource = new FlattenedDefaultPropertySource(data);
-            addPropertySources(propertySource);
-        } catch (IOException e) {
-            throw new ConfigException("Failed to read " + url.toString(), e);
-        }
-        return this;
-    }
-
-    protected ConfigurationData getConfigurationDataFromURL(URL url) throws IOException {
-        ConfigurationData data = ConfigurationFormats.readConfigurationData(url);
-
-        if (null == data) {
-            String mesg = format("No configuration format found which is able " +
-                                 "to read properties from %s.", url.toString());
-
-            throw new ConfigException(mesg);
-        }
-
-        return data;
-    }
-
-    /**
-     * Adds one or more resources with properties in an arbitrary format
-     * to the configuration to be build.
-     *
-     * <p>If a specific format is supported depends on the available
-     * {@link org.apache.tamaya.format.ConfigurationFormat} implementations.</p>
-     *
-     *<pre>{@code URL first = new URL("file:/etc/service/config.json");
-     * URL second = new URL("file:/etc/defaults/values.properties");
-     *
-     * builder.addPropertySources(first, second);}
-     *</pre>
-     *
-     * @param urls list of resources with properties for the configuration to be
-     *             build.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.format.ConfigurationFormat
-     * @see org.apache.tamaya.format.ConfigurationFormats#getFormats()
-     */
-    public ConfigurationBuilder addPropertySources(URL... urls) {
-        for(URL url:urls){
-            if(url!=null){
-                addPropertySource(url);
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Adds one or more resources with properties in an arbitrary format
-     * to the configuration to be build.
-     *
-     * <p>If a specific format is supported depends on the available
-     * {@link org.apache.tamaya.format.ConfigurationFormat} implementations.</p>
-     *
-     *<pre>{@code URL first = new URL("file:/etc/service/config.json");
-     * URL second = new URL("file:/etc/defaults/values.properties");
-     *
-     * builder.addPropertySources(first, second);}
-     *</pre>
-     *
-     * @param urls list of resources with properties for the configuration to be
-     *             build.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.format.ConfigurationFormat
-     * @see org.apache.tamaya.format.ConfigurationFormats#getFormats()
-     */
-    public ConfigurationBuilder addPropertySources(Collection<URL> urls) {
-        for(URL url:urls) {
-            if (url != null) {
-                addPropertySource(url);
-            }
-        }
-        return this;
-    }
-
-
-    /**
-     * Adds one or more resources with properties in an arbitrary format
-     * to the configuration to be build.
-     *
-     * <p>If a specific format is supported depends on the available
-     * {@link org.apache.tamaya.format.ConfigurationFormat} implementations.</p>
-     *
-     *<pre>{@code builder.addPropertySources("file:/etc/service/config.json",
-     *                            "file:/etc/defaults/values.properties");}
-     *</pre>
-     *
-     * @param urls list of resources with properties for the configuration to be
-     *             build.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.format.ConfigurationFormat
-     * @see org.apache.tamaya.format.ConfigurationFormats#getFormats()
-     */
-    public ConfigurationBuilder addPropertySources(String... urls) {
-        for(String url:urls) {
-            if (url != null) {
-                try{
-                    addPropertySource(new URL(url));
-                } catch(Exception e){
-                    throw new ConfigException("Invalid URL: " + url);
-                }
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Adds one or more property source instances to the configuration to be build.
-     *
-     *<pre>{@code PropertySource first = new CustomPropertySource();
-     * PropertySource second = new YetAnotherPropertySource();
-     *
-     * builder.addPropertySources(first, second)};
-     *</pre>
-     *
-     * @param sources list of property source instances with properties for the
-     *                configuration to be build.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertySource
-     */
-    public ConfigurationBuilder addPropertySources(PropertySource... sources){
-        checkBuilderState();
-
-        contextBuilder.addPropertySources(Objects.requireNonNull(sources));
-        return this;
-    }
-
-    private void checkBuilderState() {
-        if (built) {
-            throw new IllegalStateException("Configuration has already been build.");
-        }
-    }
-
-    /**
-     * Adds one or more property source provider instances to the configuration to be build.
-     *
-     * <pre>{@code PropertySourceProvider jc = new JavaConfigurationProvider();
-     *
-     * builder.addPropertySources(jc)};
-     * </pre>
-     *
-     * @param providers list of property source provider instances each providing a set
-     *                  of property source instances for the configuration to be build.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertySourceProvider
-     */
-    public ConfigurationBuilder addPropertySourceProviders(PropertySourceProvider... providers){
-        contextBuilder.addPropertySourceProviders(providers);
-        return this;
-    }
-
-    /**
-     * Adds one or more property filter instances to the configuration to be build.
-     *
-     * <pre>{@code PropertyFilter quoteReplacingFilter = new QuoteFilter();
-     * PropertyFilter commaRemovingFilter = new CommaFilter();
-     *
-     * builder.addPropertyFilters(commaRemovingFilter, quoteReplacingFilter)};
-     * </pre>
-     *
-     * @param filters list of property filter instances which should be applied
-     *                to the properties of the configuration to be build.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertyFilter
-     * @see #disableProvidedPropertyFilters()
-     * @see #enabledProvidedPropertyFilters()
-     */
-    public ConfigurationBuilder addPropertyFilters(PropertyFilter... filters){
-        Objects.requireNonNull(filters);
-
-        contextBuilder.addPropertyFilters(filters);
-        return this;
-    }
-
-
-    /**
-     * @param propertyValueCombinationPolicy combination policy to use for this builder. 
-     * @return the builder instance currently in use.
-     */
-    public ConfigurationBuilder setPropertyValueCombinationPolicy(PropertyValueCombinationPolicy propertyValueCombinationPolicy){
-        contextBuilder.setPropertyValueCombinationPolicy(propertyValueCombinationPolicy);
-        return this;
-    }
-
-    /**
-     * Adds a property converter for the a given type to the configuration to
-     * be build.
-     *
-     * <pre>{@code PropertyConverter<MyType> converter = value -> new MyType(value, 42);
-     *
-     * builder.addPropertyConverter(MyType.class, converter}
-     * </pre>
-     *
-     * @param <T> the type of the configuration
-     * @param type the required target type the converter should be applied to
-     * @param converter the converter to be used to convert the string property
-     *                  to the given target type.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertyConverter
-     * @see #enableProvidedPropertyConverters()
-     * @see #disableProvidedPropertyConverters()
-     */
-    public <T> ConfigurationBuilder addPropertyConverter(Class<T> type, PropertyConverter<T> converter) {
-        Objects.requireNonNull(type);
-        Objects.requireNonNull(converter);
-        return addPropertyConverter(TypeLiteral.of(type), (PropertyConverter<Object>)converter);
-    }
-
-    /**
-     * Adds a propertyConverter of a given type.
-     *  
-     * @param <T> the type of the configuration
-     * @param type type literal of this converter.
-     * @param propertyConverter property converter.
-     * @return the builder instance currently used
-     */
-    public <T> ConfigurationBuilder addPropertyConverter(TypeLiteral<T> type, PropertyConverter<T> propertyConverter){
-        Objects.requireNonNull(type);
-        Objects.requireNonNull(propertyConverter);
-        contextBuilder.addPropertyConverter(type, propertyConverter);
-        return this;
-    }
-
-    /**
-     * Checks if the automatic loading of all {@link org.apache.tamaya.spi.PropertyConverter
-     * PropertyConverter} service providers is enabled or disabled.
-     *
-     * @return {@code true} if the automatic loading is enabled,
-     *         otherwise {@code false}.
-     *
-     * @see #enableProvidedPropertyConverters()
-     * @see #disableProvidedPropertyConverters()
-     * @see #addPropertyConverter(Class, org.apache.tamaya.spi.PropertyConverter)
-     * @see #addPropertyConverter(org.apache.tamaya.TypeLiteral, org.apache.tamaya.spi.PropertyConverter)
-     */
-    public boolean isPropertyConverterLoadingEnabled() {
-        return loadProvidedPropertyConverters;
-    }
-
-    /**
-     * Enables the loading of all {@link org.apache.tamaya.spi.PropertyConverter}
-     * service providers.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertyConverter
-     * @see #disableProvidedPropertyConverters()
-     * @see #enableProvidedPropertyConverters()
-     */
-    public ConfigurationBuilder enableProvidedPropertyConverters() {
-        checkBuilderState();
-
-        loadProvidedPropertyConverters = true;
-
-        return this;
-    }
-
-    /**
-     * Disables the automatic loading of all {@link org.apache.tamaya.spi.PropertyConverter}
-     * service providers.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertyConverter
-     * @see #enableProvidedPropertyConverters()
-     * @see #addPropertyConverter(Class, org.apache.tamaya.spi.PropertyConverter)
-     */
-    public ConfigurationBuilder disableProvidedPropertyConverters() {
-        checkBuilderState();
-
-        loadProvidedPropertyConverters = false;
-
-        return this;
-    }
-
-
-    /**
-     * Enables the automatic loading of all {@link org.apache.tamaya.spi.PropertySource}
-     * service providers.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertySource
-     * @see #disableProvidedPropertySources()
-     */
-    public ConfigurationBuilder enableProvidedPropertySources() {
-        checkBuilderState();
-
-        loadProvidedPropertySources = true;
-
-        return this;
-    }
-
-    /**
-     * Checks if the automatic loading of all {@link org.apache.tamaya.spi.PropertySource
-     * PropertySource} service providers is enabled or disabled.
-     *
-     * @return {@code true} if the automatic loading is enabled,
-     *         otherwise {@code false}.
-     */
-    public boolean isPropertySourcesLoadingEnabled() {
-        return loadProvidedPropertySources;
-    }
-
-
-    /**
-     * Checks if the automatic loading of all {@link org.apache.tamaya.spi.PropertyFilter
-     * PropertyFilter} service providers is enabled or disabled.
-     *
-     * @return {@code true} if the automatic loading is enabled,
-     *         otherwise {@code false}.
-     */
-    public boolean isPropertyFilterLoadingEnabled() {
-        return isLoadProvidedPropertyFilters;
-    }
-
-    /**
-     * Enables the automatic loading of all {@link org.apache.tamaya.spi.PropertyFilter}
-     * service providers.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertyFilter
-     * @see #disableProvidedPropertyFilters()
-     * @see #addPropertyFilters(org.apache.tamaya.spi.PropertyFilter...)
-     */
-    public ConfigurationBuilder enabledProvidedPropertyFilters() {
-        checkBuilderState();
-
-        isLoadProvidedPropertyFilters = true;
-
-        return this;
-    }
-
-    /**
-     * Disables the automatic loading of all {@link org.apache.tamaya.spi.PropertyFilter}
-     * service providers.
-     *
-     * @see org.apache.tamaya.spi.PropertyFilter
-     * @see #enabledProvidedPropertyFilters()
-     * @see #addPropertyFilters(org.apache.tamaya.spi.PropertyFilter...)
-     *
-     * @return the builder instance currently used
-     */
-    public ConfigurationBuilder disableProvidedPropertyFilters() {
-        checkBuilderState();
-
-        isLoadProvidedPropertyFilters = false;
-
-        return this;
-    }
-
-    /**
-     * Disables the automatic loading of all {@link org.apache.tamaya.spi.PropertySource}
-     * service providers.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertySource
-     * @see #enableProvidedPropertySources()
-     */
-    public ConfigurationBuilder disableProvidedPropertySources() {
-        checkBuilderState();
-
-        loadProvidedPropertySources = false;
-
-        return this;
-    }
-
-    /**
-     * Enables the automatic loading of {@link org.apache.tamaya.spi.PropertySourceProvider
-     * property source providers} provided via the SPI API.
-     *
-     * @return the builder instance currently used
-     *
-     * @see org.apache.tamaya.spi.PropertySourceProvider
-     */
-    public ConfigurationBuilder enableProvidedPropertySourceProviders() {
-        checkBuilderState();
-
-        loadProvidedPropertySourceProviders = true;
-
-        return this;
-    }
-
-    /**
-     * Disables the automatic loading of {@link org.apache.tamaya.spi.PropertySourceProvider
-     * property source providers} provided via the SPI API.
-     *
-     * @return the builder instance currently used
-     */
-    public ConfigurationBuilder disableProvidedPropertySourceProviders() {
-        checkBuilderState();
-
-        loadProvidedPropertySourceProviders = false;
-
-        return this;
-    }
-
-    /**
-     * Checks if the automatic loading of {@link org.apache.tamaya.spi.PropertySourceProvider
-     * PropertySourceProviders} is enabled or disabled.
-     *
-     * @return {@code true} if the automatic loading is enabled,
-     *         otherwise {@code false}.
-     */
-    public boolean isPropertySourceProvidersLoadingEnabled() {
-        return loadProvidedPropertySourceProviders;
-    }
-
-    //X TODO think on a functionality/API for using the default PropertyConverters and use the configured ones here
-    //X TODO as overrides used first.
-
-
-    /**
-     * Builds a new configuration based on the configuration of this builder instance.
-     *
-     * @return a new {@link org.apache.tamaya.Configuration configuration instance},
-     *         never {@code null}.
-     */
-    public Configuration build() {
-        checkBuilderState();
-
-        built = true;
-
-        contextBuilder.loadProvidedPropertyConverters(isPropertyConverterLoadingEnabled());
-        contextBuilder.loadProvidedPropertySources(isPropertySourcesLoadingEnabled());
-        contextBuilder.loadProvidedPropertySourceProviders(isPropertySourceProvidersLoadingEnabled());
-        contextBuilder.loadProvidedPropertyFilters(isLoadProvidedPropertyFilters);
-
-        return new DefaultConfiguration(contextBuilder.build());
-    }
-
-    /**
-     * Mapper to map a URL given as string to an URL instance.
-     */
-    private static class StringToURLMapper {
-        public URL apply(String u) {
-            try {
-                return new URL(u);
-            } catch (MalformedURLException e) {
-                throw new ConfigException(u + " is not a valid URL", e);
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/359d3e4a/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java b/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
deleted file mode 100644
index 68e770d..0000000
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tamaya.builder;
-
-
-import org.apache.tamaya.spi.PropertyConverter;
-import org.apache.tamaya.TypeLiteral;
-import org.apache.tamaya.spi.ConfigurationContext;
-import org.apache.tamaya.spi.ConfigurationContextBuilder;
-import org.apache.tamaya.spi.PropertyFilter;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertySourceProvider;
-import org.apache.tamaya.spi.PropertyValueCombinationPolicy;
-import org.apache.tamaya.spi.ServiceContextManager;
-import org.apache.tamaya.spisupport.PriorityServiceComparator;
-import org.apache.tamaya.spisupport.PropertyConverterManager;
-import org.apache.tamaya.spisupport.PropertySourceComparator;
-
-import javax.annotation.Priority;
-import java.util.*;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.logging.Logger;
-
-/**
- * Implementation of the {@link org.apache.tamaya.spi.ConfigurationContext}
- * used by the {@link org.apache.tamaya.builder.ConfigurationBuilder}
- * internally.
- */
-class ProgrammaticConfigurationContext implements ConfigurationContext {
-
-    private static final Comparator<PropertySource> PS_COMPARATOR = new PropertySourceComparator();
-    private static final Comparator<Object> COMP_COMPARATOR = new PriorityServiceComparator();
-    /**
-     * The logger used.
-     */
-    private final static Logger LOG = Logger.getLogger(ProgrammaticConfigurationContext.class.getName());
-    /**
-     * Cubcomponent handling {@link org.apache.tamaya.spi.PropertyConverter} instances.
-     */
-    private PropertyConverterManager propertyConverterManager = new PropertyConverterManager();
-
-    /**
-     * The current unmodifiable list of loaded {@link org.apache.tamaya.spi.PropertySource} instances.
-     */
-    private List<PropertySource> immutablePropertySources = new ArrayList<>();
-
-    /**
-     * The current unmodifiable list of loaded {@link org.apache.tamaya.spi.PropertyFilter} instances.
-     */
-    private List<PropertyFilter> immutablePropertyFilters = new ArrayList<>();
-
-    /**
-     * The overriding policy used when combining PropertySources registered to evalute the final configuration
-     * values.
-     */
-    private PropertyValueCombinationPolicy propertyValueCombinationPolicy;
-
-    /**
-     * Lock for internal synchronization.
-     */
-    private final ReadWriteLock propertySourceLock = new ReentrantReadWriteLock();
-
-
-    /**
-     * The first time the Configuration system gets invoked we do initialize
-     * all our {@link org.apache.tamaya.spi.PropertySource}s and
-     * {@link org.apache.tamaya.spi.PropertyFilter}s which are known at startup.
-     */
-    @SuppressWarnings("unchecked")
-    public ProgrammaticConfigurationContext(Builder builder) {
-        propertyConverterManager = new PropertyConverterManager(builder.loadProvidedPropertyConverters);
-
-        List<PropertySource> sources = getAllPropertySources(builder);
-        Collections.sort(sources, PS_COMPARATOR);
-        immutablePropertySources = Collections.unmodifiableList(sources);
-
-
-        List<PropertyFilter> filters = getPropertyFilters(builder);
-        Collections.sort(filters, COMP_COMPARATOR);
-        immutablePropertyFilters = Collections.unmodifiableList(filters);
-
-
-        propertyValueCombinationPolicy = builder.propertyValueCombinationPolicy;
-        for(Map.Entry<TypeLiteral<?>, List<PropertyConverter<?>>> en: builder.propertyConverters.entrySet()){
-            if(en!=null){
-                for(PropertyConverter pv:en.getValue()) {
-                    propertyConverterManager.register(en.getKey(), pv);
-                }
-            }
-        }
-
-        LOG.info("Using " + immutablePropertySources.size() + " property sources: " + immutablePropertySources);
-        LOG.info("Using " + immutablePropertyFilters.size() + " property filters: " + immutablePropertyFilters);
-        LOG.info("Using PropertyValueCombinationPolicy: " + propertyValueCombinationPolicy);
-    }
-
-    private List<PropertyFilter> getPropertyFilters(Builder builder) {
-        List<PropertyFilter> provided = new ArrayList<>();
-        if(builder.loadProvidedPropertyFilters) {
-            provided.addAll(ServiceContextManager.getServiceContext().getServices(PropertyFilter.class));
-        }
-        for(PropertyFilter pf:builder.propertyFilters) {
-            if (pf != null) {
-                provided.add(pf);
-            }
-        }
-        return provided;
-    }
-
-    private List<PropertySource> getAllPropertySources(Builder builder) {
-        List<PropertySource> provided = new ArrayList<>();
-        if(builder.loadProvidedPropertySources) {
-            provided.addAll(ServiceContextManager.getServiceContext().getServices(PropertySource.class));
-        }
-        for(PropertySource ps:builder.propertySources){
-            if(ps!=null){
-                provided.add(ps);
-            }
-        }
-        if (builder.loadProvidedPropertySourceProviders) {
-            List<PropertySourceProvider> providers = ServiceContextManager.getServiceContext()
-                                                                  .getServices(PropertySourceProvider.class);
-            for (PropertySourceProvider provider : providers) {
-                for(PropertySource ps:provider.getPropertySources()) {
-                    if(ps!=null) {
-                        provided.addAll(provider.getPropertySources());
-                    }
-                }
-            }
-        }
-        return provided;
-    }
-
-    public void addPropertySources(PropertySource... propertySourcesToAdd) {
-        Lock writeLock = propertySourceLock.writeLock();
-        try {
-            writeLock.lock();
-            List<PropertySource> provided = new ArrayList<>();
-            for(PropertySource ps:propertySourcesToAdd){
-                if(ps!=null){
-                    provided.add(ps);
-                }
-            }
-            this.immutablePropertySources = Collections.unmodifiableList(provided);
-        } finally {
-            writeLock.unlock();
-        }
-    }
-
-    /**
-     * Order property source reversely, the most important come first.
-     *
-     * @param source1 the first PropertySource
-     * @param source2 the second PropertySource
-     * @return the comparison result.
-     */
-    private int comparePropertySources(PropertySource source1, PropertySource source2) {
-
-        //X TODO this method duplicates org.apache.tamaya.core.internal.DefaultConfigurationContext.PropertySourceComparator.comparePropertySources()
-        //X maybe we should extract the Comperator in an own class for real code-reuse (copy paste == bad code reuse)
-
-        if (source1.getOrdinal() < source2.getOrdinal()) {
-            return -1;
-        } else if (source1.getOrdinal() > source2.getOrdinal()) {
-            return 1;
-        } else {
-            return source1.getClass().getName().compareTo(source2.getClass().getName());
-        }
-    }
-
-    /**
-     * Compare 2 filters for ordering the filter chain.
-     *
-     * @param filter1 the first filter
-     * @param filter2 the second filter
-     * @return the comparison result
-     */
-    private int comparePropertyFilters(PropertyFilter filter1, PropertyFilter filter2) {
-
-        //X TODO this method duplicates org.apache.tamaya.core.internal.DefaultConfigurationContext.PropertySourceComparator.comparePropertyFilters()
-        //X maybe we should extract the Comperator in an own class for real code-reuse (copy paste == bad code reuse)
-
-        Priority prio1 = filter1.getClass().getAnnotation(Priority.class);
-        Priority prio2 = filter2.getClass().getAnnotation(Priority.class);
-        int ord1 = prio1 != null ? prio1.value() : 0;
-        int ord2 = prio2 != null ? prio2.value() : 0;
-
-        if (ord1 < ord2) {
-            return -1;
-        } else if (ord1 > ord2) {
-            return 1;
-        } else {
-            return filter1.getClass().getName().compareTo(filter2.getClass().getName());
-        }
-    }
-
-    @Override
-    public List<PropertySource> getPropertySources() {
-        return immutablePropertySources;
-    }
-
-    public <T> void addPropertyConverter(TypeLiteral<T> typeToConvert, PropertyConverter<T> propertyConverter) {
-        propertyConverterManager.register(typeToConvert, propertyConverter);
-        LOG.info("Added PropertyConverter: " + propertyConverter.getClass().getName());
-    }
-
-    @Override
-    public Map<TypeLiteral<?>, List<PropertyConverter<?>>> getPropertyConverters() {
-        return propertyConverterManager.getPropertyConverters();
-    }
-
-    @Override
-    public <T> List<PropertyConverter<T>> getPropertyConverters(TypeLiteral<T> targetType) {
-        return propertyConverterManager.getPropertyConverters(targetType);
-    }
-
-    @Override
-    public List<PropertyFilter> getPropertyFilters() {
-        return immutablePropertyFilters;
-    }
-
-    @Override
-    public PropertyValueCombinationPolicy getPropertyValueCombinationPolicy() {
-        return propertyValueCombinationPolicy;
-    }
-
-
-    @Override
-    public ConfigurationContextBuilder toBuilder() {
-        // @todo Check if it could be useful to support this method, Oliver B. Fischer
-        throw new RuntimeException("This method is currently not supported.");
-    }
-
-    /**
-     * The Builder for {@link ProgrammaticConfigurationContext}
-     */
-    public final static class Builder {
-        /**
-         * The current unmodifiable list of loaded {@link org.apache.tamaya.spi.PropertySource} instances.
-         */
-        private final List<PropertySource> propertySources = new ArrayList<>();
-
-        /**
-         * The current unmodifiable list of loaded {@link org.apache.tamaya.spi.PropertyFilter} instances.
-         */
-        private final List<PropertyFilter> propertyFilters = new ArrayList<>();
-
-        private final Map<TypeLiteral<?>, List<PropertyConverter<?>>> propertyConverters = new HashMap<>();
-
-        /**
-         * The overriding policy used when combining PropertySources registered to evalute the final configuration
-         * values.
-         */
-        private PropertyValueCombinationPolicy propertyValueCombinationPolicy =
-                PropertyValueCombinationPolicy.DEFAULT_OVERRIDING_COLLECTOR;
-
-        private boolean loadProvidedPropertyConverters;
-        private boolean loadProvidedPropertySources;
-        private boolean loadProvidedPropertySourceProviders;
-        private boolean loadProvidedPropertyFilters;
-
-        public Builder setPropertyValueCombinationPolicy(PropertyValueCombinationPolicy policy) {
-            this.propertyValueCombinationPolicy = Objects.requireNonNull(policy);
-            return this;
-        }
-
-        public Builder addPropertySources(PropertySource... propertySources) {
-            for (PropertySource ps : propertySources) {
-                if (ps != null) {
-                    this.propertySources.add(ps);
-                }
-            }
-            return this;
-        }
-
-        public Builder addPropertySources(Collection<PropertySource> propertySources) {
-            for (PropertySource ps : propertySources) {
-                if (ps != null) {
-                    this.propertySources.add(ps);
-                }
-            }
-            return this;
-        }
-
-        public Builder addPropertySourceProviders(PropertySourceProvider... propertySourceProviders) {
-            for (PropertySourceProvider ps : propertySourceProviders) {
-                if (ps != null) {
-                    this.propertySources.addAll(ps.getPropertySources());
-                }
-            }
-            return this;
-        }
-
-        public Builder addPropertySourceProviders(Collection<PropertySourceProvider> propertySourceProviders) {
-            for (PropertySourceProvider ps : propertySourceProviders) {
-                if (ps != null) {
-                    this.propertySources.addAll(ps.getPropertySources());
-                }
-            }
-            return this;
-        }
-
-        public Builder addPropertyFilters(PropertyFilter... propertyFIlter) {
-            for (PropertyFilter pf : propertyFIlter) {
-                if (pf != null) {
-                    this.propertyFilters.add(pf);
-                }
-            }
-            return this;
-        }
-
-        public Builder addPropertyFilters(Collection<PropertyFilter> propertyFIlter) {
-            for (PropertyFilter pf : propertyFIlter) {
-                if (pf != null) {
-                    this.propertyFilters.add(pf);
-                }
-            }
-            return this;
-        }
-
-        /**
-         * Should be never used.
-         */
-        @Deprecated
-        public Builder setConfigurationContext(ConfigurationContext configurationContext) {
-            this.addPropertySources(configurationContext.getPropertySources());
-            this.addPropertyFilters(configurationContext.getPropertyFilters());
-            this.propertyValueCombinationPolicy = Objects.requireNonNull(
-                    configurationContext.getPropertyValueCombinationPolicy());
-            return this;
-        }
-
-        //X TODO think on a functonality/API for using the default PropertyConverters and use the configured ones here
-        //X TODO as overrides used first.
-
-        public <T> Builder addPropertyConverter(TypeLiteral<T> type, PropertyConverter<T> propertyConverter) {
-            if(!propertyConverters.containsKey(type)){
-                List<PropertyConverter<?>> convList = new ArrayList<>();
-                convList.add(propertyConverter);
-                propertyConverters.put(type, convList);
-            }
-            return this;
-        }
-
-        public ConfigurationContext build() {
-            return new ProgrammaticConfigurationContext(this);
-        }
-
-
-        public void loadProvidedPropertyConverters(boolean state) {
-            loadProvidedPropertyConverters = state;
-        }
-
-        public void loadProvidedPropertySources(boolean state) {
-            loadProvidedPropertySources = state;
-        }
-
-        public void loadProvidedPropertySourceProviders(boolean state) {
-            loadProvidedPropertySourceProviders = state;
-        }
-
-        public void loadProvidedPropertyFilters(boolean state) {
-            loadProvidedPropertyFilters = state;
-        }
-
-    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/359d3e4a/modules/builder/src/main/java/org/apache/tamaya/builder/PropertySourceBuilder.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/PropertySourceBuilder.java b/modules/builder/src/main/java/org/apache/tamaya/builder/PropertySourceBuilder.java
deleted file mode 100644
index 481a80c..0000000
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/PropertySourceBuilder.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tamaya.builder;
-
-import org.apache.tamaya.spi.PropertySource;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Simple builder for building a {@link org.apache.tamaya.spi.PropertySource}.
- */
-public final class PropertySourceBuilder {
-    /** The ordinal to be used. */
-    private int ordinal;
-    /** The name to be used. */
-    private final String name;
-    /** The properties. */
-    private final Map<String,String> properties = new HashMap<>();
-
-    /** private constructor. */
-    private PropertySourceBuilder(String name){
-        this.name = Objects.requireNonNull(name);
-    }
-
-    /**
-     * Gets a new instance of a builder.
-     * @param name The name of the property source, not null.
-     * @return a new instance.
-     */
-    public static PropertySourceBuilder of(String name){
-        return new PropertySourceBuilder(name);
-    }
-
-    /**
-     * Gets a new instance of a builder.
-     * @param name The name of the property source, not null.
-     * @return a new instance.
-     */
-    public static PropertySourceBuilder from(String name){
-        return new PropertySourceBuilder(name);
-    }
-
-    /**
-     * Sets a new property key/value.
-     * @param key the property key, not null.
-     * @param value the property value, not null.
-     * @return the bulder for chaining.
-     */
-    public PropertySourceBuilder put(String key, String value){
-        this.properties.put(key, value);
-        return this;
-    }
-
-    /**
-     * Put all the given key, values.
-     * @param values the new key/values, not null.
-     * @return the bulder for chaining.
-     */
-    public PropertySourceBuilder putAll(Map<String, String> values){
-        this.properties.putAll(values);
-        return this;
-    }
-
-    /**
-     * Sets the ordinal to be used explicitly (instead evaluating it using {@code tamaya.ordinal}.
-     * @param ordinal the explicit ordinal to be used.
-     * @return the bulder for chaining.
-     */
-    public PropertySourceBuilder withOrdinal(int ordinal){
-        this.ordinal = ordinal;
-        return this;
-    }
-
-    /**
-     * Puts all values from the given property source.
-     * @param propertySource the property source, not null.
-     * @return the bulder for chaining.
-     */
-    public PropertySourceBuilder putAll(PropertySource propertySource){
-        this.properties.putAll(propertySource.getProperties());
-        return this;
-    }
-
-    /**
-     * Creates a new immutable {@link org.apache.tamaya.spi.PropertySource} instance.
-     * @return a new immutable {@link org.apache.tamaya.spi.PropertySource} instance, never null.
-     */
-    public PropertySource build(){
-        return new SimplePropertySource(name, properties);
-    }
-
-    @Override
-    public String toString() {
-        return "PropertySourceBuilder{" +
-                "ordinal=" + ordinal +
-                ", name='" + name + '\'' +
-                ", properties=" + properties +
-                '}';
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/359d3e4a/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java b/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
deleted file mode 100644
index 085bd9a..0000000
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tamaya.builder;
-
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertyValue;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
-* Simple property source implementation using a map.
-*/
-public class SimplePropertySource implements PropertySource {
-    /** The properties. */
-    private final Map<String, String> properties;
-    /** The source's name. */
-    private final String name;
-
-    public SimplePropertySource(String name, Map<String, String> properties){
-        this.properties = new HashMap<>(properties);
-        this.name = Objects.requireNonNull(name);
-    }
-
-    @Override
-    public int getOrdinal(){
-        PropertyValue configuredOrdinal = get(TAMAYA_ORDINAL);
-        if(configuredOrdinal!=null){
-            try{
-                return Integer.parseInt(configuredOrdinal.getValue());
-            } catch(Exception e){
-                Logger.getLogger(getClass().getName()).log(Level.WARNING,
-                        "Configured Ordinal is not an int number: " + configuredOrdinal, e);
-            }
-        }
-        return getDefaultOrdinal();
-    }
-
-    public int getDefaultOrdinal(){
-        return 0;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public PropertyValue get(String key) {
-        return null;
-    }
-
-    @Override
-    public Map<String, String> getProperties() {
-        return this.properties;
-    }
-
-    @Override
-    public boolean isScannable() {
-        return false;
-    }
-
-    @Override
-    public String toString(){
-        return "SimplePropertySource(name="+name+", numProps="+properties.size()+")";
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/359d3e4a/modules/builder/src/main/java/org/apache/tamaya/builder/package-info.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/package-info.java b/modules/builder/src/main/java/org/apache/tamaya/builder/package-info.java
deleted file mode 100644
index 24c86a9..0000000
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * This package provides
- * {@link org.apache.tamaya.builder.ConfigurationBuilder a configuration
- * builder} that allows to build a configuration manually without
- * using exclusively on the Service Provider Interface API of Tamaya.
- *
- * @see org.apache.tamaya.builder.ConfigurationBuilder
- * @see org.apache.tamaya.Configuration
- */
-package org.apache.tamaya.builder;
\ No newline at end of file


Mime
View raw message