Repository: incubator-tamaya-extensions Updated Branches: refs/heads/configjsr 1143276b0 -> 91c8e6923
- Adapted OSGI deps. - Defined clear resolvability of packages, removing redundancies. - Refactored parts of TypeLiteral into util class. Signed-off-by: Anatole Tresch <anat...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/91c8e692 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/91c8e692 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/91c8e692 Branch: refs/heads/configjsr Commit: 91c8e692308778900f92b81475e8c68d5d116e3b Parents: 1143276 Author: Anatole Tresch <anat...@apache.org> Authored: Mon Feb 5 01:10:05 2018 +0100 Committer: Anatole Tresch <anat...@apache.org> Committed: Mon Feb 5 01:10:05 2018 +0100 ---------------------------------------------------------------------- .../apache/tamaya/events/ConfigEventManager.java | 2 +- .../org/apache/tamaya/events/FrozenConfig.java | 4 ++-- .../internal/DefaultConfigEventManagerSpi.java | 2 +- .../tamaya/events/spi/ConfigEventManagerSpi.java | 3 ++- modules/filter/bnd.bnd | 7 +++++-- .../tamaya/filter/ConfigurationFilter.java | 2 +- .../java/org/apache/tamaya/filter/Context.java | 3 +-- .../filter/internal/DefaultMetadataFilter.java | 2 +- .../org.apache.tamaya.base.filter.Filter | 19 +++++++++++++++++++ .../services/org.apache.tamaya.spi.Filter | 19 ------------------- .../filter/ConfigurationFilterTest.java | 3 +-- .../filter/ProgrammableFilterTest.java | 2 +- modules/formats/base/bnd.bnd | 8 ++++++-- .../tamaya/format/ConfigurationFormats.java | 2 +- modules/formats/json/bnd.bnd | 8 ++++++-- .../org/apache/tamaya/yaml/JSONFormatIT.java | 2 +- modules/formats/yaml/bnd.bnd | 8 ++++++-- modules/functions/bnd.bnd | 5 +++-- modules/injection/cdi/bnd.bnd | 15 ++++++++++----- .../tamaya/cdi/CDIAwareServiceContext.java | 2 +- .../org/apache/tamaya/cdi/ConfigProducer.java | 14 ++++++++++---- .../tamaya/cdi/ServiceLoaderServiceContext.java | 2 +- .../org.apache.tamaya.base.spi.ServiceContext | 19 +++++++++++++++++++ .../org.apache.tamaya.spi.ServiceContext | 19 ------------------- modules/injection/injection-api/bnd.bnd | 7 +++---- modules/injection/standalone/bnd.bnd | 12 ++++++++---- .../tamaya/inject/ConfigurationInjection.java | 2 +- .../tamaya/inject/internal/InjectionHelper.java | 6 +++--- modules/jndi/bnd.bnd | 7 ++++--- .../services/javax.config.spi.ConfigSource | 19 +++++++++++++++++++ .../org.apache.tamaya.spi.PropertySource | 19 ------------------- modules/mutable-config/bnd.bnd | 7 +++++-- .../MutableConfigurationProvider.java | 2 +- modules/osgi/common/bnd.bnd | 9 +++++---- modules/osgi/gogo-shell/bnd.bnd | 10 ++++------ modules/osgi/injection/bnd.bnd | 10 ++++++---- modules/osgi/karaf-shell/bnd.bnd | 7 ++++--- modules/osgi/updater/bnd.bnd | 11 +++++------ modules/resolver/bnd.bnd | 12 ++++++++---- .../org/apache/tamaya/resolver/Resolver.java | 2 +- .../internal/DefaultExpressionEvaluator.java | 2 +- .../internal/ExpressionResolutionFilter.java | 4 ++-- .../tamaya/resolver/internal/FileResolver.java | 2 +- .../resolver/internal/ResolvableConfig.java | 10 +++++----- .../resolver/internal/ResourceResolver.java | 2 +- .../tamaya/resolver/spi/ExpressionEvaluator.java | 7 +++++-- .../org.apache.tamaya.base.filter.Filter | 19 +++++++++++++++++++ .../services/org.apache.tamaya.spi.Filter | 19 ------------------- modules/resources/bnd.bnd | 8 ++++++-- .../AbstractPathConfigSourceProvider.java | 2 +- .../apache/tamaya/resource/ConfigResources.java | 2 +- .../internal/ClassPathResourceLocator.java | 2 +- .../resource/internal/ClasspathCollector.java | 2 +- .../internal/DefaultResourceResolver.java | 2 +- modules/spring/bnd.bnd | 9 ++++++++- 55 files changed, 229 insertions(+), 177 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java ---------------------------------------------------------------------- diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java index 29426a1..ea180a9 100644 --- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java +++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventManager.java @@ -19,7 +19,7 @@ package org.apache.tamaya.events; import org.apache.tamaya.events.spi.ConfigEventManagerSpi; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfig.java ---------------------------------------------------------------------- diff --git a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfig.java b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfig.java index dca2204..ba7f737 100644 --- a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfig.java +++ b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfig.java @@ -20,8 +20,8 @@ package org.apache.tamaya.events; import org.apache.tamaya.base.convert.ConversionContext; import org.apache.tamaya.base.convert.ConverterManager; -import org.apache.tamaya.spi.ConfigContext; -import org.apache.tamaya.spi.ConfigContextSupplier; +import org.apache.tamaya.base.ConfigContext; +import org.apache.tamaya.base.ConfigContextSupplier; import javax.config.Config; import javax.config.spi.ConfigSource; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java ---------------------------------------------------------------------- diff --git a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java index bc5fdcf..e0a8b3a 100644 --- a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java +++ b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigEventManagerSpi.java @@ -21,7 +21,7 @@ package org.apache.tamaya.events.internal; import org.apache.tamaya.events.ConfigEvent; import org.apache.tamaya.events.ConfigEventListener; import org.apache.tamaya.events.spi.ConfigEventManagerSpi; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import org.osgi.service.component.annotations.Component; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java ---------------------------------------------------------------------- diff --git a/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java b/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java index c4e512a..1943ca5 100644 --- a/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java +++ b/modules/events/src/main/java/org/apache/tamaya/events/spi/ConfigEventManagerSpi.java @@ -18,6 +18,7 @@ */ package org.apache.tamaya.events.spi; +import org.apache.tamaya.base.ServiceContext; import org.apache.tamaya.events.ConfigChange; import org.apache.tamaya.events.ConfigEvent; import org.apache.tamaya.events.ConfigEventListener; @@ -26,7 +27,7 @@ import java.util.Collection; /** * SPI interface to implement the {@link org.apache.tamaya.events.ConfigEventManager} singleton. - * Implementations of this interface must be registered with the current {@link org.apache.tamaya.spi.ServiceContext}, + * Implementations of this interface must be registered with the current {@link ServiceContext}, * by default this equals to registering it with {@link java.util.ServiceLoader}. Add {@link javax.annotation.Priority} * annotations for overriding (higher values override lower values). */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/filter/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/filter/bnd.bnd b/modules/filter/bnd.bnd index 228fd37..a0049e8 100644 --- a/modules/filter/bnd.bnd +++ b/modules/filter/bnd.bnd @@ -22,7 +22,10 @@ Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.filter Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.base + javax.config,\ + org.apache.tamaya.base,\ + org.apache.tamaya.base.filter,\ + org.osgi.framework,\ + javax.annotation Export-Service: \ org.apache.tamaya.spi.Filter http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java ---------------------------------------------------------------------- diff --git a/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java b/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java index 1c16c07..9db0ee0 100644 --- a/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java +++ b/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java @@ -18,7 +18,7 @@ */ package org.apache.tamaya.filter; -import org.apache.tamaya.spi.Filter; +import org.apache.tamaya.base.filter.Filter; import org.osgi.service.component.annotations.Component; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/filter/src/main/java/org/apache/tamaya/filter/Context.java ---------------------------------------------------------------------- diff --git a/modules/filter/src/main/java/org/apache/tamaya/filter/Context.java b/modules/filter/src/main/java/org/apache/tamaya/filter/Context.java index c6c4ba6..702f7f3 100644 --- a/modules/filter/src/main/java/org/apache/tamaya/filter/Context.java +++ b/modules/filter/src/main/java/org/apache/tamaya/filter/Context.java @@ -18,8 +18,7 @@ */ package org.apache.tamaya.filter; -import org.apache.tamaya.spi.ConfigValue; -import org.apache.tamaya.spi.Filter; +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-extensions/blob/91c8e692/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java ---------------------------------------------------------------------- diff --git a/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java b/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java index ba78930..727ddc9 100644 --- a/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java +++ b/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java @@ -20,7 +20,7 @@ package org.apache.tamaya.filter.internal; import org.apache.tamaya.base.filter.FilterContext; import org.apache.tamaya.filter.ConfigurationFilter; -import org.apache.tamaya.spi.Filter; +import org.apache.tamaya.base.filter.Filter; /** * Default property filter that hides metadta entries starting with an '_', similar ti {@code etcd}. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/filter/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter ---------------------------------------------------------------------- diff --git a/modules/filter/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter b/modules/filter/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter new file mode 100644 index 0000000..806b833 --- /dev/null +++ b/modules/filter/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.filter.ConfigurationFilter \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/filter/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter ---------------------------------------------------------------------- diff --git a/modules/filter/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter b/modules/filter/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter deleted file mode 100644 index 806b833..0000000 --- a/modules/filter/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.filter.ConfigurationFilter \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ConfigurationFilterTest.java ---------------------------------------------------------------------- diff --git a/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ConfigurationFilterTest.java b/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ConfigurationFilterTest.java index e0f24ef..3abe484 100644 --- a/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ConfigurationFilterTest.java +++ b/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ConfigurationFilterTest.java @@ -19,8 +19,7 @@ package org.apache.tamaya.spisupport.filter; import org.apache.tamaya.filter.ConfigurationFilter; -import org.apache.tamaya.spi.ConfigValue; -import org.apache.tamaya.spi.Filter; +import org.apache.tamaya.base.filter.Filter; import org.junit.Test; import javax.config.Config; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ProgrammableFilterTest.java ---------------------------------------------------------------------- diff --git a/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ProgrammableFilterTest.java b/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ProgrammableFilterTest.java index 15e54e6..2aa6fbe 100644 --- a/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ProgrammableFilterTest.java +++ b/modules/filter/src/test/java/org/apache/tamaya/spisupport/filter/ProgrammableFilterTest.java @@ -21,7 +21,7 @@ package org.apache.tamaya.spisupport.filter; import org.apache.tamaya.base.filter.FilterContext; import org.apache.tamaya.base.filter.RegexPropertyFilter; import org.apache.tamaya.filter.Context; -import org.apache.tamaya.spi.Filter; +import org.apache.tamaya.base.filter.Filter; import org.junit.Test; import javax.config.Config; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/formats/base/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/formats/base/bnd.bnd b/modules/formats/base/bnd.bnd index cbca609..bde86d7 100644 --- a/modules/formats/base/bnd.bnd +++ b/modules/formats/base/bnd.bnd @@ -23,7 +23,11 @@ Export-Package: \ org.apache.tamaya.format,\ org.apache.tamaya.format.formats Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi + javax.config,\ + javax.config.spi,\ + org.apache.tamaya.base,\ + org.apache.tamaya.base.configsource,\ + org.osgi.framework,\ + javax.annotation Export-Service: \ org.apache.tamaya.format.ConfigurationFormat http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java ---------------------------------------------------------------------- diff --git a/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java b/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java index 804147e..1995977 100644 --- a/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java +++ b/modules/formats/base/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java @@ -31,7 +31,7 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import javax.config.spi.ConfigSource; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/formats/json/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/formats/json/bnd.bnd b/modules/formats/json/bnd.bnd index 3e0af5f..e463a9c 100644 --- a/modules/formats/json/bnd.bnd +++ b/modules/formats/json/bnd.bnd @@ -22,8 +22,12 @@ Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.json Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ + javax.config,\ + javax.config.spi,\ + org.apache.tamaya.base,\ + org.apache.tamaya.base.configsource,\ + org.osgi.framework,\ + javax.annotation,\ org.apache.tamaya.format Export-Service: \ org.apache.tamaya.format.ConfigurationFormat http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONFormatIT.java ---------------------------------------------------------------------- diff --git a/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONFormatIT.java b/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONFormatIT.java index a13810e..a70f5b8 100644 --- a/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONFormatIT.java +++ b/modules/formats/json/src/test/java/org/apache/tamaya/yaml/JSONFormatIT.java @@ -20,7 +20,7 @@ package org.apache.tamaya.yaml; import org.apache.tamaya.format.ConfigurationFormat; import org.apache.tamaya.json.JSONFormat; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import org.junit.Test; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/formats/yaml/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/formats/yaml/bnd.bnd b/modules/formats/yaml/bnd.bnd index b173e56..80e7112 100644 --- a/modules/formats/yaml/bnd.bnd +++ b/modules/formats/yaml/bnd.bnd @@ -22,8 +22,12 @@ Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.yaml Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ + javax.config,\ + javax.config.spi,\ + org.apache.tamaya.base,\ + org.apache.tamaya.base.configsource,\ + org.osgi.framework,\ + javax.annotation,\ org.apache.tamaya.format Export-Service: \ org.apache.tamaya.format.ConfigurationFormat http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/functions/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/functions/bnd.bnd b/modules/functions/bnd.bnd index 71ff223..6cab0cf 100644 --- a/modules/functions/bnd.bnd +++ b/modules/functions/bnd.bnd @@ -22,5 +22,6 @@ Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.functions Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi \ No newline at end of file + javax.config,\ + javax.config.spi,\ + org.apache.tamaya.base.configsource \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/injection/cdi/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/bnd.bnd b/modules/injection/cdi/bnd.bnd index ec5b895..c3c50e2 100644 --- a/modules/injection/cdi/bnd.bnd +++ b/modules/injection/cdi/bnd.bnd @@ -21,12 +21,17 @@ Bundle-ContactAddress: dev-tam...@incubator.apache.org Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.inject.cdi,\ - org.apache.tamaya.inject.extras + org.apache.tamaya.inject.cdi.extra Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ - org.apache.tamaya.inject.api,\ - org.apache.tamaya.inject.spi + javax.config,\ + javax.config.spi,\ + javax.inject,\ + org.apache.tamaya.base,\ + org.apache.tamaya.base.convert,\ + org.apache.tamaya.inject.api,\ + org.apache.tamaya.inject.spi,\ + org.osgi.framework,\ + javax.annotation, Export-Service: \ org.apache.tamaya.spi.ServiceContext,\ javax.enterprise.inject.spi.Extension http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/CDIAwareServiceContext.java ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/CDIAwareServiceContext.java b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/CDIAwareServiceContext.java index ffb3236..3fe166c 100644 --- a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/CDIAwareServiceContext.java +++ b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/CDIAwareServiceContext.java @@ -18,7 +18,7 @@ */ package org.apache.tamaya.cdi; -import org.apache.tamaya.spi.ServiceContext; +import org.apache.tamaya.base.ServiceContext; import javax.annotation.Priority; import javax.enterprise.inject.Instance; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigProducer.java ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigProducer.java b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigProducer.java index 10e92dc..c0d8f09 100644 --- a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigProducer.java +++ b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigProducer.java @@ -22,8 +22,7 @@ import org.apache.tamaya.functions.Supplier; import org.apache.tamaya.inject.api.ConfigDefaultSections; import org.apache.tamaya.inject.api.DynamicValue; import org.apache.tamaya.inject.api.WithConverter; -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; @@ -39,7 +38,6 @@ import javax.inject.Provider; import java.lang.reflect.*; import java.util.List; import java.util.Optional; -import java.util.logging.Level; import java.util.logging.Logger; /** @@ -109,12 +107,20 @@ public class ConfigProducer { keys, conversionContext.getTargetType(), conversionContext.getSupportedFormats().toString())); } LOGGER.finest(String.format("Injecting %s for key %s in class %s", keyFound, value.toString(), injectionPoint.toString())); - if(TypeLiteral.of(injectionPoint.getAnnotated().getBaseType()).getRawType().equals(Optional.class)){ + if(getRawType(injectionPoint.getAnnotated().getBaseType()).equals(Optional.class)){ return Optional.ofNullable(value); } return value; } + private Type getRawType(Type baseType) { + if(baseType instanceof ParameterizedType){ + ParameterizedType pt = (ParameterizedType)baseType; + return pt.getRawType(); + } + return baseType; + } + // private Class getClass(Type baseType) { // if(baseType instanceof Class){ // return Class.class.cast(baseType); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ServiceLoaderServiceContext.java ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ServiceLoaderServiceContext.java b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ServiceLoaderServiceContext.java index f56c199..781f0a1 100644 --- a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ServiceLoaderServiceContext.java +++ b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ServiceLoaderServiceContext.java @@ -19,7 +19,7 @@ package org.apache.tamaya.cdi; import org.apache.tamaya.base.PriorityServiceComparator; -import org.apache.tamaya.spi.ServiceContext; +import org.apache.tamaya.base.ServiceContext; import javax.annotation.Priority; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/injection/cdi/src/main/resources/META-INF/services/org.apache.tamaya.base.spi.ServiceContext ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/src/main/resources/META-INF/services/org.apache.tamaya.base.spi.ServiceContext b/modules/injection/cdi/src/main/resources/META-INF/services/org.apache.tamaya.base.spi.ServiceContext new file mode 100644 index 0000000..8e56de8 --- /dev/null +++ b/modules/injection/cdi/src/main/resources/META-INF/services/org.apache.tamaya.base.spi.ServiceContext @@ -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.cdi.CDIAwareServiceContext \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/injection/cdi/src/main/resources/META-INF/services/org.apache.tamaya.spi.ServiceContext ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/src/main/resources/META-INF/services/org.apache.tamaya.spi.ServiceContext b/modules/injection/cdi/src/main/resources/META-INF/services/org.apache.tamaya.spi.ServiceContext deleted file mode 100644 index 8e56de8..0000000 --- a/modules/injection/cdi/src/main/resources/META-INF/services/org.apache.tamaya.spi.ServiceContext +++ /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.cdi.CDIAwareServiceContext \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/injection/injection-api/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/injection/injection-api/bnd.bnd b/modules/injection/injection-api/bnd.bnd index aefb755..8f45208 100644 --- a/modules/injection/injection-api/bnd.bnd +++ b/modules/injection/injection-api/bnd.bnd @@ -23,7 +23,6 @@ Export-Package: \ org.apache.tamaya.inject.api,\ org.apache.tamaya.inject.spi Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.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-extensions/blob/91c8e692/modules/injection/standalone/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/injection/standalone/bnd.bnd b/modules/injection/standalone/bnd.bnd index ae2e8cb..7cf3cc6 100644 --- a/modules/injection/standalone/bnd.bnd +++ b/modules/injection/standalone/bnd.bnd @@ -22,9 +22,13 @@ Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.inject Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ - org.apache.tamaya.inject.api,\ - org.apache.tamaya.inject.spi + javax.config,\ + javax.config.spi,\ + org.apache.tamaya.base,\ + org.apache.tamaya.base.convert,\ + org.apache.tamaya.inject.api,\ + org.apache.tamaya.inject.spi,\ + org.osgi.framework,\ + javax.annotation Export-Service: \ org.apache.tamaya.inject.ConfigurationInjector http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java ---------------------------------------------------------------------- diff --git a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java index 79d6218..373d8f4 100644 --- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java +++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java @@ -18,7 +18,7 @@ */ package org.apache.tamaya.inject; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; /** * Singleton accessor class for accessing {@link ConfigurationInjector} instances. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java ---------------------------------------------------------------------- diff --git a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java index d404b3e..38fd193 100644 --- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java +++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java @@ -25,6 +25,7 @@ import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.tamaya.base.ServiceContextManager; import org.apache.tamaya.base.convert.ConversionContext; import org.apache.tamaya.events.ConfigEventManager; import org.apache.tamaya.events.spi.BaseConfigEvent; @@ -32,9 +33,8 @@ import org.apache.tamaya.inject.spi.InjectionEvaluator; import org.apache.tamaya.inject.api.WithConverter; import org.apache.tamaya.inject.spi.ConfiguredType; import org.apache.tamaya.resolver.spi.ExpressionEvaluator; -import org.apache.tamaya.spi.ConfigContext; -import org.apache.tamaya.spi.ConfigContextSupplier; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ConfigContext; +import org.apache.tamaya.base.ConfigContextSupplier; import javax.config.Config; import javax.config.inject.ConfigProperty; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/jndi/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/jndi/bnd.bnd b/modules/jndi/bnd.bnd index 12c280e..ea79f64 100644 --- a/modules/jndi/bnd.bnd +++ b/modules/jndi/bnd.bnd @@ -22,6 +22,7 @@ Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.jndi Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ - org.apache.tamaya.spisupport + javax.config.spi,\ + org.apache.tamaya.base.configsource,\ + org.osgi.framework,\ + javax.annotation \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/jndi/src/main/resources/META-INF/services/javax.config.spi.ConfigSource ---------------------------------------------------------------------- diff --git a/modules/jndi/src/main/resources/META-INF/services/javax.config.spi.ConfigSource b/modules/jndi/src/main/resources/META-INF/services/javax.config.spi.ConfigSource new file mode 100644 index 0000000..1b036f1 --- /dev/null +++ b/modules/jndi/src/main/resources/META-INF/services/javax.config.spi.ConfigSource @@ -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.jndi.JNDIConfigSource \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/jndi/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySource ---------------------------------------------------------------------- diff --git a/modules/jndi/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySource b/modules/jndi/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySource deleted file mode 100644 index 1b036f1..0000000 --- a/modules/jndi/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertySource +++ /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.jndi.JNDIConfigSource \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/mutable-config/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/mutable-config/bnd.bnd b/modules/mutable-config/bnd.bnd index 6c70db1..2f1641c 100644 --- a/modules/mutable-config/bnd.bnd +++ b/modules/mutable-config/bnd.bnd @@ -26,7 +26,10 @@ Export-Package: \ Private-Package: \ org.apache.tamaya.mutableconfig.internal Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi + javax.config,\ + javax.config.spi,\ + org.apache.tamaya.base,\ + org.osgi.framework,\ + javax.annotation Export-Service: \ org.apache.tamaya.mutableconfig.spi.MutableConfigProviderSpi http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java ---------------------------------------------------------------------- diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java index 179ceda..127bd49 100644 --- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java +++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/MutableConfigurationProvider.java @@ -20,7 +20,7 @@ package org.apache.tamaya.mutableconfig; import org.apache.tamaya.mutableconfig.spi.MutableConfigurationProviderSpi; import org.apache.tamaya.mutableconfig.spi.MutableConfigSource; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import javax.config.Config; import javax.config.ConfigProvider; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/osgi/common/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/osgi/common/bnd.bnd b/modules/osgi/common/bnd.bnd index fc550e2..2762266 100644 --- a/modules/osgi/common/bnd.bnd +++ b/modules/osgi/common/bnd.bnd @@ -24,10 +24,11 @@ Export-Package: \ org.apache.tamaya.osgi,\ org.apache.tamaya.osgi.commands Import-Package: \ + javax.config,\ + javax.config.spi,\ + org.osgi.framework,\ + javax.annotation,\ org.osgi.framework,\ org.osgi.service.cm,\ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ - org.apache.tamaya.functions,\ - org.apache.tamaya.base + org.apache.tamaya.functions Export-Service: org.apache.tamaya.osgi.commands.TamayaConfigService http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/osgi/gogo-shell/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/osgi/gogo-shell/bnd.bnd b/modules/osgi/gogo-shell/bnd.bnd index 357ffbf..b5e28eb 100644 --- a/modules/osgi/gogo-shell/bnd.bnd +++ b/modules/osgi/gogo-shell/bnd.bnd @@ -23,12 +23,10 @@ Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.gogo.shell Import-Package: \ - org.osgi.service.cm,\ + javax.config,\ + org.osgi.framework,\ + javax.annotation,\ org.osgi.framework,\ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ - org.apache.tamaya.functions,\ - org.apache.tamaya.base,\ - org.apache.tamaya.osgi,\ + org.osgi.service.cm,\ org.apache.tamaya.osgi.commands,\ org.apache.felix.service.command http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/osgi/injection/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/osgi/injection/bnd.bnd b/modules/osgi/injection/bnd.bnd index cd67c72..7a979bf 100644 --- a/modules/osgi/injection/bnd.bnd +++ b/modules/osgi/injection/bnd.bnd @@ -24,11 +24,13 @@ Import-Package: \ org.osgi.service.cm,\ org.osgi.framework,\ org.osgi.util.tracker,\ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ - org.apache.tamaya.functions,\ + javax.config,\ + javax.config.spi,\ org.apache.tamaya.base,\ - org.apache.tamaya.osgi,\ + org.osgi.framework,\ + javax.annotation,\ + org.osgi.service.cm,\ + org.apache.tamaya.functions,\ org.apache.tamaya.inject.api,\ org.apache.tamaya.inject.spi,\ org.apache.tamaya.inject http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/osgi/karaf-shell/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/osgi/karaf-shell/bnd.bnd b/modules/osgi/karaf-shell/bnd.bnd index a1bf0c7..d2a5bb9 100644 --- a/modules/osgi/karaf-shell/bnd.bnd +++ b/modules/osgi/karaf-shell/bnd.bnd @@ -24,10 +24,11 @@ Export-Package: \ Import-Package: \ org.osgi.service.cm,\ org.osgi.framework,\ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ - org.apache.tamaya.functions,\ + javax.config,\ + javax.config.spi,\ org.apache.tamaya.base,\ + javax.annotation,\ + org.apache.tamaya.functions,\ org.apache.tamaya.osgi,\ org.apache.tamaya.osgi.commands,\ org.apache.felix.service.command,\ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/osgi/updater/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/osgi/updater/bnd.bnd b/modules/osgi/updater/bnd.bnd index 69ae1ea..d750e02 100644 --- a/modules/osgi/updater/bnd.bnd +++ b/modules/osgi/updater/bnd.bnd @@ -24,11 +24,10 @@ Export-Package: \ org.apache.tamaya.osgi.updater Import-Package: \ org.apache.tamaya.osgi,\ + org.apache.tamaya.osgi.commands,\ + org.apache.tamaya.events,\ org.osgi.framework,\ - org.osgi.service.cm,\ - org.apache.tamaya,\ - org.apache.tamaya.spi,\ - org.apache.tamaya.functions,\ - org.apache.tamaya.base,\ - org.apache.tamaya.events + javax.annotation,\ + org.osgi.service.cm + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/resolver/bnd.bnd b/modules/resolver/bnd.bnd index 96eb0f8..70b5a88 100644 --- a/modules/resolver/bnd.bnd +++ b/modules/resolver/bnd.bnd @@ -21,11 +21,15 @@ Bundle-ContactAddress: dev-tam...@incubator.apache.org Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.resolver,\ - org.apache.tamaya.resolver.spi + org.apache.tamaya.resolver.spi Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi + javax.config,\ + javax.config.spi,\ + org.apache.tamaya.base,\ + org.apache.tamaya.base.filter,\ + org.osgi.framework,\ + javax.annotation Export-Service: \ org.apache.tamaya.resolver.spi.ExpressionEvaluator,\ org.apache.tamaya.resolver.spi.ExpressionResolver,\ - org.apache.tamaya.spi.PropertyFilter + org.apache.tamaya.spi.Filter http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/src/main/java/org/apache/tamaya/resolver/Resolver.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/Resolver.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/Resolver.java index 955183a..fde7ff0 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/Resolver.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/Resolver.java @@ -18,10 +18,10 @@ */ package org.apache.tamaya.resolver; +import org.apache.tamaya.base.ServiceContextManager; import org.apache.tamaya.resolver.internal.ResolvableConfig; import org.apache.tamaya.resolver.spi.ExpressionEvaluator; import org.apache.tamaya.resolver.spi.ExpressionResolver; -import org.apache.tamaya.spi.ServiceContextManager; import javax.config.Config; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java index 20e289b..1aca102 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java @@ -20,7 +20,7 @@ package org.apache.tamaya.resolver.internal; import org.apache.tamaya.resolver.spi.ExpressionEvaluator; import org.apache.tamaya.resolver.spi.ExpressionResolver; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import javax.annotation.Priority; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java index 0786a94..300d53b 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java @@ -19,8 +19,8 @@ package org.apache.tamaya.resolver.internal; import org.apache.tamaya.resolver.spi.ExpressionEvaluator; -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 javax.annotation.Priority; import java.util.logging.Logger; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/FileResolver.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/FileResolver.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/FileResolver.java index 6050ac2..24a76f3 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/FileResolver.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/FileResolver.java @@ -20,7 +20,7 @@ package org.apache.tamaya.resolver.internal; import org.apache.tamaya.resolver.spi.ExpressionResolver; import org.apache.tamaya.resource.ResourceResolver; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import javax.annotation.Priority; import java.io.BufferedReader; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResolvableConfig.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResolvableConfig.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResolvableConfig.java index 7dca6d0..8280197 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResolvableConfig.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResolvableConfig.java @@ -22,9 +22,9 @@ import org.apache.tamaya.base.DefaultConfig; import org.apache.tamaya.base.DefaultConfigBuilder; import org.apache.tamaya.base.convert.ConverterManager; import org.apache.tamaya.base.filter.FilterManager; -import org.apache.tamaya.spi.ConfigContext; -import org.apache.tamaya.spi.ConfigContextSupplier; -import org.apache.tamaya.spi.ConfigValue; +import org.apache.tamaya.base.ConfigContext; +import org.apache.tamaya.base.filter.Filter; +import org.apache.tamaya.base.ConfigContextSupplier; import javax.config.Config; import javax.config.spi.ConfigSource; @@ -33,7 +33,7 @@ import java.util.Optional; /** * Wrapper that intercepts evaluation of String configuration extending with value resolution capabilities - * as provided by registered instances of type {@link org.apache.tamaya.spi.Filter}. + * as provided by registered instances of type {@link Filter}. */ public final class ResolvableConfig implements Config{ @@ -54,7 +54,7 @@ public final class ResolvableConfig implements Config{ * <li>If the instance passed is of type {@link ResolvableConfig}, the instance is passed through.</li> * <li>If the instance passed is of type {@link DefaultConfig}, the instance is passed through.</li> * <li>It the instance implements {@link ConfigContextSupplier}, a new {@link DefaultConfig} is - * created and returned, using the returned {@link org.apache.tamaya.spi.ConfigContext}.</li> + * created and returned, using the returned {@link ConfigContext}.</li> * <li>Otherwise a new instance of this class is created, with filtering and conversion added on top, based * on the discoverable filters and converters only.</li> * </ol> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java index 52db593..5110b3b 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java @@ -19,7 +19,7 @@ package org.apache.tamaya.resolver.internal; import org.apache.tamaya.resolver.spi.ExpressionResolver; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import javax.annotation.Priority; import java.io.BufferedReader; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java index bd3aa87..516fc1b 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java @@ -19,10 +19,13 @@ package org.apache.tamaya.resolver.spi; +import org.apache.tamaya.base.filter.Filter; +import org.apache.tamaya.base.ServiceContext; + import java.util.Collection; /** - * Interface that provides an SPI that can be accessed from the current {@link org.apache.tamaya.spi.ServiceContext}, + * Interface that provides an SPI that can be accessed from the current {@link ServiceContext}, * which allows to pass expression that contain placeholders and variable expressions. Expressions passed hereby * use UNIX styled variable syntax as follows: * <pre> @@ -41,7 +44,7 @@ import java.util.Collection; * Also multiple expressions are supported, e.g. ${resource:META-INF/version.conf}, ${file:C:/temp/version.txt}, * ${url:http://configserver/name}. * </pre> - * Basically this service is consumed by an instance of {@link org.apache.tamaya.spi.Filter}, which + * Basically this service is consumed by an instance of {@link Filter}, which * takes the configuration values found and passes them to this evaluator, when expressions are detected. This * also done iteratively, so also multi-stepped references (references, which themselves must be evaluated as well) * are supported. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter b/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.base.filter.Filter new file mode 100644 index 0000000..c8788b5 --- /dev/null +++ b/modules/resolver/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.resolver.internal.ExpressionResolutionFilter \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter b/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.spi.Filter deleted file mode 100644 index c8788b5..0000000 --- a/modules/resolver/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.resolver.internal.ExpressionResolutionFilter \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resources/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/resources/bnd.bnd b/modules/resources/bnd.bnd index c7b6e26..15d1eb5 100644 --- a/modules/resources/bnd.bnd +++ b/modules/resources/bnd.bnd @@ -24,8 +24,12 @@ Export-Package: \ Private-Package: \ org.apache.tamaya.resource.internal Import-Package: \ - org.apache.tamaya,\ - org.apache.tamaya.spi + javax.config,\ + javax.config.spi,\ + org.apache.tamaya.base,\ + org.apache.tamaya.base.configsource,\ + org.osgi.framework,\ + javax.annotation Export-Service: \ org.apache.tamaya.resources.ResourceLocator,\ org.apache.tamaya.resources.ResourceResolver http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathConfigSourceProvider.java ---------------------------------------------------------------------- diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathConfigSourceProvider.java b/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathConfigSourceProvider.java index a536be9..cb73ed7 100644 --- a/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathConfigSourceProvider.java +++ b/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathConfigSourceProvider.java @@ -18,7 +18,7 @@ */ package org.apache.tamaya.resource; -import org.apache.tamaya.spi.ServiceContext; +import org.apache.tamaya.base.ServiceContext; import java.io.InputStream; import java.net.URL; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java ---------------------------------------------------------------------- diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java b/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java index fc40260..0e90afc 100644 --- a/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java +++ b/modules/resources/src/main/java/org/apache/tamaya/resource/ConfigResources.java @@ -18,7 +18,7 @@ */ package org.apache.tamaya.resource; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClassPathResourceLocator.java ---------------------------------------------------------------------- diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClassPathResourceLocator.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClassPathResourceLocator.java index 6c5d8d6..9b5099e 100644 --- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClassPathResourceLocator.java +++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClassPathResourceLocator.java @@ -19,7 +19,7 @@ package org.apache.tamaya.resource.internal; import org.apache.tamaya.resource.ResourceLocator; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import org.osgi.service.component.annotations.Component; import javax.annotation.Priority; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java ---------------------------------------------------------------------- diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java index 99ee5c4..4e520da 100644 --- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java +++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java @@ -18,7 +18,7 @@ */ package org.apache.tamaya.resource.internal; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import java.io.File; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java ---------------------------------------------------------------------- diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java index 6c1b5e6..934dfab 100644 --- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java +++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/DefaultResourceResolver.java @@ -20,7 +20,7 @@ package org.apache.tamaya.resource.internal; import org.apache.tamaya.resource.BaseResourceResolver; import org.apache.tamaya.resource.ResourceLocator; -import org.apache.tamaya.spi.ServiceContextManager; +import org.apache.tamaya.base.ServiceContextManager; import org.osgi.service.component.annotations.Component; import javax.annotation.Priority; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/91c8e692/modules/spring/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/spring/bnd.bnd b/modules/spring/bnd.bnd index e651ff1..2eb451c 100644 --- a/modules/spring/bnd.bnd +++ b/modules/spring/bnd.bnd @@ -22,5 +22,12 @@ Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.integration.spring Import-Package: \ - org.apache.tamaya,\ + javax.config,\ + javax.config.spi,\ + org.springframework,\ + org.springframework.context,\ + org.springframework.stereotype,\ + org.springframework.beans,\ + org.springframework.beans.factory.annotation,\ + org.springframework.core.env,\ org.apache.tamaya.spi
