tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject incubator-tamaya-sandbox git commit: - Adapted OSGI deps. - Defined clear resolvability of packages, removing redundancies. - Refactored parts of TypeLiteral into util class.
Date Mon, 05 Feb 2018 00:10:35 GMT
Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/configjsr db6b909a6 -> 639e69f08


- Adapted OSGI deps.
- Defined clear resolvability of packages, removing redundancies.
- Refactored parts of TypeLiteral into util class.

Signed-off-by: Anatole Tresch <anatole@apache.org>


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/639e69f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/639e69f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/639e69f0

Branch: refs/heads/configjsr
Commit: 639e69f080dc93c13d3534fdf5becd463c3f920a
Parents: db6b909
Author: Anatole Tresch <anatole@apache.org>
Authored: Mon Feb 5 01:10:08 2018 +0100
Committer: Anatole Tresch <anatole@apache.org>
Committed: Mon Feb 5 01:10:08 2018 +0100

----------------------------------------------------------------------
 apache-commons/bnd.bnd                          |   4 +-
 .../commons/CommonsConfigConfigSource.java      |  77 ++++++++
 .../commons/CommonsConfigPropertySource.java    |  83 --------
 .../tamaya/commons/IniConfigurationFormat.java  |   3 +-
 .../tamaya/commons/XmlConfigurationFormat.java  |   3 +-
 camel/bnd.bnd                                   |   3 +-
 collections/bnd.bnd                             |   8 +-
 .../collections/AdaptiveCombinationPolicy.java  |   2 +-
 .../tamaya/collections/ItemTokenizer.java       |  10 +-
 ...tamaya.base.spi.ConfigValueCombinationPolicy |  19 ++
 ...ache.tamaya.spi.ConfigValueCombinationPolicy |  19 --
 .../collections/CollectionAdvancedTests.java    |   1 -
 .../collections/CollectionsBaseTests.java       |   1 -
 .../CollectionsTypedReadOnlyTests.java          |   1 -
 .../collections/CollectionsTypedTests.java      |   1 -
 .../apache/tamaya/collections/TypeLiteral.java  | 187 +++++++++++++++++++
 configsources/bnd.bnd                           |   7 +-
 configured-sysprops/bnd.bnd                     |   3 +-
 consul/bnd.bnd                                  |   6 +-
 etcd/bnd.bnd                                    |   3 +-
 hazelcast/bnd.bnd                               |   8 +-
 jodatime/bnd.bnd                                |   8 +-
 .../tamaya/jodatime/DateTimeConverterIT.java    |   2 +-
 .../jodatime/DateTimeZoneConverterIT.java       |   3 +-
 .../tamaya/jodatime/DurationConverterIT.java    |   2 +-
 .../tamaya/jodatime/PeriodConverterIT.java      |   2 +-
 management/bnd.bnd                              |   4 +-
 .../management/ConfigManagementSupport.java     |   2 +-
 .../org/apache/tamaya/meta/MetaProperties.java  |   2 +-
 metamodel/bnd.bnd                               |   9 +-
 .../apache/tamaya/metamodel/CachedFilter.java   |   2 +-
 .../org/apache/tamaya/metamodel/HideFilter.java |   4 +-
 .../tamaya/metamodel/ImmutableFilter.java       |   2 +-
 .../org/apache/tamaya/metamodel/MaskFilter.java |   5 +-
 .../tamaya/metamodel/MetaConfiguration.java     |   7 +-
 .../apache/tamaya/metamodel/SecuredFilter.java  |   6 +-
 .../metamodel/ext/FilteredConfigSource.java     |   1 +
 .../ext/RefreshableConfigSourceProvider.java    |   2 +-
 .../internal/CombinationPolicyReader.java       |   4 +-
 .../metamodel/internal/ComponentFactory.java    |   2 +-
 .../internal/ConfigSourceOrderingReader.java    |   2 +-
 .../metamodel/internal/ConfigSourceReader.java  |   6 +-
 .../internal/FilterOrderingReader.java          |   2 +-
 .../tamaya/metamodel/internal/FilterReader.java |   6 +-
 .../metamodel/internal/MetaContextReader.java   |   2 +-
 .../metamodel/spi/ItemFactoryManager.java       |   4 +-
 .../metamodel/spi/MetaConfigurationReader.java  |   3 +-
 .../tamaya/metamodel/ext/IntegrationTest.java   |   4 +-
 .../apache/tamaya/metamodel/ext/MyFilter.java   |   5 +-
 .../org.apache.tamaya.base.filter.Filter        |  19 ++
 .../services/org.apache.tamaya.spi.Filter       |  19 --
 remote/bnd.bnd                                  |   4 +-
 server/bnd.bnd                                  |   6 +-
 ui/base/bnd.bnd                                 |   4 +-
 ui/events/bnd.bnd                               |   4 +-
 ui/mutableconfig/bnd.bnd                        |   4 +-
 uom/bnd.bnd                                     |   9 +-
 usagetracker/bnd.bnd                            |   6 +-
 .../apache/tamaya/usagetracker/ConfigUsage.java |   2 +-
 .../apache/tamaya/usagetracker/UsageStat.java   |   2 +-
 .../internal/UsageTrackerFilter.java            |   4 +-
 .../org.apache.tamaya.base.filter.Filter        |  19 ++
 .../services/org.apache.tamaya.spi.Filter       |  19 --
 validation/bnd.bnd                              |   4 +-
 .../tamaya/validation/ValidationManager.java    |   2 +-
 vertx/bnd.bnd                                   |   6 +-
 66 files changed, 432 insertions(+), 253 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/apache-commons/bnd.bnd
