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:26 UTC
[01/14] incubator-tamaya-extensions git commit: TAMAYA-274: Moved to
Java 8.
Repository: incubator-tamaya-extensions
Updated Branches:
refs/heads/master 2d32caaa7 -> a9552da35
TAMAYA-274: Moved to Java 8.
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/6fdd34c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/6fdd34c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/6fdd34c7
Branch: refs/heads/master
Commit: 6fdd34c759fb9dae915438b9fc9a75f93d131d1e
Parents: 46beb9a
Author: anatole <an...@apache.org>
Authored: Mon Aug 7 17:34:25 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Mon Aug 7 17:34:25 2017 +0200
----------------------------------------------------------------------
.../org/apache/tamaya/events/ConfigEventListener.java | 1 +
.../java/org/apache/tamaya/functions/KeyMapper.java | 2 +-
.../java/org/apache/tamaya/functions/Predicate.java | 13 ++-----------
.../org/apache/tamaya/functions/PropertyMatcher.java | 2 +-
.../java/org/apache/tamaya/functions/Supplier.java | 10 ++--------
.../tamaya/mutableconfig/ChangePropagationPolicy.java | 1 +
.../java/org/apache/tamaya/optional/ValueProvider.java | 1 +
.../org/apache/tamaya/resource/ResourceLocator.java | 1 +
.../spisupport/DefaultConfigurationContextBuilder.java | 3 ++-
pom.xml | 2 +-
10 files changed, 13 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
index 7fb32c8..fd08191 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.events;
/**
* Interface to be implemented for listening on changes on {@link org.apache.tamaya.Configuration} instances.
*/
+@FunctionalInterface
public interface ConfigEventListener {
/**
* Called if an event occurred.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java b/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java
index 2666c1b..bf6e6d3 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java
@@ -23,7 +23,7 @@ package org.apache.tamaya.functions;
* if mapped to null).
*
*/
-//@FunctionalInterface
+@FunctionalInterface
public interface KeyMapper {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java b/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java
index 3061746..5c8869e 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java
@@ -26,17 +26,8 @@ package org.apache.tamaya.functions;
*
* @param <T> the type of the input to the predicate
*/
-//@FunctionalInterface
-public interface Predicate<T> {
-
- /**
- * Evaluates this predicate on the given argument.
- *
- * @param t the input argument
- * @return {@code true} if the input argument matches the predicate,
- * otherwise {@code false}
- */
- boolean test(T t);
+@FunctionalInterface
+public interface Predicate<T> extends java.util.function.Predicate<T>{
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
index 45d44ee..cfb207e 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
@@ -22,7 +22,7 @@ package org.apache.tamaya.functions;
* Represents a selector predicate for selecting configuration properties.
* This can be used as a functional interface in Java 8.
*/
-//@FunctionalInterface
+@FunctionalInterface
public interface PropertyMatcher {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java b/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java
index e32a266..dc9ced7 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java
@@ -29,13 +29,7 @@ package org.apache.tamaya.functions;
*
* @param <T> the type of results supplied by this supplier
*/
-//@FunctionalInterface
-public interface Supplier<T> {
+@FunctionalInterface
+public interface Supplier<T> extends java.util.function.Supplier<T>{
- /**
- * Gets a result.
- *
- * @return a result
- */
- T get();
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java
----------------------------------------------------------------------
diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java
index 44bbbcd..0cfd8b8 100644
--- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java
+++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java
@@ -39,6 +39,7 @@ import java.util.Collection;
* <li><b>NONE: </b>Do not apply any changes.</li>
* </ul>
*/
+@FunctionalInterface
public interface ChangePropagationPolicy {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java
----------------------------------------------------------------------
diff --git a/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java b/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java
index 4ca88b0..1423341 100644
--- a/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java
+++ b/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java
@@ -26,6 +26,7 @@ package org.apache.tamaya.optional;
* code with optional Tamaya configuration support to create a bridge between his code and the values optionally
* returned by Tamaya.
*/
+@FunctionalInterface
public interface ValueProvider {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
index c301eea..d094487 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
@@ -24,6 +24,7 @@ import java.util.Collection;
/**
* Delegate interface for loading URLs from a given data resource locator pattern String.
*/
+@FunctionalInterface
public interface ResourceLocator {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java
----------------------------------------------------------------------
diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java
index d3b6930..023faf3 100644
--- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java
+++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java
@@ -67,7 +67,8 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB
}
/**
- * Creates a new builder instance.
+ * Creates a new builder instance initializing it with the given context.
+ * @param context the context to be used, not null.
*/
public DefaultConfigurationContextBuilder(ConfigurationContext context) {
this.propertyConverters.putAll(context.getPropertyConverters());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b663ae0..c506628 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@ under the License.
<commons-io.version>2.5</commons-io.version>
<findbugs.skip>false</findbugs.skip>
- <jdkVersion>1.7</jdkVersion>
+ <jdkVersion>1.8</jdkVersion>
<osgi.version>4.3.1</osgi.version>
<osgi.compendium.version>${osgi.version}</osgi.compendium.version>
<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
[13/14] incubator-tamaya-extensions git commit: TAMAYA-310: Fixed
events emit for changes.
Posted by an...@apache.org.
TAMAYA-310: Fixed events emit for changes.
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/bcede48d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/bcede48d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/bcede48d
Branch: refs/heads/master
Commit: bcede48d2e8ec5d41172fb9e44e19fb5bae8136f
Parents: 6bd7d1d
Author: anatole <an...@apache.org>
Authored: Sun Sep 24 21:34:40 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Sun Sep 24 21:34:40 2017 +0200
----------------------------------------------------------------------
.../events/ConfigurationChangeBuilder.java | 26 +++++++++-----------
.../internal/DefaultConfigChangeObserver.java | 15 +++++------
2 files changed, 18 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/bcede48d/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
index 651a80d..7379e72 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
@@ -103,12 +103,10 @@ public final class ConfigurationChangeBuilder {
String key = en.getKey();
String previousValue = en.getValue();
String currentValue = current.get(en.getKey());
-
- if (currentValue == null) {
- PropertyChangeEvent event = new PropertyChangeEvent(previous, key, previousValue, null);
- events.put(key, event);
- } else if (!Objects.equals(current, previous)) {
- PropertyChangeEvent event = new PropertyChangeEvent(previous, key, currentValue, previousValue);
+ if(Objects.equals(currentValue, previousValue)){
+ continue;
+ }else {
+ PropertyChangeEvent event = new PropertyChangeEvent(previous, key, previousValue, currentValue);
events.put(key, event);
}
}
@@ -117,16 +115,16 @@ public final class ConfigurationChangeBuilder {
String key = en.getKey();
String previousValue = previous.get(en.getKey());
String currentValue = en.getValue();
-
- if (previousValue == null) {
- PropertyChangeEvent event = new PropertyChangeEvent(current, key, null, currentValue);
- events.put(key, event);
- } else if (!(Objects.equals(previousValue, currentValue) && events.containsKey(key))) {
- PropertyChangeEvent event = new PropertyChangeEvent(current, en.getKey(), previousValue, en.getValue());
- events.put(key, event);
+ if(Objects.equals(currentValue, previousValue)){
+ continue;
+ }else{
+ if (previousValue == null) {
+ PropertyChangeEvent event = new PropertyChangeEvent(current, key, null, currentValue);
+ events.put(key, event);
+ }
+ // the other cases were already covered by the previous loop.
}
}
-
return events.values();
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/bcede48d/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
index 9d4169c..51951de 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
@@ -64,20 +64,17 @@ public class DefaultConfigChangeObserver {
FrozenConfiguration frozenConfig = FrozenConfiguration.of(ConfigurationProvider.getConfiguration());
ConfigurationChange changes;
- if (getLastConfig() == null) {
- changes = ConfigurationChangeBuilder.of().putAll(frozenConfig.getProperties())
- .build();
- } else {
+ if (getLastConfig() != null) {
changes = ConfigurationChangeBuilder.of(getLastConfig()).addChanges(frozenConfig)
.build();
+ if(!changes.isEmpty()) {
+ LOG.info("Identified configuration changes, publishing changes:\n" + changes);
+ ConfigEventManager.fireEvent(changes);
+ }
}
-
setLastConfig(frozenConfig);
- if(!changes.isEmpty()) {
- LOG.info("Identified configuration changes, publishing changes:\n" + changes);
- ConfigEventManager.fireEvent(changes);
- }
+
}
protected FrozenConfiguration getLastConfig() {
[03/14] incubator-tamaya-extensions git commit: TAMAYA-274: Moved to
Java 8, set version to 0.4-incubating-SNAPSHOT
Posted by an...@apache.org.
TAMAYA-274: Moved to Java 8, set version to 0.4-incubating-SNAPSHOT
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/70edbf97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/70edbf97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/70edbf97
Branch: refs/heads/master
Commit: 70edbf9727abc2f9dcd214fd47a3ee3dda33e411
Parents: 5cb0e69
Author: anatole <an...@apache.org>
Authored: Tue Aug 8 21:44:52 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Tue Aug 8 21:44:52 2017 +0200
----------------------------------------------------------------------
distribution/pom.xml | 2 +-
examples/01-resources-example/pom.xml | 4 ++--
examples/02-resolver-example/pom.xml | 2 +-
examples/03-injection-example/pom.xml | 4 ++--
examples/04-events-example/pom.xml | 2 +-
examples/pom.xml | 4 ++--
modules/events/pom.xml | 2 +-
modules/features/pom.xml | 2 +-
modules/filter/pom.xml | 2 +-
modules/formats/base/pom.xml | 2 +-
modules/formats/json/pom.xml | 2 +-
modules/formats/pom.xml | 2 +-
modules/formats/yaml/pom.xml | 2 +-
modules/functions/pom.xml | 2 +-
modules/injection/cdi/pom.xml | 2 +-
modules/injection/injection-api/pom.xml | 2 +-
modules/injection/pom.xml | 2 +-
modules/injection/standalone/pom.xml | 2 +-
modules/jndi/pom.xml | 2 +-
modules/mutable-config/pom.xml | 2 +-
modules/optional/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/resolver/pom.xml | 2 +-
modules/resources/pom.xml | 2 +-
modules/spi-support/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a28bf93..61ecda0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/01-resources-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/01-resources-example/pom.xml b/examples/01-resources-example/pom.xml
index f71d542..e8a269c 100644
--- a/examples/01-resources-example/pom.xml
+++ b/examples/01-resources-example/pom.xml
@@ -25,11 +25,11 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>01-resources-example</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<name>Apache Tamaya Resource Location Example</name>
<description>This project contains a simple example using the resource location module.</description>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/02-resolver-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/02-resolver-example/pom.xml b/examples/02-resolver-example/pom.xml
index b2bb703..fd97227 100644
--- a/examples/02-resolver-example/pom.xml
+++ b/examples/02-resolver-example/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>02-resolver-example</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/03-injection-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/03-injection-example/pom.xml b/examples/03-injection-example/pom.xml
index 0fba95d..d647359 100644
--- a/examples/03-injection-example/pom.xml
+++ b/examples/03-injection-example/pom.xml
@@ -25,11 +25,11 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>03-injection-example</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<name>Apache Tamaya Configuration Injection Example</name>
<description>This project contains a simple illustrating how configuration values can be injected.</description>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/04-events-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/04-events-example/pom.xml b/examples/04-events-example/pom.xml
index 2ad79eb..b6addcc 100644
--- a/examples/04-events-example/pom.xml
+++ b/examples/04-events-example/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>04-events-example</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index c332fbb..7a1c73f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -25,12 +25,12 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<name>Apache Tamaya Extensions Examples</name>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/events/pom.xml
----------------------------------------------------------------------
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index 02a6512..a9fd9ac 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-events</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/features/pom.xml
----------------------------------------------------------------------
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 399dfd1..ca1b8c3 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-features</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/filter/pom.xml
----------------------------------------------------------------------
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index 2c1f588..bc8a4d6 100644
--- a/modules/filter/pom.xml
+++ b/modules/filter/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-filter</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/formats/base/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml
index f2560e6..8e5ff74 100644
--- a/modules/formats/base/pom.xml
+++ b/modules/formats/base/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/formats/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml
index 3c88904..0cacc56 100644
--- a/modules/formats/json/pom.xml
+++ b/modules/formats/json/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/formats/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/pom.xml b/modules/formats/pom.xml
index 472187d..9853c55 100644
--- a/modules/formats/pom.xml
+++ b/modules/formats/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/formats/yaml/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml
index 744116b..431c574 100644
--- a/modules/formats/yaml/pom.xml
+++ b/modules/formats/yaml/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/functions/pom.xml
----------------------------------------------------------------------
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 57952a3..5c90633 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/injection/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/cdi/pom.xml b/modules/injection/cdi/pom.xml
index 0254268..b3ca6d6 100644
--- a/modules/injection/cdi/pom.xml
+++ b/modules/injection/cdi/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/injection/injection-api/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml
index d47a9ba..925db07 100644
--- a/modules/injection/injection-api/pom.xml
+++ b/modules/injection/injection-api/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/injection/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/pom.xml b/modules/injection/pom.xml
index 3b45a85..9cf6c7f 100644
--- a/modules/injection/pom.xml
+++ b/modules/injection/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/injection/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml
index 0433c91..aacc143 100644
--- a/modules/injection/standalone/pom.xml
+++ b/modules/injection/standalone/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/jndi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml
index 433629b..c4e4e0e 100644
--- a/modules/jndi/pom.xml
+++ b/modules/jndi/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-jndi</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/mutable-config/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml
index 19a222a..740420e 100644
--- a/modules/mutable-config/pom.xml
+++ b/modules/mutable-config/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/optional/pom.xml
----------------------------------------------------------------------
diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml
index 54078b8..8d8a163 100644
--- a/modules/optional/pom.xml
+++ b/modules/optional/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index 621ef44..95feb73 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/resolver/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index 313e178..b5e0bc7 100644
--- a/modules/resolver/pom.xml
+++ b/modules/resolver/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/resources/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 619dc5e..514dc90 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/spi-support/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spi-support/pom.xml b/modules/spi-support/pom.xml
index 11ed46b..5e7b083 100644
--- a/modules/spi-support/pom.xml
+++ b/modules/spi-support/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index e7085c8..b3a4e1a 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<artifactId>tamaya-extensions</artifactId>
<groupId>org.apache.tamaya.ext</groupId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-spring</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c506628..529aace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Tamaya Extensions</name>
[02/14] incubator-tamaya-extensions git commit: TAMAYA-274: Moved to
Java 8, fixed Javadoc issues.
Posted by an...@apache.org.
TAMAYA-274: Moved to Java 8, fixed Javadoc issues.
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/5cb0e696
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/5cb0e696
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/5cb0e696
Branch: refs/heads/master
Commit: 5cb0e696ef63607f28600e129c8574293e7e1421
Parents: 6fdd34c
Author: anatole <an...@apache.org>
Authored: Mon Aug 7 17:51:55 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Mon Aug 7 17:51:55 2017 +0200
----------------------------------------------------------------------
.../apache/tamaya/events/FrozenConfiguration.java | 2 +-
.../java/org/apache/tamaya/inject/api/Config.java | 15 ++++-----------
.../apache/tamaya/inject/spi/BaseDynamicValue.java | 2 +-
3 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5cb0e696/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
index 295a609..61e8abe 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
@@ -209,7 +209,7 @@ public final class FrozenConfiguration implements Configuration, Serializable {
*
* <p>The time is taken from {@linkplain System#currentTimeMillis()}</p>
*
- * @see {@linkplain System#currentTimeMillis()}
+ * @see System#currentTimeMillis()
* @return the moment in time when this configruration has been created
*/
public long getFrozenAt() {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5cb0e696/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
----------------------------------------------------------------------
diff --git a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
index 6ce55ed..67a3bfc 100644
--- a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
+++ b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
@@ -34,15 +34,12 @@ import java.lang.annotation.Target;
* <h3>Simplest variant</h3>
* Below the most simple variant of a configured class is given:
* <pre>
- * {@code
* package a.b;
*
* public class ConfiguredItem {
- *
- * @Config
+ * &Config
* private String aValue;
* }
- * }
* </pre>
* Configuration resolution is implemented as follows:
* <ul>
@@ -57,14 +54,12 @@ import java.lang.annotation.Target;
* <h3>Explicit annotations</h3>
* In the next example we explicitly define the configuration keys to be used:
* <pre>
- * {@code
- * @ConfigDefaultSections("section1")
+ * &ConfigDefaultSections("section1")
* public class ConfiguredItem {
*
- * @Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue")
+ * &Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue")
* private String aValue;
* }
- * }
* </pre>
*
* Within this example we evaluate multiple possible keys: {@code section1.b, a.b.deprecated.keys, section1.a}.
@@ -76,15 +71,13 @@ import java.lang.annotation.Target;
* In the last example we explicitly define the configuration keys but omit the section part, letting the default
* section names to be taken:
* <pre>
- * {@code
* package a.b;
*
* public class ConfiguredItem {
*
- * @Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue")
+ * &Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue")
* private String aValue;
* }
- * }
* </pre>
*
* Key resolution is similar to above, but now the default package names are used, resulting in
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5cb0e696/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
----------------------------------------------------------------------
diff --git a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
index f9e2079..a23a85c 100644
--- a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
+++ b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
@@ -28,7 +28,7 @@ import java.io.Serializable;
* code), can apply a new value. Depending on the {@link org.apache.tamaya.inject.api.UpdatePolicy} the new value is applied immedeately, when the
* change has been identified, or it requires an programmatic commit by client code to
* activate the change in the {@link DynamicValue}. Similarly an instance also can ignore all
- * later changes to the value.</p>
+ * later changes to the value.
*
* <h3>Implementation Specification</h3>
* This class is
[14/14] incubator-tamaya-extensions git commit: Merge branch 'java8'
Posted by an...@apache.org.
Merge branch 'java8'
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/a9552da3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/a9552da3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/a9552da3
Branch: refs/heads/master
Commit: a9552da35cfa48ffbb21f77f7a77fa9df7142d98
Parents: 2d32caa bcede48
Author: Anatole Tresch <an...@apache.org>
Authored: Thu Sep 28 22:05:54 2017 +0200
Committer: Anatole Tresch <an...@apache.org>
Committed: Thu Sep 28 22:05:54 2017 +0200
----------------------------------------------------------------------
modules/events/bnd.bnd | 34 ++++++++++-
modules/events/pom.xml | 10 ++--
.../tamaya/events/ConfigEventListener.java | 1 +
.../events/ConfigurationChangeBuilder.java | 26 ++++-----
.../tamaya/events/FrozenConfiguration.java | 2 +-
.../internal/DefaultConfigChangeObserver.java | 15 ++---
.../internal/DefaultConfigEventManagerSpi.java | 2 +
.../events/internal/LoggingConfigListener.java | 2 +
.../tamaya/events/ConfigurationChangeTest.java | 1 +
modules/features/bnd.bnd | 24 +++++++-
modules/features/pom.xml | 4 --
modules/filter/bnd.bnd | 27 ++++++++-
modules/filter/pom.xml | 15 +++--
.../tamaya/filter/ConfigurationFilter.java | 2 +
modules/formats/base/bnd.bnd | 27 ++++++++-
modules/formats/base/pom.xml | 4 --
.../format/formats/IniConfigurationFormat.java | 2 +
.../tamaya/format/formats/PropertiesFormat.java | 2 +
.../format/formats/PropertiesXmlFormat.java | 2 +
modules/formats/json/bnd.bnd | 29 +++++++++-
modules/formats/json/pom.xml | 4 --
modules/formats/yaml/bnd.bnd | 28 +++++++++-
modules/formats/yaml/pom.xml | 1 -
modules/functions/bnd.bnd | 25 ++++++++-
modules/functions/pom.xml | 4 --
.../org/apache/tamaya/functions/KeyMapper.java | 2 +-
.../org/apache/tamaya/functions/Predicate.java | 13 +----
.../tamaya/functions/PropertyMatcher.java | 2 +-
.../org/apache/tamaya/functions/Supplier.java | 10 +---
modules/injection/cdi/bnd.bnd | 33 ++++++++++-
modules/injection/injection-api/bnd.bnd | 26 ++++++++-
modules/injection/injection-api/pom.xml | 1 -
.../org/apache/tamaya/inject/api/Config.java | 15 ++---
.../tamaya/inject/spi/BaseDynamicValue.java | 2 +-
modules/injection/standalone/bnd.bnd | 29 +++++++++-
modules/injection/standalone/pom.xml | 9 +--
.../internal/DefaultConfigurationInjector.java | 2 +
modules/jndi/bnd.bnd | 29 ++++++++--
modules/jndi/pom.xml | 9 +--
.../apache/tamaya/jndi/JNDIPropertySource.java | 2 +
modules/mutable-config/bnd.bnd | 33 ++++++++++-
modules/mutable-config/pom.xml | 9 +--
.../mutableconfig/ChangePropagationPolicy.java | 1 +
.../internal/DefaultMutableConfiguration.java | 2 +
.../DefaultMutableConfigurationSpi.java | 2 +
modules/optional/bnd.bnd | 22 +++++++-
modules/optional/pom.xml | 4 --
.../apache/tamaya/optional/ValueProvider.java | 1 +
modules/resolver/bnd.bnd | 31 +++++++++-
modules/resolver/pom.xml | 4 --
modules/resources/bnd.bnd | 30 +++++++++-
modules/resources/pom.xml | 9 +--
.../apache/tamaya/resource/ResourceLocator.java | 1 +
.../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/spi-support/pom.xml | 4 --
.../DefaultConfigurationContextBuilder.java | 3 +-
.../spisupport/PropertySourceComparator.java | 59 +++++++++++---------
.../tamaya/spisupport/SystemPropertySource.java | 22 ++++----
modules/spring/bnd.bnd | 25 ++++++++-
pom.xml | 9 ++-
65 files changed, 604 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/a9552da3/modules/injection/injection-api/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/a9552da3/pom.xml
----------------------------------------------------------------------
[07/14] incubator-tamaya-extensions git commit: TAMAYA-260: Fixed
classcast exception.
Posted by an...@apache.org.
TAMAYA-260: Fixed classcast exception.
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/089043d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/089043d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/089043d9
Branch: refs/heads/master
Commit: 089043d9ef940635e27c94d1123a0cff533cc1a7
Parents: 72c37c5
Author: anatole <an...@apache.org>
Authored: Mon Aug 14 01:40:33 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Mon Aug 14 01:40:33 2017 +0200
----------------------------------------------------------------------
.../tamaya/spisupport/SystemPropertySource.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/089043d9/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java
index de83a82..bc5f99e 100644
--- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java
+++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java
@@ -133,16 +133,18 @@ public class SystemPropertySource extends BasePropertySource {
final String prefix = this.prefix;
Map<String, PropertyValue> entries = new HashMap<>();
for (Map.Entry<Object,Object> entry : sysProps.entrySet()) {
- if(prefix==null) {
- entries.put((String) entry.getKey(),
- PropertyValue.of((String) entry.getKey(),
- (String) entry.getValue(),
- getName()));
- }else {
- entries.put(prefix + entry.getKey(),
- PropertyValue.of(prefix + entry.getKey(),
- (String) entry.getValue(),
- getName()));
+ if(entry.getKey() instanceof String && entry.getValue() instanceof String) {
+ if (prefix == null) {
+ entries.put((String) entry.getKey(),
+ PropertyValue.of((String) entry.getKey(),
+ (String) entry.getValue(),
+ getName()));
+ } else {
+ entries.put(prefix + entry.getKey(),
+ PropertyValue.of(prefix + entry.getKey(),
+ (String) entry.getValue(),
+ getName()));
+ }
}
}
return entries;
[05/14] incubator-tamaya-extensions git commit: TAMAYA-274:
Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT
Posted by an...@apache.org.
TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT
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/1d1cf72e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/1d1cf72e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/1d1cf72e
Branch: refs/heads/master
Commit: 1d1cf72ef18e95980602807e6d4f1e939c90a7d2
Parents: 0d13b0e
Author: anatole <an...@apache.org>
Authored: Wed Aug 9 00:21:01 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Wed Aug 9 00:21:01 2017 +0200
----------------------------------------------------------------------
modules/events/pom.xml | 4 ----
modules/features/pom.xml | 4 ----
modules/filter/pom.xml | 4 ----
modules/formats/base/pom.xml | 4 ----
modules/formats/json/pom.xml | 4 ----
modules/formats/yaml/pom.xml | 1 -
modules/functions/pom.xml | 4 ----
modules/injection/injection-api/pom.xml | 1 -
modules/injection/standalone/pom.xml | 4 ----
modules/jndi/pom.xml | 4 ----
modules/mutable-config/pom.xml | 4 ----
modules/optional/pom.xml | 4 ----
modules/resolver/pom.xml | 4 ----
modules/resources/pom.xml | 4 ----
modules/spi-support/pom.xml | 4 ----
pom.xml | 9 ++++-----
16 files changed, 4 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/events/pom.xml
----------------------------------------------------------------------
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index a9fd9ac..3ef6ff7 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Event and dynamic Update Extensions</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/features/pom.xml
----------------------------------------------------------------------
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index ca1b8c3..6f15c0f 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Feature Check</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/filter/pom.xml
----------------------------------------------------------------------
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index bc8a4d6..4cf2bd6 100644
--- a/modules/filter/pom.xml
+++ b/modules/filter/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Adaptive Configuration Filtering</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/formats/base/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml
index 8e5ff74..aa2c660 100644
--- a/modules/formats/base/pom.xml
+++ b/modules/formats/base/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Modules Formats Common</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/formats/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml
index 0cacc56..5f807c5 100644
--- a/modules/formats/json/pom.xml
+++ b/modules/formats/json/pom.xml
@@ -34,10 +34,6 @@ under the License.
<packaging>jar</packaging>
<inceptionYear>2015</inceptionYear>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/formats/yaml/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml
index 431c574..d5448f3 100644
--- a/modules/formats/yaml/pom.xml
+++ b/modules/formats/yaml/pom.xml
@@ -35,7 +35,6 @@ under the License.
<inceptionYear>2016</inceptionYear>
<properties>
- <jdkVersion>1.7</jdkVersion>
<snakeyaml.version>1.17</snakeyaml.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/functions/pom.xml
----------------------------------------------------------------------
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 5c90633..957f3a3 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Modules - Common Functional Extensions</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/injection/injection-api/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml
index 925db07..b5fab8d 100644
--- a/modules/injection/injection-api/pom.xml
+++ b/modules/injection/injection-api/pom.xml
@@ -33,7 +33,6 @@ under the License.
<packaging>jar</packaging>
<properties>
- <jdkVersion>1.7</jdkVersion>
<geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version>
<geronimo-jcdi-1.1-spec.version>1.0</geronimo-jcdi-1.1-spec.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/injection/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml
index aacc143..66ad0ac 100644
--- a/modules/injection/standalone/pom.xml
+++ b/modules/injection/standalone/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Modules - Injection Standalone</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/jndi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml
index c4e4e0e..aa115e5 100644
--- a/modules/jndi/pom.xml
+++ b/modules/jndi/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya JNDI Support</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/mutable-config/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml
index 740420e..55dd945 100644
--- a/modules/mutable-config/pom.xml
+++ b/modules/mutable-config/pom.xml
@@ -32,10 +32,6 @@ under the License.
and write changes back to some property sources, files etc.</description>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/optional/pom.xml
----------------------------------------------------------------------
diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml
index 8d8a163..244a230 100644
--- a/modules/optional/pom.xml
+++ b/modules/optional/pom.xml
@@ -35,10 +35,6 @@ under the License.
considers/uses Tamaya functionality.</description>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/resolver/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index b5e0bc7..86a1c59 100644
--- a/modules/resolver/pom.xml
+++ b/modules/resolver/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Resolver Services</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/resources/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 514dc90..3506017 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Resource Services</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/spi-support/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spi-support/pom.xml b/modules/spi-support/pom.xml
index 5e7b083..76b21ce 100644
--- a/modules/spi-support/pom.xml
+++ b/modules/spi-support/pom.xml
@@ -34,10 +34,6 @@ under the License.
implementation.</description>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 529aace..1bd0660 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,11 +53,10 @@ under the License.
<commons-io.version>2.5</commons-io.version>
<findbugs.skip>false</findbugs.skip>
- <jdkVersion>1.8</jdkVersion>
<osgi.version>4.3.1</osgi.version>
<osgi.compendium.version>${osgi.version}</osgi.compendium.version>
- <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
- <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
+ <maven.compile.targetLevel>1.8</maven.compile.targetLevel>
+ <maven.compile.sourceLevel>1.8</maven.compile.sourceLevel>
<maven.compile.optimize>false</maven.compile.optimize>
<maven.compile.deprecation>true</maven.compile.deprecation>
<maven.javadoc.skip>false</maven.javadoc.skip>
@@ -787,8 +786,8 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${maven.compile.sourceLevel}</source>
+ <target>${maven.compile.targetLevel}</target>
</configuration>
</plugin>
<plugin>
[08/14] incubator-tamaya-extensions git commit: TAMAYA-274: Improved
BND configs for better OSGI support, added OSGI annotations.
Posted by an...@apache.org.
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
[06/14] incubator-tamaya-extensions git commit: TAMAYA-260: Added
support for config_ordinal as alternative ordinal key.
Posted by an...@apache.org.
TAMAYA-260: Added support for config_ordinal as alternative ordinal key.
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/72c37c5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/72c37c5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/72c37c5c
Branch: refs/heads/master
Commit: 72c37c5c1e5d3504c87e796b9af923ae476d4436
Parents: 1d1cf72
Author: anatole <an...@apache.org>
Authored: Wed Aug 9 00:21:48 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Wed Aug 9 00:21:48 2017 +0200
----------------------------------------------------------------------
.../spisupport/PropertySourceComparator.java | 59 +++++++++++---------
1 file changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/72c37c5c/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java
----------------------------------------------------------------------
diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java
index f4c37ac..6799e4e 100644
--- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java
+++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java
@@ -39,6 +39,8 @@ public class PropertySourceComparator implements Comparator<PropertySource>, Ser
private static final PropertySourceComparator INSTANCE = new PropertySourceComparator();
+ private String alternativeOrdinalKey;
+
private PropertySourceComparator(){}
/**
@@ -58,9 +60,9 @@ public class PropertySourceComparator implements Comparator<PropertySource>, Ser
* @return the comparison result.
*/
private int comparePropertySources(PropertySource source1, PropertySource source2) {
- if (getOrdinal(source1) < getOrdinal(source2)) {
+ if (getOrdinal(source1, alternativeOrdinalKey) < getOrdinal(source2, alternativeOrdinalKey)) {
return -1;
- } else if (getOrdinal(source1) > getOrdinal(source2)) {
+ } else if (getOrdinal(source1, alternativeOrdinalKey) > getOrdinal(source2, alternativeOrdinalKey)) {
return 1;
} else {
return source1.getClass().getName().compareTo(source2.getClass().getName());
@@ -68,35 +70,38 @@ public class PropertySourceComparator implements Comparator<PropertySource>, Ser
}
public static int getOrdinal(PropertySource propertySource) {
-// PropertyValue ordinalValue = propertySource.get(PropertySource.TAMAYA_ORDINAL);
-// if(ordinalValue!=null){
-// try{
-// return Integer.parseInt(ordinalValue.getProperty().trim());
-// }catch(Exception e){
-// LOG.finest("Failed to parse ordinal from " + PropertySource.TAMAYA_ORDINAL +
-// " in " + propertySource.getName()+": "+ordinalValue.getProperty());
-// }
-// }
-// try {
-// Method method = propertySource.getClass().getMethod("getOrdinal");
-// if(int.class.equals(method.getReturnType())){
-// try {
-// return (int)method.invoke(propertySource);
-// } catch (Exception e) {
-// LOG.log(Level.FINEST, "Error calling int getOrdinal() on " + propertySource.getName(), e);
-// }
-// }
-// } catch (NoSuchMethodException e) {
-// LOG.finest("No int getOrdinal() method found in " + propertySource.getName());
-// }
-// Priority prio = propertySource.getClass().getAnnotation(Priority.class);
-// if(prio!=null){
-// return prio.value();
-// }
+ return getOrdinal(propertySource, null);
+ }
+
+ public static int getOrdinal(PropertySource propertySource, String alternativeOrdinalKey) {
+ if(alternativeOrdinalKey!=null) {
+ PropertyValue ordinalValue = propertySource.get(alternativeOrdinalKey);
+ if (ordinalValue != null) {
+ try {
+ return Integer.parseInt(ordinalValue.getValue().trim());
+ } catch (Exception e) {
+ LOG.finest("Failed to parse ordinal from " + alternativeOrdinalKey +
+ " in " + propertySource.getName() + ": " + ordinalValue.getValue());
+ }
+ }
+ }
return propertySource.getOrdinal();
}
+
+ /**
+ * Overrides/adds the key to evaluate/override a property sources ordinal.
+ * @param ordinalKey sets the alternative ordinal key, if null default
+ * behaviour will be active.
+ * @return the instance for chaining.
+ */
+ public PropertySourceComparator setOrdinalKey(String ordinalKey) {
+ this.alternativeOrdinalKey = ordinalKey;
+ return this;
+ }
+
@Override
public int compare(PropertySource source1, PropertySource source2) {
return comparePropertySources(source1, source2);
}
+
}
[04/14] incubator-tamaya-extensions git commit: Added latency for
change test (sometimes failing).
Posted by an...@apache.org.
Added latency for change test (sometimes failing).
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/0d13b0ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/0d13b0ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/0d13b0ec
Branch: refs/heads/master
Commit: 0d13b0ec09527c0a5ffdc0580f11350b01ba6064
Parents: 70edbf9
Author: anatole <an...@apache.org>
Authored: Tue Aug 8 21:46:22 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Tue Aug 8 21:46:22 2017 +0200
----------------------------------------------------------------------
.../test/java/org/apache/tamaya/events/ConfigurationChangeTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0d13b0ec/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
index 4cedeab..60f40c2 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
@@ -69,6 +69,7 @@ public class ConfigurationChangeTest {
@Test
public void testGetTimestamp() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
+ Thread.sleep(10L);
ConfigurationChange change = ConfigurationChangeBuilder.of(config).build();
assertTrue((System.currentTimeMillis() - change.getTimestamp()) > 0L);
change = ConfigurationChangeBuilder.of(config).setTimestamp(10L).build();
[11/14] incubator-tamaya-extensions git commit: TAMAYA-297: Added
missing spisupport import package.
Posted by an...@apache.org.
TAMAYA-297: Added missing spisupport import package.
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/4733cfab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/4733cfab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/4733cfab
Branch: refs/heads/master
Commit: 4733cfabcc5b0c21f5f5696603e9572257d25942
Parents: d447fae
Author: anatole <an...@apache.org>
Authored: Fri Sep 22 22:11:55 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Fri Sep 22 22:11:55 2017 +0200
----------------------------------------------------------------------
modules/jndi/bnd.bnd | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4733cfab/modules/jndi/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/jndi/bnd.bnd b/modules/jndi/bnd.bnd
index a54a517..12c280e 100644
--- a/modules/jndi/bnd.bnd
+++ b/modules/jndi/bnd.bnd
@@ -23,4 +23,5 @@ Export-Package: \
org.apache.tamaya.jndi
Import-Package: \
org.apache.tamaya,\
- org.apache.tamaya.spi
+ org.apache.tamaya.spi,\
+ org.apache.tamaya.spisupport
[12/14] incubator-tamaya-extensions git commit: TAMAYA-297: Fixes on
OSGI commands, added propagation flag.
Posted by an...@apache.org.
TAMAYA-297: Fixes on OSGI commands, added propagation flag.
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/6bd7d1d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/6bd7d1d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/6bd7d1d8
Branch: refs/heads/master
Commit: 6bd7d1d87737a809eacfde3d69ea5a8ebbcfb020
Parents: 4733cfa
Author: anatole <an...@apache.org>
Authored: Fri Sep 22 23:44:36 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Fri Sep 22 23:44:36 2017 +0200
----------------------------------------------------------------------
modules/formats/json/bnd.bnd | 3 ++-
.../json/src/main/java/org/apache/tamaya/json/JSONFormat.java | 2 --
.../src/main/java/org/apache/tamaya/json/JSONPropertySource.java | 2 --
3 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6bd7d1d8/modules/formats/json/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/formats/json/bnd.bnd b/modules/formats/json/bnd.bnd
index 0a13b56..3e0af5f 100644
--- a/modules/formats/json/bnd.bnd
+++ b/modules/formats/json/bnd.bnd
@@ -23,7 +23,8 @@ Export-Package: \
org.apache.tamaya.json
Import-Package: \
org.apache.tamaya,\
- org.apache.tamaya.spi
+ org.apache.tamaya.spi,\
+ org.apache.tamaya.format
Export-Service: \
org.apache.tamaya.format.ConfigurationFormat
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6bd7d1d8/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 665f329..5902cbd 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,7 +21,6 @@ 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;
@@ -42,7 +41,6 @@ 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/6bd7d1d8/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 f9d1d85..5934210 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,7 +21,6 @@ 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;
@@ -44,7 +43,6 @@ 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";
[09/14] incubator-tamaya-extensions git commit: TAMAYA-297: Fixed
invalid symbolic name, changed entry order in pom.
Posted by an...@apache.org.
TAMAYA-297: Fixed invalid symbolic name, changed entry order in pom.
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/182891e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/182891e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/182891e5
Branch: refs/heads/master
Commit: 182891e55ec6d7c6e08dda60eb7b7b1dedd5dadc
Parents: d702e3c
Author: anatole <an...@apache.org>
Authored: Thu Sep 21 18:25:21 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Thu Sep 21 18:25:21 2017 +0200
----------------------------------------------------------------------
modules/spi-support/bnd.bnd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/182891e5/modules/spi-support/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/spi-support/bnd.bnd b/modules/spi-support/bnd.bnd
index 88bec7c..1ce81a3 100644
--- a/modules/spi-support/bnd.bnd
+++ b/modules/spi-support/bnd.bnd
@@ -11,7 +11,7 @@ javac.target: 1.8
Bundle-Version: ${version}.${tstamp}
Bundle-Name: Apache Tamaya - SPI Support
-Bundle-SymbolicName: org.apache.tamaya.resource
+Bundle-SymbolicName: org.apache.tamaya.spisupport
Bundle-Description: Apacha Tamaya Config - SPI Support
Bundle-Category: Implementation
Bundle-Copyright: (C) Apache Foundation
[10/14] incubator-tamaya-extensions git commit: TAMAYA-297: Added
missing import package for format module.
Posted by an...@apache.org.
TAMAYA-297: Added missing import package for format module.
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/d447fae1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/d447fae1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/d447fae1
Branch: refs/heads/master
Commit: d447fae1a2b0e9e83f2200d13449d9335e1c0f46
Parents: 182891e
Author: anatole <an...@apache.org>
Authored: Fri Sep 22 22:10:52 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Fri Sep 22 22:10:52 2017 +0200
----------------------------------------------------------------------
modules/formats/yaml/bnd.bnd | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/d447fae1/modules/formats/yaml/bnd.bnd
----------------------------------------------------------------------
diff --git a/modules/formats/yaml/bnd.bnd b/modules/formats/yaml/bnd.bnd
index 771d652..b173e56 100644
--- a/modules/formats/yaml/bnd.bnd
+++ b/modules/formats/yaml/bnd.bnd
@@ -23,6 +23,7 @@ Export-Package: \
org.apache.tamaya.yaml
Import-Package: \
org.apache.tamaya,\
- org.apache.tamaya.spi
+ org.apache.tamaya.spi,\
+ org.apache.tamaya.format
Export-Service: \
org.apache.tamaya.format.ConfigurationFormat