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 2017/11/14 09:33:31 UTC
incubator-tamaya-sandbox git commit: TAMAYA-318 Moved spi-support as
API base implementation package to remove code duplicates.
Repository: incubator-tamaya-sandbox
Updated Branches:
refs/heads/master 31585cdc0 -> 9746d0018
TAMAYA-318 Moved spi-support as API base implementation package to remove code duplicates.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/9746d001
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/9746d001
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/9746d001
Branch: refs/heads/master
Commit: 9746d0018a4c82fc0ca6ba593828449563308d42
Parents: 31585cd
Author: Anatole Tresch <an...@apache.org>
Authored: Tue Nov 14 10:25:17 2017 +0100
Committer: Anatole Tresch <an...@apache.org>
Committed: Tue Nov 14 10:27:21 2017 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/collections/ItemTokenizer.java | 2 +-
.../org/apache/tamaya/consul/ConsulPropertySource.java | 3 +--
.../java/org/apache/tamaya/etcd/EtcdPropertySource.java | 2 +-
hazelcast/pom.xml | 2 +-
.../tamaya/hazelcast/HazelcastPropertySource.java | 2 +-
.../java/org/apache/tamaya/jodatime/FullStackIT.java | 2 +-
metamodel/pom.xml | 2 +-
.../tamaya/metamodel/ext/FilteredPropertySource.java | 2 +-
.../internal/factories/CLIArgumentsFactory.java | 3 +--
.../internal/factories/EnvPropertiesFactory.java | 2 +-
.../internal/factories/FilePropertySourceFactory.java | 12 ------------
.../factories/ResourcePropertySourceFactory.java | 9 ---------
.../internal/factories/SysPropertiesFactory.java | 2 +-
.../internal/factories/URLPropertySourceFactory.java | 1 -
.../apache/tamaya/metamodel/ext/MyPropertySource.java | 3 ++-
.../internal/factories/CLIArgumentsFactoryTest.java | 2 +-
.../internal/factories/EnvPropertiesFactoryTest.java | 2 +-
.../internal/factories/SysPropertiesFactoryTest.java | 2 +-
.../tamaya/propertysources/PropertySourceBuilder.java | 2 +-
.../ui/internal/ConfigurationBasedMessageProvider.java | 4 ++--
ui/pom.xml | 2 +-
.../internal/ConfiguredPropertiesModelProviderSpi.java | 2 +-
22 files changed, 21 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
----------------------------------------------------------------------
diff --git a/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java b/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
index 60e6e7f..8d9a18d 100644
--- a/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
+++ b/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
@@ -133,7 +133,7 @@ final class ItemTokenizer {
* @return the parsed value, or null.
*/
public static Object convertValue(String value, ConversionContext context) {
- String converterClass = context.getConfiguration().get('_' + context.getKey() + ".item-converter");
+ String converterClass = context.getConfiguration().get('_' + context.getKey() + ".item-converters");
List<PropertyConverter<Object>> valueConverters = new ArrayList<>(1);
if (converterClass != null) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
----------------------------------------------------------------------
diff --git a/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java b/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
index 30a1de7..647cc5c 100644
--- a/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
+++ b/consul/src/main/java/org/apache/tamaya/consul/ConsulPropertySource.java
@@ -26,8 +26,7 @@ import com.orbitz.consul.model.kv.Value;
import org.apache.tamaya.mutableconfig.ConfigChangeRequest;
import org.apache.tamaya.mutableconfig.spi.MutablePropertySource;
import org.apache.tamaya.spi.PropertyValue;
-import org.apache.tamaya.spi.PropertyValueBuilder;
-import org.apache.tamaya.spisupport.BasePropertySource;
+import org.apache.tamaya.spisupport.propertysource.BasePropertySource;
import java.util.*;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
----------------------------------------------------------------------
diff --git a/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java b/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
index 6531153..1e7f17c 100644
--- a/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
+++ b/etcd/src/main/java/org/apache/tamaya/etcd/EtcdPropertySource.java
@@ -22,7 +22,7 @@ import org.apache.tamaya.mutableconfig.ConfigChangeRequest;
import org.apache.tamaya.mutableconfig.spi.MutablePropertySource;
import org.apache.tamaya.spi.PropertyValue;
import org.apache.tamaya.spi.PropertyValueBuilder;
-import org.apache.tamaya.spisupport.BasePropertySource;
+import org.apache.tamaya.spisupport.propertysource.BasePropertySource;
import java.util.ArrayList;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/hazelcast/pom.xml
----------------------------------------------------------------------
diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml
index 1052787..834a808 100644
--- a/hazelcast/pom.xml
+++ b/hazelcast/pom.xml
@@ -56,7 +56,7 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tamaya.ext</groupId>
+ <groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-spisupport</artifactId>
<version>${project.parent.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java b/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java
index 566e70b..9f63a0e 100644
--- a/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java
+++ b/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java
@@ -26,7 +26,7 @@ import com.hazelcast.core.IMap;
import org.apache.tamaya.mutableconfig.ConfigChangeRequest;
import org.apache.tamaya.mutableconfig.spi.MutablePropertySource;
import org.apache.tamaya.spi.PropertyValue;
-import org.apache.tamaya.spisupport.BasePropertySource;
+import org.apache.tamaya.spisupport.propertysource.BasePropertySource;
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java
----------------------------------------------------------------------
diff --git a/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java b/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java
index 60d8cbc..ce9c414 100644
--- a/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java
+++ b/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java
@@ -49,7 +49,7 @@ public class FullStackIT {
assertThat(dateTimeString, notNullValue());
assertThat(dateTimeString, equalTo("2010-08-08T14:00:15.5+10:00"));
assertThat(dateTimeValue, notNullValue());
- assertThat(dateTimeValue, equalTo(dateTime().parseDateTime("2010-08-08T14:00:15.5+10:00")));
+ assertThat(dateTimeValue.getMillis(), equalTo(dateTime().parseDateTime(dateTimeString).getMillis()));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/metamodel/pom.xml b/metamodel/pom.xml
index f56096e..860b383 100644
--- a/metamodel/pom.xml
+++ b/metamodel/pom.xml
@@ -51,7 +51,7 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tamaya.ext</groupId>
+ <groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-spisupport</artifactId>
<version>${project.parent.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
index fec8777..b67924b 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.metamodel.ext;
import org.apache.tamaya.spi.*;
-import org.apache.tamaya.spisupport.BasePropertySource;
+import org.apache.tamaya.spisupport.propertysource.BasePropertySource;
import org.apache.tamaya.spisupport.DefaultConfigurationContextBuilder;
import org.apache.tamaya.spisupport.PropertySourceComparator;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java
index 81b18eb..04dfc4c 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java
@@ -20,8 +20,7 @@ package org.apache.tamaya.metamodel.internal.factories;
import org.apache.tamaya.metamodel.spi.ItemFactory;
import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spisupport.CLIPropertySource;
-import org.apache.tamaya.spisupport.EnvironmentPropertySource;
+import org.apache.tamaya.spisupport.propertysource.CLIPropertySource;
import org.osgi.service.component.annotations.Component;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java
index ab8212f..a22cc98 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java
@@ -21,7 +21,7 @@ package org.apache.tamaya.metamodel.internal.factories;
import org.apache.tamaya.metamodel.spi.ItemFactory;
import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spisupport.EnvironmentPropertySource;
+import org.apache.tamaya.spisupport.propertysource.EnvironmentPropertySource;
import org.osgi.service.component.annotations.Component;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java
index f26b567..c2ebe15 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java
@@ -19,24 +19,12 @@
package org.apache.tamaya.metamodel.internal.factories;
-import org.apache.tamaya.format.ConfigurationData;
-import org.apache.tamaya.format.ConfigurationFormats;
-import org.apache.tamaya.format.MappedConfigurationDataPropertySource;
-import org.apache.tamaya.metamodel.spi.ItemFactory;
-import org.apache.tamaya.resource.ConfigResources;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spisupport.PropertiesResourcePropertySource;
-import org.apache.tamaya.spisupport.SimplePropertySource;
import org.osgi.service.component.annotations.Component;
-import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.Collection;
-import java.util.Map;
-import java.util.logging.Level;
import java.util.logging.Logger;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java
index bdbc618..76472a5 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java
@@ -19,18 +19,9 @@
package org.apache.tamaya.metamodel.internal.factories;
-import org.apache.tamaya.format.ConfigurationData;
-import org.apache.tamaya.format.ConfigurationFormats;
-import org.apache.tamaya.format.MappedConfigurationDataPropertySource;
-import org.apache.tamaya.metamodel.spi.ItemFactory;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spisupport.PropertiesResourcePropertySource;
import org.osgi.service.component.annotations.Component;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Map;
-import java.util.logging.Level;
import java.util.logging.Logger;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java
index ec85ba0..4fbae29 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java
@@ -21,7 +21,7 @@ package org.apache.tamaya.metamodel.internal.factories;
import org.apache.tamaya.metamodel.spi.ItemFactory;
import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spisupport.SystemPropertySource;
+import org.apache.tamaya.spisupport.propertysource.SystemPropertySource;
import org.osgi.service.component.annotations.Component;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java
index 80e102c..227b6ef 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java
@@ -26,7 +26,6 @@ import org.apache.tamaya.functions.Supplier;
import org.apache.tamaya.metamodel.internal.ComponentConfigurator;
import org.apache.tamaya.metamodel.spi.ItemFactory;
import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spisupport.PropertiesResourcePropertySource;
import org.osgi.service.component.annotations.Component;
import javax.security.auth.RefreshFailedException;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyPropertySource.java
----------------------------------------------------------------------
diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyPropertySource.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyPropertySource.java
index 55455f9..106e0f6 100644
--- a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyPropertySource.java
+++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyPropertySource.java
@@ -20,6 +20,7 @@ package org.apache.tamaya.metamodel.ext;
import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.spisupport.propertysource.BasePropertySource;
import java.util.Collections;
import java.util.Map;
@@ -27,7 +28,7 @@ import java.util.Map;
/**
* Created by atsticks on 17.04.17.
*/
-public class MyPropertySource extends org.apache.tamaya.spisupport.BasePropertySource{
+public class MyPropertySource extends BasePropertySource {
private String name2;
private String attrValue;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactoryTest.java
----------------------------------------------------------------------
diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactoryTest.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactoryTest.java
index bf78f0e..bd73b11 100644
--- a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactoryTest.java
+++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactoryTest.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.metamodel.internal.factories;
import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spisupport.CLIPropertySource;
+import org.apache.tamaya.spisupport.propertysource.CLIPropertySource;
import org.junit.Test;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactoryTest.java
----------------------------------------------------------------------
diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactoryTest.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactoryTest.java
index bfbcf82..5193df7 100644
--- a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactoryTest.java
+++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactoryTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.metamodel.internal.factories;
-import org.apache.tamaya.spisupport.EnvironmentPropertySource;
+import org.apache.tamaya.spisupport.propertysource.EnvironmentPropertySource;
import org.apache.tamaya.spi.PropertySource;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactoryTest.java
----------------------------------------------------------------------
diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactoryTest.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactoryTest.java
index 3fa1d22..5d21811 100644
--- a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactoryTest.java
+++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactoryTest.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.metamodel.internal.factories;
import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spisupport.SystemPropertySource;
+import org.apache.tamaya.spisupport.propertysource.SystemPropertySource;
import org.junit.Test;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/propertysources/src/main/java/org/apache/tamaya/propertysources/PropertySourceBuilder.java
----------------------------------------------------------------------
diff --git a/propertysources/src/main/java/org/apache/tamaya/propertysources/PropertySourceBuilder.java b/propertysources/src/main/java/org/apache/tamaya/propertysources/PropertySourceBuilder.java
index 3d35863..2b1f96b 100644
--- a/propertysources/src/main/java/org/apache/tamaya/propertysources/PropertySourceBuilder.java
+++ b/propertysources/src/main/java/org/apache/tamaya/propertysources/PropertySourceBuilder.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.propertysources;
-import org.apache.tamaya.core.propertysource.SimplePropertySource;
+import org.apache.tamaya.spisupport.propertysource.SimplePropertySource;
import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertyValue;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/ui/base/src/main/java/org/apache/tamaya/ui/internal/ConfigurationBasedMessageProvider.java
----------------------------------------------------------------------
diff --git a/ui/base/src/main/java/org/apache/tamaya/ui/internal/ConfigurationBasedMessageProvider.java b/ui/base/src/main/java/org/apache/tamaya/ui/internal/ConfigurationBasedMessageProvider.java
index 811debf..b83fcbd 100644
--- a/ui/base/src/main/java/org/apache/tamaya/ui/internal/ConfigurationBasedMessageProvider.java
+++ b/ui/base/src/main/java/org/apache/tamaya/ui/internal/ConfigurationBasedMessageProvider.java
@@ -19,9 +19,9 @@
package org.apache.tamaya.ui.internal;
import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.core.propertysource.SimplePropertySource;
+import org.apache.tamaya.spisupport.propertysource.SimplePropertySource;
import org.apache.tamaya.spi.ConfigurationContextBuilder;
-import org.apache.tamaya.spisupport.BasePropertySource;
+import org.apache.tamaya.spisupport.propertysource.BasePropertySource;
import org.apache.tamaya.spisupport.DefaultConfiguration;
import org.apache.tamaya.ui.spi.MessageProvider;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index 529f070..e2f19c3 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -62,7 +62,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tamaya.ext</groupId>
+ <groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-spisupport</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9746d001/validation/src/main/java/org/apache/tamaya/validation/internal/ConfiguredPropertiesModelProviderSpi.java
----------------------------------------------------------------------
diff --git a/validation/src/main/java/org/apache/tamaya/validation/internal/ConfiguredPropertiesModelProviderSpi.java b/validation/src/main/java/org/apache/tamaya/validation/internal/ConfiguredPropertiesModelProviderSpi.java
index 97e23c6..eeeeea4 100644
--- a/validation/src/main/java/org/apache/tamaya/validation/internal/ConfiguredPropertiesModelProviderSpi.java
+++ b/validation/src/main/java/org/apache/tamaya/validation/internal/ConfiguredPropertiesModelProviderSpi.java
@@ -22,7 +22,7 @@ import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.validation.ConfigModel;
import org.apache.tamaya.validation.spi.ConfigModelReader;
import org.apache.tamaya.validation.spi.ModelProviderSpi;
-import org.apache.tamaya.spisupport.MapPropertySource;
+import org.apache.tamaya.spisupport.propertysource.MapPropertySource;
import java.io.InputStream;
import java.net.URL;