----------------------------------------------------------------------
diff --git a/apache-commons/bnd.bnd b/apache-commons/bnd.bnd
index e7dfd6d..faa5223 100644
--- a/apache-commons/bnd.bnd
+++ b/apache-commons/bnd.bnd
@@ -22,7 +22,7 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.commons
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    org.apache.tamaya.format,\
+    javax.config.spi
 Export-Service: \
     org.apache.tamaya.format.ConfigurationFormat

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigConfigSource.java
----------------------------------------------------------------------
diff --git a/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigConfigSource.java b/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigConfigSource.java
new file mode 100644
index 0000000..f2f4f55
--- /dev/null
+++ b/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigConfigSource.java
@@ -0,0 +1,77 @@
+/*
+ * 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.commons;
+
+import org.apache.commons.configuration.Configuration;
+
+import javax.config.spi.ConfigSource;
+import java.util.*;
+
+/**
+ * PropertySource that wraps {@link org.apache.commons.configuration.Configuration}.
+ */
+public class CommonsConfigConfigSource implements ConfigSource {
+
+    private Configuration commonsConfig;
+    private int ordinal;
+    private String name;
+
+    public CommonsConfigConfigSource(int ordinal, String name, Configuration commonsConfig) {
+        this.commonsConfig = Objects.requireNonNull(commonsConfig);
+        this.ordinal = ordinal;
+        this.name = Objects.requireNonNull(name);
+    }
+
+    public CommonsConfigConfigSource(String name, Configuration commonsConfig) {
+        commonsConfig = Objects.requireNonNull(commonsConfig);
+        this.name = Objects.requireNonNull(name);
+        try {
+            this.ordinal = commonsConfig.getInt(ConfigSource.CONFIG_ORDINAL);
+        } catch (Exception e) {
+            this.ordinal = 0;
+        }
+    }
+
+    @Override
+    public int getOrdinal() {
+        return ordinal;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getValue(String key) {
+        return commonsConfig.getString(key);
+    }
+
+    @Override
+    public Map<String, String> getProperties() {
+        Map<String,String> config = new HashMap<>();
+        Iterator<String> keyIter = commonsConfig.getKeys();
+        while (keyIter.hasNext()) {
+            String key = keyIter.next();
+            config.put(key, commonsConfig.getString(key));
+        }
+        return config;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigPropertySource.java
----------------------------------------------------------------------
diff --git a/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigPropertySource.java b/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigPropertySource.java
deleted file mode 100644
index 2383e68..0000000
--- a/apache-commons/src/main/java/org/apache/tamaya/commons/CommonsConfigPropertySource.java
+++ /dev/null
@@ -1,83 +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.commons;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertyValue;
-
-import java.util.*;
-
-/**
- * PropertySource that wraps {@link org.apache.commons.configuration.Configuration}.
- */
-public class CommonsConfigPropertySource implements PropertySource {
-
-    private Configuration commonsConfig;
-    private int ordinal;
-    private String name;
-
-    public CommonsConfigPropertySource(int ordinal, String name, Configuration commonsConfig) {
-        this.commonsConfig = Objects.requireNonNull(commonsConfig);
-        this.ordinal = ordinal;
-        this.name = Objects.requireNonNull(name);
-    }
-
-    public CommonsConfigPropertySource(String name, Configuration commonsConfig) {
-        commonsConfig = Objects.requireNonNull(commonsConfig);
-        this.name = Objects.requireNonNull(name);
-        try {
-            this.ordinal = commonsConfig.getInt(PropertySource.TAMAYA_ORDINAL);
-        } catch (Exception e) {
-            this.ordinal = 0;
-        }
-    }
-
-    @Override
-    public int getOrdinal() {
-        return ordinal;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public PropertyValue get(String key) {
-        return PropertyValue.of(key, commonsConfig.getString(key),
-                getName());
-    }
-
-    @Override
-    public Map<String, PropertyValue> getProperties() {
-        Map<String,PropertyValue> config = new HashMap<>();
-        Iterator<String> keyIter = commonsConfig.getKeys();
-        while (keyIter.hasNext()) {
-            String key = keyIter.next();
-            config.put(key, PropertyValue.of(key, commonsConfig.getString(key), getName()));
-        }
-        return config;
-    }
-
-    @Override
-    public boolean isScannable() {
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/apache-commons/src/main/java/org/apache/tamaya/commons/IniConfigurationFormat.java
----------------------------------------------------------------------
diff --git a/apache-commons/src/main/java/org/apache/tamaya/commons/IniConfigurationFormat.java b/apache-commons/src/main/java/org/apache/tamaya/commons/IniConfigurationFormat.java
index d0e8c05..7abd6b9 100644
--- a/apache-commons/src/main/java/org/apache/tamaya/commons/IniConfigurationFormat.java
+++ b/apache-commons/src/main/java/org/apache/tamaya/commons/IniConfigurationFormat.java
@@ -20,7 +20,6 @@ package org.apache.tamaya.commons;
 
 import org.apache.commons.configuration.HierarchicalINIConfiguration;
 import org.apache.commons.configuration.SubnodeConfiguration;
-import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.format.ConfigurationData;
 import org.apache.tamaya.format.ConfigurationDataBuilder;
 import org.apache.tamaya.format.ConfigurationFormat;
@@ -71,7 +70,7 @@ public class IniConfigurationFormat implements ConfigurationFormat {
                 builder.addSectionProperties(section, properties);
             }
         } catch (Exception e) {
-            throw new ConfigException("Failed to parse ini-file format from " + name, e);
+            throw new IllegalArgumentException("Failed to parse ini-file format from " + name, e);
         }
         return builder.build();
     }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/apache-commons/src/main/java/org/apache/tamaya/commons/XmlConfigurationFormat.java
----------------------------------------------------------------------
diff --git a/apache-commons/src/main/java/org/apache/tamaya/commons/XmlConfigurationFormat.java b/apache-commons/src/main/java/org/apache/tamaya/commons/XmlConfigurationFormat.java
index ecb154c..55b352f 100644
--- a/apache-commons/src/main/java/org/apache/tamaya/commons/XmlConfigurationFormat.java
+++ b/apache-commons/src/main/java/org/apache/tamaya/commons/XmlConfigurationFormat.java
@@ -19,7 +19,6 @@
 package org.apache.tamaya.commons;
 
 import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.format.ConfigurationData;
 import org.apache.tamaya.format.ConfigurationDataBuilder;
 import org.apache.tamaya.format.ConfigurationFormat;
@@ -63,7 +62,7 @@ public class XmlConfigurationFormat implements ConfigurationFormat {
                 builder.addDefaultProperty(key, commonXmlConfiguration.getString(key));
             }
         } catch (Exception e) {
-            throw new ConfigException("Failed to parse xml-file format from " + name, e);
+            throw new IllegalArgumentException("Failed to parse xml-file format from " + name, e);
         }
         return builder.build();
     }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/camel/bnd.bnd
----------------------------------------------------------------------
diff --git a/camel/bnd.bnd b/camel/bnd.bnd
index a325ff9..f2f2c65 100644
--- a/camel/bnd.bnd
+++ b/camel/bnd.bnd
@@ -22,5 +22,4 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.camel
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/collections/bnd.bnd
----------------------------------------------------------------------
diff --git a/collections/bnd.bnd b/collections/bnd.bnd
index 0018594..4a6a1ab 100644
--- a/collections/bnd.bnd
+++ b/collections/bnd.bnd
@@ -22,5 +22,9 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.collections
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi,\
+    org.apache.tamaya.base,\
+    org.apache.tamaya.base.convert,\
+    org.apache.tamaya.meta
+

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java
----------------------------------------------------------------------
diff --git a/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java b/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java
index 90e6d47..0354f9e 100644
--- a/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java
+++ b/collections/src/main/java/org/apache/tamaya/collections/AdaptiveCombinationPolicy.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.collections;
 
 import org.apache.tamaya.meta.MetaProperties;
-import org.apache.tamaya.spi.ConfigValueCombinationPolicy;
+import org.apache.tamaya.base.ConfigValueCombinationPolicy;
 
 import javax.annotation.Priority;
 import javax.config.ConfigProvider;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/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 505463d..e0281ef 100644
--- a/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
+++ b/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
@@ -18,11 +18,11 @@
  */
 package org.apache.tamaya.collections;
 
+import org.apache.tamaya.base.TypeUtils;
 import org.apache.tamaya.base.convert.ConversionContext;
 import org.apache.tamaya.base.convert.ConverterManager;
 import org.apache.tamaya.meta.MetaProperties;
-import org.apache.tamaya.spi.ConfigContextSupplier;
-import org.apache.tamaya.spi.TypeLiteral;
+import org.apache.tamaya.base.ConfigContextSupplier;
 
 import javax.config.Config;
 import javax.config.ConfigProvider;
@@ -148,15 +148,15 @@ final class ItemTokenizer {
                 LOG.log(Level.SEVERE, "Error convertion config to ArrayList type.", e);
             }
         }
-        if (TypeLiteral.getTypeParameters(targetType()).length>0) {
+        if (TypeUtils.getTypeParameters(targetType()).length>0) {
             if (config() instanceof ConfigContextSupplier) {
                 valueConverters.addAll(
                         ((ConfigContextSupplier) config()).getConfigContext().getConverters(
-                                TypeLiteral.getTypeParameters(targetType())[0]
+                                TypeUtils.getTypeParameters(targetType())[0]
                         ));
             } else {
                 valueConverters.addAll(ConverterManager.defaultInstance().getConverters(
-                        TypeLiteral.getTypeParameters(targetType())[0]));
+                        TypeUtils.getTypeParameters(targetType())[0]));
             }
         }
         ConversionContext ctx = new ConversionContext.Builder(config(), key(), targetType()).build();

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/collections/src/main/resources/META-INF/services/org.apache.tamaya.base.spi.ConfigValueCombinationPolicy
----------------------------------------------------------------------
diff --git a/collections/src/main/resources/META-INF/services/org.apache.tamaya.base.spi.ConfigValueCombinationPolicy b/collections/src/main/resources/META-INF/services/org.apache.tamaya.base.spi.ConfigValueCombinationPolicy
new file mode 100644
index 0000000..277c753
--- /dev/null
+++ b/collections/src/main/resources/META-INF/services/org.apache.tamaya.base.spi.ConfigValueCombinationPolicy
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+org.apache.tamaya.collections.AdaptiveCombinationPolicy
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/collections/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigValueCombinationPolicy
----------------------------------------------------------------------
diff --git a/collections/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigValueCombinationPolicy b/collections/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigValueCombinationPolicy
deleted file mode 100644
index 277c753..0000000
--- a/collections/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigValueCombinationPolicy
+++ /dev/null
@@ -1,19 +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 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.
-#
-org.apache.tamaya.collections.AdaptiveCombinationPolicy
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
----------------------------------------------------------------------
diff --git a/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java b/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
index 21b76e1..5b4d872 100644
--- a/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
+++ b/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
@@ -22,7 +22,6 @@ import javax.config.Config;
 import javax.config.ConfigProvider;
 
 import org.apache.tamaya.base.convert.ConversionContext;
