You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2017/09/28 20:06:33 UTC
[08/14] incubator-tamaya-extensions git commit: TAMAYA-274: Improved
BND configs for better OSGI support, added OSGI annotations.
TAMAYA-274: Improved BND configs for better OSGI support, added OSGI annotations.
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/d702e3ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/d702e3ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/d702e3ce
Branch: refs/heads/master
Commit: d702e3cee64c20cdec681b036cac21832714344f
Parents: 089043d
Author: anatole <an...@apache.org>
Authored: Sun Sep 3 22:50:18 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Sun Sep 3 22:50:18 2017 +0200
----------------------------------------------------------------------
modules/events/bnd.bnd | 34 +++++++++++++++++++-
modules/events/pom.xml | 6 ++++
.../internal/DefaultConfigEventManagerSpi.java | 2 ++
.../events/internal/LoggingConfigListener.java | 2 ++
modules/features/bnd.bnd | 24 ++++++++++++--
modules/filter/bnd.bnd | 27 +++++++++++++++-
modules/filter/pom.xml | 11 +++++++
.../tamaya/filter/ConfigurationFilter.java | 2 ++
modules/formats/base/bnd.bnd | 27 +++++++++++++++-
.../format/formats/IniConfigurationFormat.java | 2 ++
.../tamaya/format/formats/PropertiesFormat.java | 2 ++
.../format/formats/PropertiesXmlFormat.java | 2 ++
modules/formats/json/bnd.bnd | 28 +++++++++++++++-
.../java/org/apache/tamaya/json/JSONFormat.java | 2 ++
.../apache/tamaya/json/JSONPropertySource.java | 2 ++
modules/formats/yaml/bnd.bnd | 27 +++++++++++++++-
modules/functions/bnd.bnd | 25 +++++++++++++-
modules/injection/cdi/bnd.bnd | 33 +++++++++++++++++--
modules/injection/injection-api/bnd.bnd | 26 +++++++++++++--
modules/injection/standalone/bnd.bnd | 29 ++++++++++++++++-
modules/injection/standalone/pom.xml | 5 +++
.../internal/DefaultConfigurationInjector.java | 2 ++
modules/jndi/bnd.bnd | 28 +++++++++++++---
modules/jndi/pom.xml | 5 +++
.../apache/tamaya/jndi/JNDIPropertySource.java | 2 ++
modules/mutable-config/bnd.bnd | 33 +++++++++++++++++--
modules/mutable-config/pom.xml | 5 +++
.../internal/DefaultMutableConfiguration.java | 2 ++
.../DefaultMutableConfigurationSpi.java | 2 ++
modules/optional/bnd.bnd | 22 ++++++++++++-
modules/resolver/bnd.bnd | 31 ++++++++++++++++--
modules/resources/bnd.bnd | 30 ++++++++++++++++-
modules/resources/pom.xml | 5 +++
.../internal/ClassPathResourceLocator.java | 2 ++
.../internal/DefaultResourceResolver.java | 2 ++
.../resource/internal/FileResourceLocator.java | 2 ++
.../resource/internal/PathResourceLocator.java | 2 ++
.../resource/internal/URLResourceLocator.java | 2 ++
modules/spi-support/bnd.bnd | 25 +++++++++++++-
modules/spring/bnd.bnd | 25 +++++++++++++-
40 files changed, 520 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/events/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/events/bnd.bnd b/modules/events/bnd.bnd
index 21036e3..1b9859a 100644
--- a/modules/events/bnd.bnd
+++ b/modules/events/bnd.bnd
@@ -1,4 +1,36 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Events
+Bundle-SymbolicName: org.apache.tamaya.events
+Bundle-Description: Apacha Tamaya Config - Events
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.events,\
org.apache.tamaya.events.spi
-Bundle-SymbolicName: org.apache.tamaya.events
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi,\
+ org.osgi.framework,\
+ javax.annotation
+Private-Package: \
+ org.apache.tamaya.events.internal
+Export-Service: \
+ org.apache.tamaya.events.spi.ConfigEventManagerSpi
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/events/pom.xml
----------------------------------------------------------------------
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index 3ef6ff7..dd8bb41 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -78,6 +78,12 @@ under the License.
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/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 c92b7e8..cc26d47 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
@@ -22,6 +22,7 @@ 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.osgi.service.component.annotations.Component;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -34,6 +35,7 @@ import java.util.logging.Logger;
* Default implementation of {@link DefaultConfigEventManagerSpi} just forwarding all
* events synchronously to the listeners.
*/
+@Component
public class DefaultConfigEventManagerSpi implements ConfigEventManagerSpi {
private static final Logger LOG = Logger.getLogger(DefaultConfigEventManagerSpi.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/events/src/main/java/org/apache/tamaya/events/internal/LoggingConfigListener.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/internal/LoggingConfigListener.java b/modules/events/src/main/java/org/apache/tamaya/events/internal/LoggingConfigListener.java
index be8c404..6483154 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/internal/LoggingConfigListener.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/internal/LoggingConfigListener.java
@@ -21,12 +21,14 @@ package org.apache.tamaya.events.internal;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.events.ConfigEvent;
import org.apache.tamaya.events.ConfigEventListener;
+import org.osgi.service.component.annotations.Component;
import java.util.logging.Logger;
/**
* Simple ConfigListener that simply logs any detected config changes to INFO level.
*/
+@Component
public class LoggingConfigListener implements ConfigEventListener {
private static final Logger LOG = Logger.getLogger(LoggingConfigListener.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/features/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/features/bnd.bnd b/modules/features/bnd.bnd
index 708dedd..78bbccd 100644
--- a/modules/features/bnd.bnd
+++ b/modules/features/bnd.bnd
@@ -1,3 +1,23 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Features
+Bundle-SymbolicName: org.apache.tamaya.features
+Bundle-Description: Apacha Tamaya Confi - Features
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
- org.apache.tamaya.features
-Bundle-SymbolicName: org.apache.tamaya.features
\ No newline at end of file
+ org.apache.tamaya.features
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/filter/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/filter/bnd.bnd b/modules/filter/bnd.bnd
index b0a3aa3..006f58e 100644
--- a/modules/filter/bnd.bnd
+++ b/modules/filter/bnd.bnd
@@ -1,3 +1,28 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Filter
+Bundle-SymbolicName: org.apache.tamaya.filter
+Bundle-Description: Apacha Tamaya Config - Filtered Config Access
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.filter
-Bundle-SymbolicName: org.apache.tamaya.filter
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
+Export-Service: \
+ org.apache.tamaya.spi.PropertyFilter
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/filter/pom.xml
----------------------------------------------------------------------
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index 4cf2bd6..a677c59 100644
--- a/modules/filter/pom.xml
+++ b/modules/filter/pom.xml
@@ -59,6 +59,17 @@ under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/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 394fda8..7f81dcb 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
@@ -20,6 +20,7 @@ package org.apache.tamaya.filter;
import org.apache.tamaya.spi.PropertyFilter;
import org.apache.tamaya.spi.PropertyValue;
+import org.osgi.service.component.annotations.Component;
/**
@@ -38,6 +39,7 @@ import org.apache.tamaya.spi.PropertyValue;
* doing so will create nasty side effects of configuration not being visisble depending on the thread
* active.
*/
+@Component
public final class ConfigurationFilter implements PropertyFilter{
static final ThreadLocal<Boolean> THREADED_METADATA_FILTERED = new ThreadLocal<Boolean>(){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/formats/base/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/formats/base/bnd.bnd b/modules/formats/base/bnd.bnd
index 610181a..cbca609 100644
--- a/modules/formats/base/bnd.bnd
+++ b/modules/formats/base/bnd.bnd
@@ -1,4 +1,29 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Formats
+Bundle-SymbolicName: org.apache.tamaya.formats
+Bundle-Description: Apacha Tamaya Config - Format Support
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.format,\
org.apache.tamaya.format.formats
-Bundle-SymbolicName: org.apache.tamaya.formats
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
+Export-Service: \
+ org.apache.tamaya.format.ConfigurationFormat
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/IniConfigurationFormat.java
----------------------------------------------------------------------
diff --git a/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/IniConfigurationFormat.java b/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/IniConfigurationFormat.java
index af2cd94..51862aa 100644
--- a/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/IniConfigurationFormat.java
+++ b/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/IniConfigurationFormat.java
@@ -22,6 +22,7 @@ import org.apache.tamaya.ConfigException;
import org.apache.tamaya.format.ConfigurationData;
import org.apache.tamaya.format.ConfigurationDataBuilder;
import org.apache.tamaya.format.ConfigurationFormat;
+import org.osgi.service.component.annotations.Component;
import java.io.BufferedReader;
import java.io.IOException;
@@ -33,6 +34,7 @@ import java.util.logging.Logger;
/**
* Implements a ini file format.
*/
+@Component
public class IniConfigurationFormat implements ConfigurationFormat {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesFormat.java
----------------------------------------------------------------------
diff --git a/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesFormat.java b/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesFormat.java
index 42388c3..df34d5d 100644
--- a/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesFormat.java
+++ b/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesFormat.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.format.formats;
import org.apache.tamaya.format.ConfigurationData;
import org.apache.tamaya.format.ConfigurationDataBuilder;
import org.apache.tamaya.format.ConfigurationFormat;
+import org.osgi.service.component.annotations.Component;
import java.io.IOException;
import java.io.InputStream;
@@ -34,6 +35,7 @@ import java.util.logging.Logger;
*
* @see java.util.Properties#load(java.io.InputStream)
*/
+@Component
public class PropertiesFormat implements ConfigurationFormat {
/**
* The logger.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesXmlFormat.java
----------------------------------------------------------------------
diff --git a/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesXmlFormat.java b/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesXmlFormat.java
index 61b45f1..32c6a34 100644
--- a/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesXmlFormat.java
+++ b/modules/formats/base/src/main/java/org/apache/tamaya/format/formats/PropertiesXmlFormat.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.format.formats;
import org.apache.tamaya.format.ConfigurationData;
import org.apache.tamaya.format.ConfigurationDataBuilder;
import org.apache.tamaya.format.ConfigurationFormat;
+import org.osgi.service.component.annotations.Component;
import java.io.IOException;
import java.io.InputStream;
@@ -35,6 +36,7 @@ import java.util.logging.Logger;
*
* @see java.util.Properties#loadFromXML(java.io.InputStream)
*/
+@Component
public class PropertiesXmlFormat implements ConfigurationFormat {
/**
* The logger.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/formats/json/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/formats/json/bnd.bnd b/modules/formats/json/bnd.bnd
index c4251d1..0a13b56 100644
--- a/modules/formats/json/bnd.bnd
+++ b/modules/formats/json/bnd.bnd
@@ -1,3 +1,29 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Formats JSON
+Bundle-SymbolicName: org.apache.tamaya.formats.json
+Bundle-Description: Apacha Tamaya Config - JSON Format
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.json
-Bundle-SymbolicName: org.apache.tamaya.formats.json
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
+Export-Service: \
+ org.apache.tamaya.format.ConfigurationFormat
+
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java
----------------------------------------------------------------------
diff --git a/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java b/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java
index 5902cbd..665f329 100644
--- a/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java
+++ b/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONFormat.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.json;
import org.apache.tamaya.format.ConfigurationData;
import org.apache.tamaya.format.ConfigurationDataBuilder;
import org.apache.tamaya.format.ConfigurationFormat;
+import org.osgi.service.component.annotations.Component;
import java.io.IOException;
import java.io.InputStream;
@@ -41,6 +42,7 @@ import javax.json.JsonReaderFactory;
*
* @see <a href="http://www.json.org">JSON format specification</a>
*/
+@Component
public class JSONFormat implements ConfigurationFormat {
/** Property that make Johnzon accept commentc. */
public static final String JOHNZON_SUPPORTS_COMMENTS_PROP = "org.apache.johnzon.supports-comments";
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java b/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java
index 5934210..f9d1d85 100644
--- a/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java
+++ b/modules/formats/json/src/main/java/org/apache/tamaya/json/JSONPropertySource.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.json;
import org.apache.tamaya.ConfigException;
import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertyValue;
+import org.osgi.service.component.annotations.Component;
import java.io.IOException;
import java.io.InputStream;
@@ -43,6 +44,7 @@ import static java.lang.String.format;
/**
* Property source based on a JSON file.
*/
+@Component
public class JSONPropertySource implements PropertySource {
/** Constant for enabling comments in Johnzon. */
public static final String JOHNZON_SUPPORTS_COMMENTS_PROP = "org.apache.johnzon.supports-comments";
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/formats/yaml/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/formats/yaml/bnd.bnd b/modules/formats/yaml/bnd.bnd
index 01ab527..771d652 100644
--- a/modules/formats/yaml/bnd.bnd
+++ b/modules/formats/yaml/bnd.bnd
@@ -1,3 +1,28 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Formats YAML
+Bundle-SymbolicName: org.apache.tamaya.formats.yaml
+Bundle-Description: Apacha Tamaya Config - YAML Format
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.yaml
-Bundle-SymbolicName: org.apache.tamaya.formats.yaml
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
+Export-Service: \
+ org.apache.tamaya.format.ConfigurationFormat
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/functions/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/functions/bnd.bnd b/modules/functions/bnd.bnd
index b12cfd4..71ff223 100644
--- a/modules/functions/bnd.bnd
+++ b/modules/functions/bnd.bnd
@@ -1,3 +1,26 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Functions
+Bundle-SymbolicName: org.apache.tamaya.functions
+Bundle-Description: Apacha Tamaya Config - Functional Extensions
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.functions
-Bundle-SymbolicName: org.apache.tamaya.functions
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/injection/cdi/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/injection/cdi/bnd.bnd b/modules/injection/cdi/bnd.bnd
index 08b9719..ec5b895 100644
--- a/modules/injection/cdi/bnd.bnd
+++ b/modules/injection/cdi/bnd.bnd
@@ -1,3 +1,32 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Injection CDI
+Bundle-SymbolicName: org.apache.tamaya.cdi
+Bundle-Description: Apacha Tamaya Config - Injection CDI
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
- org.apache.tamaya.cdi
-Bundle-SymbolicName: org.apache.tamaya.cdi
\ No newline at end of file
+ org.apache.tamaya.inject.cdi,\
+ org.apache.tamaya.inject.extras
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi,\
+ org.apache.tamaya.inject.api,\
+ org.apache.tamaya.inject.spi
+Export-Service: \
+ org.apache.tamaya.spi.ServiceContext,\
+ javax.enterprise.inject.spi.Extension
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/injection/injection-api/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/injection/injection-api/bnd.bnd b/modules/injection/injection-api/bnd.bnd
index f34b1f9..aefb755 100644
--- a/modules/injection/injection-api/bnd.bnd
+++ b/modules/injection/injection-api/bnd.bnd
@@ -1,7 +1,29 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Injection API
+Bundle-SymbolicName: org.apache.tamaya.inject.api
+Bundle-Description: Apacha Tamaya Config - Injection API
+Bundle-Category: API
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
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.inject.api,\
org.apache.tamaya.spi
-Bundle-SymbolicName: org.apache.tamaya.inject.api
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/injection/standalone/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/injection/standalone/bnd.bnd b/modules/injection/standalone/bnd.bnd
index 24ac914..ae2e8cb 100644
--- a/modules/injection/standalone/bnd.bnd
+++ b/modules/injection/standalone/bnd.bnd
@@ -1,3 +1,30 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Injection SE
+Bundle-SymbolicName: org.apache.tamaya.inject-se
+Bundle-Description: Apacha Tamaya Config - Injection SE
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.inject
-Bundle-SymbolicName: org.apache.tamaya.inject-se
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi,\
+ org.apache.tamaya.inject.api,\
+ org.apache.tamaya.inject.spi
+Export-Service: \
+ org.apache.tamaya.inject.ConfigurationInjector
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/injection/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml
index 66ad0ac..e3f646e 100644
--- a/modules/injection/standalone/pom.xml
+++ b/modules/injection/standalone/pom.xml
@@ -69,6 +69,11 @@ under the License.
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
----------------------------------------------------------------------
diff --git a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
index ff9448b..8ad6b7c 100644
--- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
+++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
@@ -36,11 +36,13 @@ import org.apache.tamaya.inject.api.NoConfig;
import org.apache.tamaya.inject.api.Config;
import org.apache.tamaya.inject.api.ConfigDefaultSections;
import org.apache.tamaya.inject.spi.ConfiguredType;
+import org.osgi.service.component.annotations.Component;
/**
* Simple injector singleton that also registers instances configured using weak references.
*/
@Priority(0)
+@Component
public final class DefaultConfigurationInjector implements ConfigurationInjector {
private final Map<Class<?>, ConfiguredType> configuredTypes = new ConcurrentHashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/jndi/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/jndi/bnd.bnd b/modules/jndi/bnd.bnd
index 36f5ce3..a54a517 100644
--- a/modules/jndi/bnd.bnd
+++ b/modules/jndi/bnd.bnd
@@ -1,6 +1,26 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - JNDI-Config
+Bundle-SymbolicName: org.apache.tamaya.jndi
+Bundle-Description: Apacha Tamaya Config - JNDI Property Source
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.jndi
-Bundle-SymbolicName: org.apache.tamaya.jndi
-Import-Package: org.apache.tamaya,\
- org.apache.tamaya.inject.api,\
- org.apache.tamaya.spi
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/jndi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml
index aa115e5..3e6c46a 100644
--- a/modules/jndi/pom.xml
+++ b/modules/jndi/pom.xml
@@ -64,6 +64,11 @@ under the License.
<version>4.6-b01</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java b/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java
index 13eb9b4..b344dc4 100644
--- a/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java
+++ b/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.jndi;
import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertyValue;
import org.apache.tamaya.spisupport.BasePropertySource;
+import org.osgi.service.component.annotations.Component;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -39,6 +40,7 @@ import java.util.logging.Logger;
/**
* Propertysource that accesses JNDI as source for configuration entries.
*/
+@Component
public class JNDIPropertySource extends BasePropertySource {
/** The logger used. */
private static final Logger LOG = Logger.getLogger(JNDIPropertySource.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/mutable-config/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/mutable-config/bnd.bnd b/modules/mutable-config/bnd.bnd
index 20d3f20..6c70db1 100644
--- a/modules/mutable-config/bnd.bnd
+++ b/modules/mutable-config/bnd.bnd
@@ -1,3 +1,32 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Mutable Configuration
+Bundle-SymbolicName: org.apache.tamaya.mutableconfig
+Bundle-Description: Apacha Tamaya Config - Mutable Configuration Support
+Bundle-Category: API
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
- org.apache.tamaya.mutableconfig
-Bundle-SymbolicName: org.apache.tamaya.mutableconfig
\ No newline at end of file
+ org.apache.tamaya.mutableconfig,\
+ org.apache.tamaya.mutableconfig.propertysources,\
+ org.apache.tamaya.mutableconfig.spi
+Private-Package: \
+ org.apache.tamaya.mutableconfig.internal
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
+Export-Service: \
+ org.apache.tamaya.mutableconfig.spi.MutableConfigProviderSpi
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/mutable-config/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml
index 55dd945..ab467cf 100644
--- a/modules/mutable-config/pom.xml
+++ b/modules/mutable-config/pom.xml
@@ -70,6 +70,11 @@ under the License.
<optional>true</optional>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java
index 45fc3dc..0fe3e23 100644
--- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java
+++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java
@@ -28,6 +28,7 @@ import org.apache.tamaya.mutableconfig.ConfigChangeRequest;
import org.apache.tamaya.mutableconfig.spi.MutablePropertySource;
import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.PropertySource;
+import org.osgi.service.component.annotations.Component;
import java.util.ArrayList;
import java.util.Arrays;
@@ -42,6 +43,7 @@ import java.util.logging.Logger;
/**
* Default implementation of a {@link MutableConfiguration}.
*/
+@Component
public class DefaultMutableConfiguration implements MutableConfiguration {
private static final Logger LOG = Logger.getLogger(DefaultMutableConfiguration.class.getName());
private ConfigChangeRequest changeRequest = new ConfigChangeRequest(UUID.randomUUID().toString());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java
----------------------------------------------------------------------
diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java
index a47cd0e..1ab38a8 100644
--- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java
+++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfigurationSpi.java
@@ -22,12 +22,14 @@ import org.apache.tamaya.Configuration;
import org.apache.tamaya.mutableconfig.ChangePropagationPolicy;
import org.apache.tamaya.mutableconfig.MutableConfiguration;
import org.apache.tamaya.mutableconfig.spi.MutableConfigurationProviderSpi;
+import org.osgi.service.component.annotations.Component;
/**
* SPI implementation that creates instances of {@link DefaultMutableConfiguration}, hereby for
* each instance of {@link Configuration} a new instance has to be returned.
*/
+@Component
public class DefaultMutableConfigurationSpi implements MutableConfigurationProviderSpi {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/optional/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/optional/bnd.bnd b/modules/optional/bnd.bnd
index 6926446..2e0feb1 100644
--- a/modules/optional/bnd.bnd
+++ b/modules/optional/bnd.bnd
@@ -1,3 +1,23 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Optional Tamaya
+Bundle-SymbolicName: org.apache.tamaya.optional
+Bundle-Description: Apacha Tamaya Config - Optional Integration API
+Bundle-Category: API
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.optional
-Bundle-SymbolicName: org.apache.tamaya.optional
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/resolver/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/resolver/bnd.bnd b/modules/resolver/bnd.bnd
index 4f3761c..96eb0f8 100644
--- a/modules/resolver/bnd.bnd
+++ b/modules/resolver/bnd.bnd
@@ -1,4 +1,31 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Resolvers
+Bundle-SymbolicName: org.apache.tamaya.resolver
+Bundle-Description: Apacha Tamaya Config - Resolvers
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.resolver,\
- org.apache.tamaya.resolver.spi
-Bundle-SymbolicName: org.apache.tamaya.resolver
\ No newline at end of file
+ org.apache.tamaya.resolver.spi
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
+Export-Service: \
+ org.apache.tamaya.resolver.spi.ExpressionEvaluator,\
+ org.apache.tamaya.resolver.spi.ExpressionResolver,\
+ org.apache.tamaya.spi.PropertyFilter
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/resources/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/resources/bnd.bnd b/modules/resources/bnd.bnd
index bfcdbd1..c7b6e26 100644
--- a/modules/resources/bnd.bnd
+++ b/modules/resources/bnd.bnd
@@ -1,3 +1,31 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Resources
+Bundle-SymbolicName: org.apache.tamaya.resource
+Bundle-Description: Apacha Tamaya Config - Resource Location
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.resource
-Bundle-SymbolicName: org.apache.tamaya.resources
\ No newline at end of file
+Private-Package: \
+ org.apache.tamaya.resource.internal
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
+Export-Service: \
+ org.apache.tamaya.resources.ResourceLocator,\
+ org.apache.tamaya.resources.ResourceResolver
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/resources/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 3506017..8af59bf 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -52,6 +52,11 @@ under the License.
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/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 35aa4d5..6c5d8d6 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
@@ -20,6 +20,7 @@ package org.apache.tamaya.resource.internal;
import org.apache.tamaya.resource.ResourceLocator;
import org.apache.tamaya.spi.ServiceContextManager;
+import org.osgi.service.component.annotations.Component;
import javax.annotation.Priority;
import java.io.IOException;
@@ -35,6 +36,7 @@ import java.util.logging.Logger;
* Created by atsticks on 01.03.16.
*/
@Priority(90)
+@Component
public class ClassPathResourceLocator implements ResourceLocator{
/**
* The logger used.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/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 99e7b3f..6c1b5e6 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
@@ -21,6 +21,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.osgi.service.component.annotations.Component;
import javax.annotation.Priority;
import java.net.URL;
@@ -33,6 +34,7 @@ import java.util.logging.Logger;
* Simple default implementation of the resource loader, which does only support direct references to files.
*/
@Priority(0)
+@Component
public class DefaultResourceResolver extends BaseResourceResolver {
private static final Logger LOG = Logger.getLogger(DefaultResourceResolver.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileResourceLocator.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileResourceLocator.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileResourceLocator.java
index a58b414..8a7de52 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileResourceLocator.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/FileResourceLocator.java
@@ -19,6 +19,7 @@
package org.apache.tamaya.resource.internal;
import org.apache.tamaya.resource.ResourceLocator;
+import org.osgi.service.component.annotations.Component;
import javax.annotation.Priority;
import java.io.File;
@@ -34,6 +35,7 @@ import java.util.logging.Logger;
* {@link ResourceLocator} for locating local files.
*/
@Priority(80)
+@Component
public class FileResourceLocator implements ResourceLocator{
/**
* The logger used.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/resources/src/main/java/org/apache/tamaya/resource/internal/PathResourceLocator.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/PathResourceLocator.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/PathResourceLocator.java
index e649e3b..ec4a926 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/PathResourceLocator.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/PathResourceLocator.java
@@ -19,6 +19,7 @@
package org.apache.tamaya.resource.internal;
import org.apache.tamaya.resource.ResourceLocator;
+import org.osgi.service.component.annotations.Component;
import javax.annotation.Priority;
import java.net.URL;
@@ -30,6 +31,7 @@ import java.util.logging.Logger;
* Created by atsticks on 01.03.16.
*/
@Priority(100)
+@Component
public class PathResourceLocator implements ResourceLocator{
/**
* The logger used.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java
index 53ef00a..13f55de 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/URLResourceLocator.java
@@ -19,6 +19,7 @@
package org.apache.tamaya.resource.internal;
import org.apache.tamaya.resource.ResourceLocator;
+import org.osgi.service.component.annotations.Component;
import javax.annotation.Priority;
import java.io.IOException;
@@ -33,6 +34,7 @@ import java.util.logging.Logger;
* {@link ResourceLocator} for locating URL resources..
*/
@Priority(70)
+@Component
public class URLResourceLocator implements ResourceLocator{
/**
* The logger used.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/spi-support/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/spi-support/bnd.bnd b/modules/spi-support/bnd.bnd
index e0abd3e..88bec7c 100644
--- a/modules/spi-support/bnd.bnd
+++ b/modules/spi-support/bnd.bnd
@@ -1,3 +1,26 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - SPI Support
+Bundle-SymbolicName: org.apache.tamaya.resource
+Bundle-Description: Apacha Tamaya Config - SPI Support
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.spisupport
-Bundle-SymbolicName: org.apache.tamaya.spisupport
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d702e3ce/modules/spring/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/spring/bnd.bnd b/modules/spring/bnd.bnd
index 62e34b1..e651ff1 100644
--- a/modules/spring/bnd.bnd
+++ b/modules/spring/bnd.bnd
@@ -1,3 +1,26 @@
+-buildpath: \
+ osgi.annotation; version=6.0.0,\
+ osgi.core; version=6.0,\
+ osgi.cmpn; version=6.0
+
+-testpath: \
+ ${junit}
+
+javac.source: 1.8
+javac.target: 1.8
+
+Bundle-Version: ${version}.${tstamp}
+Bundle-Name: Apache Tamaya - Spring Integration
+Bundle-SymbolicName: org.apache.tamaya.spring
+Bundle-Description: Apacha Tamaya Config - Spring Support
+Bundle-Category: Implementation
+Bundle-Copyright: (C) Apache Foundation
+Bundle-License: Apache Licence version 2
+Bundle-Vendor: Apache Software Foundation
+Bundle-ContactAddress: dev-tamaya@incubator.apache.org
+Bundle-DocURL: http://tamaya.apache.org
Export-Package: \
org.apache.tamaya.integration.spring
-Bundle-SymbolicName: org.apache.tamaya.spring
\ No newline at end of file
+Import-Package: \
+ org.apache.tamaya,\
+ org.apache.tamaya.spi