-import org.apache.tamaya.spi.TypeLiteral;
 import org.junit.Test;
 
 import java.util.Currency;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
----------------------------------------------------------------------
diff --git a/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java b/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
index 124cc02..7dae3d7 100644
--- a/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
+++ b/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
@@ -19,7 +19,6 @@
 package org.apache.tamaya.collections;
 
 import org.apache.tamaya.base.convert.ConversionContext;
-import org.apache.tamaya.spi.TypeLiteral;
 import org.junit.Test;
 
 import javax.config.Config;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
----------------------------------------------------------------------
diff --git a/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java b/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
index 4ca96d1..5d43ad9 100644
--- a/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
+++ b/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
@@ -22,7 +22,6 @@ import javax.config.Config;
 import javax.config.ConfigProvider;
 
 import org.apache.tamaya.base.convert.ConversionContext;
-import org.apache.tamaya.spi.TypeLiteral;
 import org.junit.Test;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
----------------------------------------------------------------------
diff --git a/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java b/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
index 8b2860d..c761c78 100644
--- a/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
+++ b/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
@@ -22,7 +22,6 @@ import javax.config.Config;
 import javax.config.ConfigProvider;
 
 import org.apache.tamaya.base.convert.ConversionContext;
-import org.apache.tamaya.spi.TypeLiteral;
 import org.junit.Test;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/collections/src/test/java/org/apache/tamaya/collections/TypeLiteral.java
----------------------------------------------------------------------
diff --git a/collections/src/test/java/org/apache/tamaya/collections/TypeLiteral.java b/collections/src/test/java/org/apache/tamaya/collections/TypeLiteral.java
new file mode 100644
index 0000000..a9ea8f6
--- /dev/null
+++ b/collections/src/test/java/org/apache/tamaya/collections/TypeLiteral.java
@@ -0,0 +1,187 @@
+/*
+ * 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.collections;
+
+
+import java.io.Serializable;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Objects;
+
+/**
+ * <p>Class for instantiation of objects that represent parameterized types
+ * with current parameters.</p>
+ *
+ * <p>An object that represents a parameterized type may be obtained by
+ * subclassing <tt>TypeLiteral</tt>.</p>
+ *
+ * <pre>
+ * TypeLiteral&lt;List&lt;Integer&gt;&gt; stringListType = new TypeLiteral&lt;List&lt;Integer&gt;&gt;() {};
+ * </pre>
+ *
+ * @param <T> the type, including all type parameters
+ */
+public class TypeLiteral<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private static final Type[] EMPTY_TYPE_ARRAY = new Type[0];
+    /** The current defined type. */
+    private final Type definedType;
+
+    /**
+     * Constructor.
+     * @param definedType the defined type.
+     */
+    public TypeLiteral(Type definedType) {
+        Objects.requireNonNull(definedType, "Type must be given");
+
+        this.definedType = definedType;
+    }
+
+    /**
+     * Constructor only for directly implemeting a TypeLiteral hereby dynamically implementing a generic interface.
+     */
+    public TypeLiteral() {
+        this.definedType = getDefinedType(this.getClass());
+    }
+
+    /**
+     * Creates a new TypeLiteral based on a given type.
+     *
+     * @param type the type , not {@code null}.
+     * @param <R>  the literal generic type.
+     * @return the corresponding TypeLiteral, never {@code null}.
+     */
+    public static <R> TypeLiteral<R> of(Type type) {
+        Objects.requireNonNull(type, "Type must be given.");
+
+        return new TypeLiteral<R>(type);
+    }
+
+    public final Type getType() {
+        return definedType;
+    }
+
+    /**
+     * Returns basic raw Java type.
+     *
+     * @return the actual type represented by this object
+     */
+    @SuppressWarnings("unchecked")
+	public final Class<T> getRawType() {
+        Class<T> rawType;
+
+        if (this.definedType instanceof ParameterizedType) {
+            ParameterizedType pt = (ParameterizedType) this.definedType;
+            rawType = (Class<T>) pt.getRawType();
+        } else if (this.definedType instanceof GenericArrayType) {
+            rawType = (Class<T>) Object[].class;
+        } else if (this.definedType instanceof Class) {
+            rawType = (Class<T>) this.definedType;
+        } else {
+            throw new RuntimeException("Illegal type for the Type Literal Class");
+        }
+
+        return rawType;
+    }
+
+    /**
+     * Returns actual type arguments, if present.
+     *
+     * @return the actual type represented by defined class, or an empty array.
+     */
+    public final Type[] getActualTypeArguments() {
+        if (this.definedType instanceof ParameterizedType) {
+            ParameterizedType pt = (ParameterizedType) this.definedType;
+            return pt.getActualTypeArguments();
+        }
+        return new Type[0];
+    }
+
+
+    protected Type getDefinedType(Class<?> clazz) {
+        Type type;
+
+        if (clazz == null) {
+            throw new RuntimeException("Class parameter clazz can not be null");
+        }
+
+        Type superClazz = clazz.getGenericSuperclass();
+
+        if (superClazz instanceof ParameterizedType) {
+            ParameterizedType pt = (ParameterizedType) superClazz;
+            Type[] actualArgs = pt.getActualTypeArguments();
+
+            if (actualArgs.length == 1) {
+                type = actualArgs[0];
+
+            } else {
+                throw new RuntimeException("More than one parametric type");
+            }
+
+        } else if (superClazz.equals(Object.class)) {
+            throw new RuntimeException("Super class must be parametrized type");
+        } else {
+            type = getDefinedType((Class<?>) superClazz);
+        }
+
+        return type;
+    }
+
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((definedType == null) ? 0 : definedType.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        TypeLiteral<?> other = (TypeLiteral<?>) obj;
+        if (definedType == null) {
+            if (other.definedType != null) {
+                return false;
+            }
+        } else if (!definedType.equals(other.definedType)) {
+            return false;
+        }
+        return true;
+    }
+
+
+    @Override
+    public String toString() {
+        return "TypeLiteral{" +
+                "type=" + definedType +
+                '}';
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/configsources/bnd.bnd
----------------------------------------------------------------------
diff --git a/configsources/bnd.bnd b/configsources/bnd.bnd
index dae0996..3344d06 100644
--- a/configsources/bnd.bnd
+++ b/configsources/bnd.bnd
@@ -22,6 +22,7 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.propertysources
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi,\
-    org.apache.tamaya.spisupport
+    javax.config,\
+    javax.config.spi,\
+    org.apache.tamaya.format,\
+    org.apache.tamaya.base.configsource

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/configured-sysprops/bnd.bnd
----------------------------------------------------------------------
diff --git a/configured-sysprops/bnd.bnd b/configured-sysprops/bnd.bnd
index 64a2f44..14a0141 100644
--- a/configured-sysprops/bnd.bnd
+++ b/configured-sysprops/bnd.bnd
@@ -22,5 +22,4 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.sysprops
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/consul/bnd.bnd
----------------------------------------------------------------------
diff --git a/consul/bnd.bnd b/consul/bnd.bnd
index bb6123a..cad3e09 100644
--- a/consul/bnd.bnd
+++ b/consul/bnd.bnd
@@ -22,10 +22,10 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.consul
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi,\
+    javax.config,\
+    javax.config.spi,\
     org.apache.tamaya.mutableconfig,\
     org.apache.tamaya.mutableconfig.spi
 Export-Service: \
-    org.apache.tamaya.spi.PropertySource
+    javax.config.spi.ConfigSource
     
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/etcd/bnd.bnd
----------------------------------------------------------------------
diff --git a/etcd/bnd.bnd b/etcd/bnd.bnd
index f80b1df..4e8f04d 100644
--- a/etcd/bnd.bnd
+++ b/etcd/bnd.bnd
@@ -24,10 +24,11 @@ Export-Package: \
 Import-Package: \
 	javax.config,\
 	javax.config.spi,\
+	org.apache.tamaya.base.configsource,\
 	org.osgi.framework,\
 	javax.annotation,\
     org.apache.tamaya.mutableconfig,\
     org.apache.tamaya.mutableconfig.spi
 Export-Service: \
-    org.apache.tamaya.spi.PropertySource
+    javax.config.spi.ConfigSource
     
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/hazelcast/bnd.bnd
----------------------------------------------------------------------
diff --git a/hazelcast/bnd.bnd b/hazelcast/bnd.bnd
index fd83e0f..7d8ae97 100644
--- a/hazelcast/bnd.bnd
+++ b/hazelcast/bnd.bnd
@@ -22,7 +22,9 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.hazelcast
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi,\
+    org.apache.tamaya.base,\
+    org.apache.tamaya.base.configsource
 Export-Service: \
-    org.apache.tamaya.spi.PropertySource
+    javax.config.spi.ConfigSource

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/jodatime/bnd.bnd
----------------------------------------------------------------------
diff --git a/jodatime/bnd.bnd b/jodatime/bnd.bnd
index ae3765e..4fc7595 100644
--- a/jodatime/bnd.bnd
+++ b/jodatime/bnd.bnd
@@ -22,7 +22,9 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.jodatime
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi,\
+    org.joda.time,\
+    org.joda.time.format
 Export-Service: \
-    org.apache.tamaya.spi.PropertyConverter
+    javax.config.spi.Converter

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java
----------------------------------------------------------------------
diff --git a/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java b/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java
index 7bc9739..921062b 100644
--- a/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java
+++ b/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.jodatime;
 
 
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 import org.junit.Test;
 
 import javax.config.spi.Converter;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java
----------------------------------------------------------------------
diff --git a/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java b/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java
index 35dd618..0c10b0f 100644
--- a/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java
+++ b/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java
@@ -19,8 +19,7 @@
 package org.apache.tamaya.jodatime;
 
 
-import org.apache.tamaya.spi.ServiceContext;
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 import org.junit.Test;
 
 import javax.config.spi.Converter;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/jodatime/src/test/java/org/apache/tamaya/jodatime/DurationConverterIT.java
----------------------------------------------------------------------
diff --git a/jodatime/src/test/java/org/apache/tamaya/jodatime/DurationConverterIT.java b/jodatime/src/test/java/org/apache/tamaya/jodatime/DurationConverterIT.java
index cfcc601..531a12c 100644
--- a/jodatime/src/test/java/org/apache/tamaya/jodatime/DurationConverterIT.java
+++ b/jodatime/src/test/java/org/apache/tamaya/jodatime/DurationConverterIT.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.jodatime;
 
 
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 import org.junit.Test;
 
 import javax.config.spi.Converter;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/jodatime/src/test/java/org/apache/tamaya/jodatime/PeriodConverterIT.java
----------------------------------------------------------------------
diff --git a/jodatime/src/test/java/org/apache/tamaya/jodatime/PeriodConverterIT.java b/jodatime/src/test/java/org/apache/tamaya/jodatime/PeriodConverterIT.java
index 473b530..543595f 100644
--- a/jodatime/src/test/java/org/apache/tamaya/jodatime/PeriodConverterIT.java
+++ b/jodatime/src/test/java/org/apache/tamaya/jodatime/PeriodConverterIT.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.jodatime;
 
 
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 import org.junit.Test;
 
 import javax.config.spi.Converter;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/management/bnd.bnd
----------------------------------------------------------------------
diff --git a/management/bnd.bnd b/management/bnd.bnd
index 48a8961..682e620 100644
--- a/management/bnd.bnd
+++ b/management/bnd.bnd
@@ -22,7 +22,7 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.management
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi
 Export-Service: \
     org.apache.tamaya.management.ManagedConfigMBean

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/management/src/main/java/org/apache/tamaya/management/ConfigManagementSupport.java
----------------------------------------------------------------------
diff --git a/management/src/main/java/org/apache/tamaya/management/ConfigManagementSupport.java b/management/src/main/java/org/apache/tamaya/management/ConfigManagementSupport.java
index 64fa062..75f7753 100644
--- a/management/src/main/java/org/apache/tamaya/management/ConfigManagementSupport.java
+++ b/management/src/main/java/org/apache/tamaya/management/ConfigManagementSupport.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.management;
 
 
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServer;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java
----------------------------------------------------------------------
diff --git a/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java b/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java
index b2a703e..27212a7 100644
--- a/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java
+++ b/meta/src/main/java/org/apache/tamaya/meta/MetaProperties.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.meta;
 
 
 import org.apache.tamaya.meta.spi.MetaPropertyMapping;
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 
 import javax.config.Config;
 import javax.config.spi.ConfigSource;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/bnd.bnd
----------------------------------------------------------------------
diff --git a/metamodel/bnd.bnd b/metamodel/bnd.bnd
index b908e00..12393de 100644
--- a/metamodel/bnd.bnd
+++ b/metamodel/bnd.bnd
@@ -24,11 +24,14 @@ Export-Package: \
     org.apache.tamaya.metamodel.dsl,\
     org.apache.tamaya.metamodel.spi
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi,\
+    org.apache.tamaya.base,\
+    org.apache.tamaya.base.configsource,\
+    org.apache.tamaya.base.filter
 Export-Service: \
     org.apache.tamaya.metamodel.spi.ItemFactory,\
     org.apache.tamaya.metamodel.spi.MetaConfigurationReader,\
     org.apache.tamaya.metamodel.spi.SimpleResolver,\
-    org.apache.tamaya.spi.ConfigurationProviderSpi
+    org.apache.tamaya.core.TamayaConfigProviderResolver$ConfigFactory
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java
index 98d2ebe..1811bcb 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/CachedFilter.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.metamodel;
 
 import org.apache.tamaya.metamodel.spi.ItemFactory;
-import org.apache.tamaya.spi.Filter;
+import org.apache.tamaya.base.filter.Filter;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java
index 820bb18..cc4bada 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/HideFilter.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tamaya.metamodel;
 
+import org.apache.tamaya.base.filter.Filter;
 import org.apache.tamaya.metamodel.spi.ItemFactory;
-import org.apache.tamaya.spi.*;
 
 import java.util.Map;
 
@@ -28,7 +28,7 @@ import java.util.Map;
  * is changing underneath, hereby different values for single and multi-property access
  * are considered.
  */
-public class HideFilter implements Filter{
+public class HideFilter implements Filter {
 
     private String matches;
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/ImmutableFilter.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/ImmutableFilter.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/ImmutableFilter.java
index 3a0446b..00d9ca1 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/ImmutableFilter.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/ImmutableFilter.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.metamodel;
 
 import org.apache.tamaya.metamodel.spi.ItemFactory;
-import org.apache.tamaya.spi.Filter;
+import org.apache.tamaya.base.filter.Filter;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/MaskFilter.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/MaskFilter.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/MaskFilter.java
index 70b219e..eb8d659 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/MaskFilter.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/MaskFilter.java
@@ -19,10 +19,7 @@
 package org.apache.tamaya.metamodel;
 
 import org.apache.tamaya.metamodel.spi.ItemFactory;
-import org.apache.tamaya.spi.Filter;
-import org.apache.tamaya.spi.FilterContext;
-import org.apache.tamaya.spi.PropertyFilter;
-import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.base.filter.Filter;
 
 import java.util.ArrayList;
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
index 8c1e14f..5729e6b 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
@@ -18,8 +18,9 @@
  */
 package org.apache.tamaya.metamodel;
 
+import org.apache.tamaya.base.ServiceContext;
 import org.apache.tamaya.metamodel.spi.MetaConfigurationReader;
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
@@ -99,7 +100,7 @@ public final class MetaConfiguration {
     /**
      * Performs initialization of a new configuration
      * context to the {@link MetaConfigurationReader} instances found in the current
-     * {@link org.apache.tamaya.spi.ServiceContext} and returns the corresponding builder
+     * {@link ServiceContext} and returns the corresponding builder
      * instance.
      * @param metaConfig URL for loading the {@code tamaya-config.xml} meta-configuration.
      * @return a new configuration context builder, never null.
@@ -128,7 +129,7 @@ public final class MetaConfiguration {
     /**
      * Reads the meta-configuration and delegates initialization of the current configuration
      * context to the {@link MetaConfigurationReader} instances found in the current
-     * {@link org.apache.tamaya.spi.ServiceContext}.
+     * {@link ServiceContext}.
      * @param metaConfig URL for loading the {@code tamaya-config.xml} meta-configuration.
      * @return the new configuration instance.
      */

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/SecuredFilter.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/SecuredFilter.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/SecuredFilter.java
index ada6ebd..adfca9c 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/SecuredFilter.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/SecuredFilter.java
@@ -18,12 +18,8 @@
  */
 package org.apache.tamaya.metamodel;
 
-import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.metamodel.spi.ItemFactory;
-import org.apache.tamaya.spi.Filter;
-import org.apache.tamaya.spi.FilterContext;
-import org.apache.tamaya.spi.PropertyFilter;
-import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.base.filter.Filter;
 
 import javax.security.auth.Subject;
 import java.security.*;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredConfigSource.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredConfigSource.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredConfigSource.java
index 5cacc33..4cc7b38 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredConfigSource.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredConfigSource.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.metamodel.ext;
 import org.apache.tamaya.base.DefaultConfigBuilder;
 import org.apache.tamaya.base.configsource.BaseConfigSource;
 import org.apache.tamaya.base.configsource.ConfigSourceComparator;
+import org.apache.tamaya.base.filter.Filter;
 import org.apache.tamaya.spi.*;
 import javax.config.Config;
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshableConfigSourceProvider.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshableConfigSourceProvider.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshableConfigSourceProvider.java
index ce3d5ac..f82191f 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshableConfigSourceProvider.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshableConfigSourceProvider.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.metamodel.ext;
 
 import org.apache.tamaya.metamodel.Refreshable;
 import org.apache.tamaya.metamodel.internal.ComponentConfigurator;
-import org.apache.tamaya.spi.ServiceContext;
+import org.apache.tamaya.base.ServiceContext;
 
 import javax.config.spi.ConfigSource;
 import javax.config.spi.ConfigSourceProvider;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java
index 249990c..0291721 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java
@@ -22,8 +22,8 @@ import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.metamodel.spi.ItemFactory;
 import org.apache.tamaya.metamodel.spi.ItemFactoryManager;
 import org.apache.tamaya.metamodel.spi.MetaConfigurationReader;
-import org.apache.tamaya.spi.ConfigValueCombinationPolicy;
-import org.apache.tamaya.spi.TamayaConfigBuilder;
+import org.apache.tamaya.base.ConfigValueCombinationPolicy;
+import org.apache.tamaya.base.TamayaConfigBuilder;
 import org.osgi.service.component.annotations.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentFactory.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentFactory.java
index 906b704..070394b 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentFactory.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.tamaya.metamodel.internal;
 
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java
index 4c18951..5eb3ad9 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java
@@ -21,7 +21,7 @@ package org.apache.tamaya.metamodel.internal;
 import org.apache.tamaya.metamodel.spi.ItemFactory;
 import org.apache.tamaya.metamodel.spi.ItemFactoryManager;
 import org.apache.tamaya.metamodel.spi.MetaConfigurationReader;
-import org.apache.tamaya.spi.TamayaConfigBuilder;
+import org.apache.tamaya.base.TamayaConfigBuilder;
 import org.osgi.service.component.annotations.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java
index 9dc9c7e..fc10ce0 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java
@@ -27,9 +27,8 @@ import org.apache.tamaya.metamodel.ext.RefreshableConfigSourceProvider;
 import org.apache.tamaya.metamodel.spi.ItemFactory;
 import org.apache.tamaya.metamodel.spi.ItemFactoryManager;
 import org.apache.tamaya.metamodel.spi.MetaConfigurationReader;
-import org.apache.tamaya.spi.Filter;
-import org.apache.tamaya.spi.PropertyFilter;
-import org.apache.tamaya.spi.ServiceContext;
+import org.apache.tamaya.base.filter.Filter;
+import org.apache.tamaya.base.ServiceContext;
 import org.osgi.service.component.annotations.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -38,7 +37,6 @@ import org.w3c.dom.NodeList;
 import javax.config.spi.ConfigBuilder;
 import javax.config.spi.ConfigSource;
 import javax.config.spi.ConfigSourceProvider;
-import java.util.Collections;
 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/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java
index 24d6856..a9ed765 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java
@@ -21,7 +21,7 @@ package org.apache.tamaya.metamodel.internal;
 import org.apache.tamaya.metamodel.spi.ItemFactory;
 import org.apache.tamaya.metamodel.spi.ItemFactoryManager;
 import org.apache.tamaya.metamodel.spi.MetaConfigurationReader;
-import org.apache.tamaya.spi.TamayaConfigBuilder;
+import org.apache.tamaya.base.TamayaConfigBuilder;
 import org.osgi.service.component.annotations.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java
index 3537ac0..041a22a 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java
@@ -22,10 +22,8 @@ import org.apache.tamaya.ConfigException;
 import org.apache.tamaya.metamodel.spi.ItemFactory;
 import org.apache.tamaya.metamodel.spi.ItemFactoryManager;
 import org.apache.tamaya.metamodel.spi.MetaConfigurationReader;
-import org.apache.tamaya.spi.ConfigurationContextBuilder;
-import org.apache.tamaya.spi.Filter;
-import org.apache.tamaya.spi.PropertyFilter;
-import org.apache.tamaya.spi.TamayaConfigBuilder;
+import org.apache.tamaya.base.filter.Filter;
+import org.apache.tamaya.base.TamayaConfigBuilder;
 import org.osgi.service.component.annotations.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java
index 5e7cff9..dc484e5 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java
@@ -21,7 +21,7 @@ package org.apache.tamaya.metamodel.internal;
 import org.apache.tamaya.metamodel.MetaContext;
 import org.apache.tamaya.metamodel.spi.MetaConfigurationReader;
 import org.apache.tamaya.metamodel.spi.SimpleResolver;
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 import org.osgi.service.component.annotations.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java
index 4578640..6450317 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/ItemFactoryManager.java
@@ -18,12 +18,10 @@
  */
 package org.apache.tamaya.metamodel.spi;
 
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java
index 9339b71..4cbb4fd 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tamaya.metamodel.spi;
 
+import org.apache.tamaya.base.ServiceContext;
 import org.w3c.dom.Document;
 
 import javax.config.spi.ConfigBuilder;
@@ -31,7 +32,7 @@ public interface MetaConfigurationReader {
     /**
      * Reads meta-configuration from the given document and configures the current
      * context builder. The priority of readers is determined by the priorization policy
-     * implemented by the {@link org.apache.tamaya.spi.ServiceContext},
+     * implemented by the {@link ServiceContext},
      * @param document the meta-configuration document
      * @param configBuilder the config builder to use.
      */

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java
----------------------------------------------------------------------
diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java
index 7ae76af..e689139 100644
--- a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java
+++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java
@@ -18,10 +18,12 @@
  */
 package org.apache.tamaya.metamodel.ext;
 
+import org.apache.tamaya.base.ConfigContext;
+import org.apache.tamaya.base.ConfigContextSupplier;
+import org.apache.tamaya.base.filter.Filter;
 import org.apache.tamaya.metamodel.CachedFilter;
 import org.apache.tamaya.metamodel.MetaConfiguration;
 import org.apache.tamaya.metamodel.MetaContext;
-import org.apache.tamaya.spi.*;
 import org.junit.Test;
 
 import javax.config.Config;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyFilter.java
----------------------------------------------------------------------
diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyFilter.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyFilter.java
index 187a8d2..51abaa8 100644
--- a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyFilter.java
+++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/MyFilter.java
@@ -18,10 +18,7 @@
  */
 package org.apache.tamaya.metamodel.ext;
 
-import org.apache.tamaya.spi.Filter;
-import org.apache.tamaya.spi.FilterContext;
-import org.apache.tamaya.spi.PropertyFilter;
-import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.base.filter.Filter;
 
 /**
  * Created by atsticks on 17.04.17.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.base.filter.Filter
----------------------------------------------------------------------
diff --git a/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.base.filter.Filter b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.base.filter.Filter
new file mode 100644
index 0000000..80fa6c6
--- /dev/null
+++ b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.base.filter.Filter
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+org.apache.tamaya.metamodel.ImmutableFilter
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.spi.Filter
----------------------------------------------------------------------
diff --git a/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.spi.Filter b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.spi.Filter
deleted file mode 100644
index 80fa6c6..0000000
--- a/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.spi.Filter
+++ /dev/null
@@ -1,19 +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.
-#
-org.apache.tamaya.metamodel.ImmutableFilter
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/remote/bnd.bnd
----------------------------------------------------------------------
diff --git a/remote/bnd.bnd b/remote/bnd.bnd
index c475190..6307a5d 100644
--- a/remote/bnd.bnd
+++ b/remote/bnd.bnd
@@ -22,5 +22,5 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.remote
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/server/bnd.bnd
----------------------------------------------------------------------
diff --git a/server/bnd.bnd b/server/bnd.bnd
index caee7cb..614a5d5 100644
--- a/server/bnd.bnd
+++ b/server/bnd.bnd
@@ -21,7 +21,7 @@ Bundle-ContactAddress: dev-tamaya@incubator.apache.org
 Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.server,\
-    	org.apache.tamaya.server.spi
+    org.apache.tamaya.server.spi
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/ui/base/bnd.bnd
----------------------------------------------------------------------
diff --git a/ui/base/bnd.bnd b/ui/base/bnd.bnd
index 2d32c37..54be3e2 100644
--- a/ui/base/bnd.bnd
+++ b/ui/base/bnd.bnd
@@ -27,8 +27,8 @@ Export-Package: \
 Private-Package: \
     org.apache.tamaya.ui.internal
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi
 Export-Service: \
     org.apache.tamaya.ui.spi.MessageProvider,\
     org.apache.tamaya.ui.spi.SystemInfoProvider,\

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/ui/events/bnd.bnd
----------------------------------------------------------------------
diff --git a/ui/events/bnd.bnd b/ui/events/bnd.bnd
index ca3d14e..18560d7 100644
--- a/ui/events/bnd.bnd
+++ b/ui/events/bnd.bnd
@@ -22,8 +22,8 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.ui.events
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi,\
+   javax.config,\
+   javax.config.spi
     org.apache.tamaya.ui,\
     org.apache.tamaya.ui.event,\
     org.apache.tamaya.ui.spi,\

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/ui/mutableconfig/bnd.bnd
----------------------------------------------------------------------
diff --git a/ui/mutableconfig/bnd.bnd b/ui/mutableconfig/bnd.bnd
index c4b6661..edd06ae 100644
--- a/ui/mutableconfig/bnd.bnd
+++ b/ui/mutableconfig/bnd.bnd
@@ -22,8 +22,8 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.ui.mutableconfig
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi,\
+    javax.config,\
+    javax.config.spi,\
     org.apache.tamaya.ui,\
     org.apache.tamaya.ui.event,\
     org.apache.tamaya.ui.spi,\

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/uom/bnd.bnd
----------------------------------------------------------------------
diff --git a/uom/bnd.bnd b/uom/bnd.bnd
index b23d0f7..ab4fe6b 100644
--- a/uom/bnd.bnd
+++ b/uom/bnd.bnd
@@ -22,7 +22,10 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.ui.uom
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi,\
+    javax.measure,\
+    javax.measure.format,\
+    javax.measure.spi
 Export-Service: \
-    org.apache.tamaya.spi.PropertyConverter
+    javax.config.spi.Converter

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/usagetracker/bnd.bnd
----------------------------------------------------------------------
diff --git a/usagetracker/bnd.bnd b/usagetracker/bnd.bnd
index 22b6dd1..e1b3f4e 100644
--- a/usagetracker/bnd.bnd
+++ b/usagetracker/bnd.bnd
@@ -23,11 +23,11 @@ Export-Package: \
 	org.apache.tamaya.usagetracker,\
     org.apache.tamaya.usagetracker.spi
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi,\
+    javax.config,\
+    javax.config.spi,\
     org.apache.tamaya.events
 Export-Service: \
     org.apache.tamaya.events.ConfigEventListener,\
     org.apache.tamaya.model.spi.ModelProviderSpi,\
-    org.apache.tamaya.spi.PropertyFilter,\
+    org.apache.tamaya.base.filter.Filter,\
     org.apache.tamaya.usagetracker.spi.ConfigUsageSpi

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/usagetracker/src/main/java/org/apache/tamaya/usagetracker/ConfigUsage.java
----------------------------------------------------------------------
diff --git a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/ConfigUsage.java b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/ConfigUsage.java
index 1a70a88..75579e0 100644
--- a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/ConfigUsage.java
+++ b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/ConfigUsage.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tamaya.usagetracker;
 
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 import org.apache.tamaya.usagetracker.spi.ConfigUsageSpi;
 
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java
----------------------------------------------------------------------
diff --git a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java
index e3f847a..b8f0541 100644
--- a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java
+++ b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/UsageStat.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tamaya.usagetracker;
 
-import org.apache.tamaya.spi.ConfigValue;
+import org.apache.tamaya.base.ConfigValue;
 
 import java.util.ArrayList;
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/UsageTrackerFilter.java
----------------------------------------------------------------------
diff --git a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/UsageTrackerFilter.java b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/UsageTrackerFilter.java
index cfb7a1d..d0b6d34 100644
--- a/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/UsageTrackerFilter.java
+++ b/usagetracker/src/main/java/org/apache/tamaya/usagetracker/internal/UsageTrackerFilter.java
@@ -19,8 +19,8 @@
 package org.apache.tamaya.usagetracker.internal;
 
 import org.apache.tamaya.base.filter.FilterContext;
-import org.apache.tamaya.spi.Filter;
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.filter.Filter;
+import org.apache.tamaya.base.ServiceContextManager;
 import org.apache.tamaya.usagetracker.spi.ConfigUsageSpi;
 
 import javax.annotation.Priority;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/usagetracker/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter
----------------------------------------------------------------------
diff --git a/usagetracker/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter b/usagetracker/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter
new file mode 100644
index 0000000..dee62d6
--- /dev/null
+++ b/usagetracker/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+org.apache.tamaya.usagetracker.internal.UsageTrackerFilter
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/usagetracker/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter
----------------------------------------------------------------------
diff --git a/usagetracker/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter b/usagetracker/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter
deleted file mode 100644
index dee62d6..0000000
--- a/usagetracker/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter
+++ /dev/null
@@ -1,19 +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 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.
-#
-org.apache.tamaya.usagetracker.internal.UsageTrackerFilter
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/validation/bnd.bnd
----------------------------------------------------------------------
diff --git a/validation/bnd.bnd b/validation/bnd.bnd
index 4cdf44c..42874d4 100644
--- a/validation/bnd.bnd
+++ b/validation/bnd.bnd
@@ -23,8 +23,8 @@ Export-Package: \
 	org.apache.tamaya.validation,\
     org.apache.tamaya.validation.spi
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi,\
+    javax.config,\
+    javax.config.spi,\
     org.apache.tamaya.events
 Export-Service: \
     org.apache.tamaya.events.ConfigEventListener,\

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java
----------------------------------------------------------------------
diff --git a/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java b/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java
index 565dd32..64ec6a0 100644
--- a/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java
+++ b/validation/src/main/java/org/apache/tamaya/validation/ValidationManager.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.validation;
 
 import org.apache.tamaya.validation.spi.ConfigValidationMBean;
 import org.apache.tamaya.validation.spi.ValidationModelProviderSpi;
-import org.apache.tamaya.spi.ServiceContextManager;
+import org.apache.tamaya.base.ServiceContextManager;
 
 import javax.config.Config;
 import javax.management.InstanceNotFoundException;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/639e69f0/vertx/bnd.bnd
----------------------------------------------------------------------
diff --git a/vertx/bnd.bnd b/vertx/bnd.bnd
index 0a64402..42b0e63 100644
--- a/vertx/bnd.bnd
+++ b/vertx/bnd.bnd
@@ -22,6 +22,8 @@ Bundle-DocURL: http://tamaya.apache.org
 Export-Package: \
 	org.apache.tamaya.vertx
 Import-Package: \
-    org.apache.tamaya,\
-    org.apache.tamaya.spi
+    javax.config,\
+    javax.config.spi,\
+    org.apache.tamaya.functions,\
+    io.vertx.core
 


Mime
View raw message