TAMAYA-274: Improved BND configs for better OSGI support, added OSGI annotations.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/5925c34d Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/5925c34d Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/5925c34d Branch: refs/heads/master Commit: 5925c34d9d0a17715da81473acbad4e8c66555e1 Parents: b2c69a1 Author: anatole <[email protected]> Authored: Sun Sep 3 22:50:18 2017 +0200 Committer: anatole <[email protected]> Committed: Sun Sep 3 22:50:18 2017 +0200 ---------------------------------------------------------------------- apache-commons/bnd.bnd | 27 +++++++++++++- camel/bnd.bnd | 25 ++++++++++++- configured-sysprops/bnd.bnd | 25 ++++++++++++- consul/bnd.bnd | 28 ++++++++++++++- etcd/bnd.bnd | 28 ++++++++++++++- hazelcast/bnd.bnd | 27 +++++++++++++- jodatime/bnd.bnd | 27 +++++++++++++- management/bnd.bnd | 27 +++++++++++++- metamodel/bnd.bnd | 35 ++++++++++++++++-- .../internal/CombinationPolicyReader.java | 2 ++ .../DSLLoadingConfigurationProviderSpi.java | 2 ++ .../metamodel/internal/MetaContextReader.java | 2 ++ .../internal/PropertyConverterReader.java | 2 ++ .../internal/PropertyFilterOrderingReader.java | 2 ++ .../internal/PropertyFilterReader.java | 2 ++ .../internal/PropertySourceOrderingReader.java | 2 ++ .../internal/PropertySourceReader.java | 2 ++ .../internal/factories/CLIArgumentsFactory.java | 2 ++ .../factories/EnvPropertiesFactory.java | 2 ++ .../factories/FilePropertySourceFactory.java | 2 ++ .../ResourcePropertySourceFactory.java | 2 ++ .../ResourcePropertySourceProviderFactory.java | 2 ++ .../factories/SysPropertiesFactory.java | 2 ++ .../factories/URLPropertySourceFactory.java | 2 ++ .../internal/resolver/JavaResolver.java | 2 ++ .../internal/resolver/PropertiesResolver.java | 2 ++ microprofile/bnd.bnd | 34 ++++++++++++++++++ .../cdi/MicroprofileConfigurationProducer.java | 5 ++- .../imported/CDIPlainInjectionTest.java | 5 ++- osgi/common/bnd.bnd | 27 +++++++++++--- .../src/main/features/features.xml | 12 +++---- pom.xml | 4 +-- propertysources/bnd.bnd | 26 +++++++++++++- remote/bnd.bnd | 25 ++++++++++++- server/bnd.bnd | 27 ++++++++++++-- ui/base/bnd.bnd | 38 +++++++++++++++++--- ui/events/bnd.bnd | 31 +++++++++++++++- ui/mutableconfig/bnd.bnd | 31 +++++++++++++++- uom/bnd.bnd | 29 +++++++++++++-- usagetracker/bnd.bnd | 33 +++++++++++++++-- validation/bnd.bnd | 33 +++++++++++++++-- vertx/bnd.bnd | 26 +++++++++++++- 42 files changed, 625 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/apache-commons/bnd.bnd ---------------------------------------------------------------------- diff --git a/apache-commons/bnd.bnd b/apache-commons/bnd.bnd index bd8886b..e7dfd6d 100644 --- a/apache-commons/bnd.bnd +++ b/apache-commons/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 - Commons Integration +Bundle-SymbolicName: org.apache.tamaya.commons +Bundle-Description: Apacha Tamaya Config - Commons Integration Support +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.commons -Bundle-SymbolicName: org.apache.tamaya.commons \ 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-sandbox/blob/5925c34d/camel/bnd.bnd ---------------------------------------------------------------------- diff --git a/camel/bnd.bnd b/camel/bnd.bnd index 667c00c..a325ff9 100644 --- a/camel/bnd.bnd +++ b/camel/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 - Camel Integration +Bundle-SymbolicName: org.apache.tamaya.camel +Bundle-Description: Apacha Tamaya Config - Camel Integration +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.camel -Bundle-SymbolicName: org.apache.tamaya.camel \ 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-sandbox/blob/5925c34d/configured-sysprops/bnd.bnd ---------------------------------------------------------------------- diff --git a/configured-sysprops/bnd.bnd b/configured-sysprops/bnd.bnd index 2e77ed2..64a2f44 100644 --- a/configured-sysprops/bnd.bnd +++ b/configured-sysprops/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 - System Integration +Bundle-SymbolicName: org.apache.tamaya.sysprops +Bundle-Description: Apacha Tamaya Config - System.getProperties() Wrapper +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.sysprops -Bundle-SymbolicName: org.apache.tamaya.sysprops \ 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-sandbox/blob/5925c34d/consul/bnd.bnd ---------------------------------------------------------------------- diff --git a/consul/bnd.bnd b/consul/bnd.bnd index 356dd76..8c328f7 100644 --- a/consul/bnd.bnd +++ b/consul/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 - Consul +Bundle-SymbolicName: org.apache.tamaya.consul +Bundle-Description: Apacha Tamaya Config - Consul PropertySource +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.consul -Bundle-SymbolicName: org.apache.tamaya.consul \ No newline at end of file +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi +Export-Service: \ + org.apache.tamaya.spi.PropertySource + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/etcd/bnd.bnd ---------------------------------------------------------------------- diff --git a/etcd/bnd.bnd b/etcd/bnd.bnd index 8df8b56..792c69c 100644 --- a/etcd/bnd.bnd +++ b/etcd/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 - Etcd Config +Bundle-SymbolicName: org.apache.tamaya.etcd +Bundle-Description: Apacha Tamaya Config - Etcd PropertySource +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.etcd -Bundle-SymbolicName: org.apache.tamaya.etcd \ No newline at end of file +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi +Export-Service: \ + org.apache.tamaya.spi.PropertySource + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/hazelcast/bnd.bnd ---------------------------------------------------------------------- diff --git a/hazelcast/bnd.bnd b/hazelcast/bnd.bnd index 9cd5ed2..fd83e0f 100644 --- a/hazelcast/bnd.bnd +++ b/hazelcast/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 - Hazelcast Config +Bundle-SymbolicName: org.apache.tamaya.hazelcast +Bundle-Description: Apacha Tamaya Config - Hazelcast PropertySource +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.hazelcast -Bundle-SymbolicName: org.apache.tamaya.hazelcast \ No newline at end of file +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi +Export-Service: \ + org.apache.tamaya.spi.PropertySource http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/jodatime/bnd.bnd ---------------------------------------------------------------------- diff --git a/jodatime/bnd.bnd b/jodatime/bnd.bnd index ff2e3ac..ae3765e 100644 --- a/jodatime/bnd.bnd +++ b/jodatime/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 - Jodatime Converters +Bundle-SymbolicName: org.apache.tamaya.jodatime +Bundle-Description: Apacha Tamaya Config - Jodatime Converters +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.jodatime -Bundle-SymbolicName: org.apache.tamaya.jodatime \ No newline at end of file +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi +Export-Service: \ + org.apache.tamaya.spi.PropertyConverter http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/management/bnd.bnd ---------------------------------------------------------------------- diff --git a/management/bnd.bnd b/management/bnd.bnd index b7fe8b3..48a8961 100644 --- a/management/bnd.bnd +++ b/management/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 - JMX +Bundle-SymbolicName: org.apache.tamaya.management +Bundle-Description: Apacha Tamaya Config - JMX Management Beans +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.management -Bundle-SymbolicName: org.apache.tamaya.management \ No newline at end of file +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi +Export-Service: \ + org.apache.tamaya.management.ManagedConfigMBean http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/bnd.bnd ---------------------------------------------------------------------- diff --git a/metamodel/bnd.bnd b/metamodel/bnd.bnd index 81155c1..b908e00 100644 --- a/metamodel/bnd.bnd +++ b/metamodel/bnd.bnd @@ -1,5 +1,34 @@ +-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 - Metamodel +Bundle-SymbolicName: org.apache.tamaya.metamodel +Bundle-Description: Apacha Tamaya Config - Tamaya Metamodel +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.metamodel,\ - org.apache.tamaya.metamodel.dsl,\ - org.apache.tamaya.metamodel.spi -Bundle-SymbolicName: org.apache.tamaya.metamodel \ No newline at end of file + org.apache.tamaya.metamodel.dsl,\ + org.apache.tamaya.metamodel.spi +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi +Export-Service: \ + org.apache.tamaya.metamodel.spi.ItemFactory,\ + org.apache.tamaya.metamodel.spi.MetaConfigurationReader,\ + org.apache.tamaya.metamodel.spi.SimpleResolver,\ + org.apache.tamaya.spi.ConfigurationProviderSpi + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java index 9e31add..48af79f 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java @@ -24,6 +24,7 @@ import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.PropertyValueCombinationPolicy; +import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -34,6 +35,7 @@ import java.util.logging.Logger; /** * Metaconfiguration reader that reads the configuration combination policy to be used. */ +@Component public class CombinationPolicyReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(CombinationPolicyReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java index b6247c5..5243796 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java @@ -28,6 +28,7 @@ import org.apache.tamaya.spisupport.DefaultConfiguration; import org.apache.tamaya.spisupport.DefaultConfigurationContextBuilder; import org.apache.tamaya.spisupport.PropertyFilterComparator; import org.apache.tamaya.spisupport.PropertySourceComparator; +import org.osgi.service.component.annotations.Component; import javax.annotation.Priority; import java.util.Objects; @@ -37,6 +38,7 @@ import java.util.Objects; * Tamaya configuration context. */ @Priority(10) +@Component public class DSLLoadingConfigurationProviderSpi implements ConfigurationProviderSpi{ private volatile Configuration config; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java index 8ec1c76..59878c5 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java @@ -23,6 +23,7 @@ import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; import org.apache.tamaya.metamodel.spi.SimpleResolver; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.ServiceContextManager; +import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -39,6 +40,7 @@ import java.util.logging.Logger; * Meta-configuration reader that reads the shared context data. */ @Priority(-1) +@Component public class MetaContextReader implements MetaConfigurationReader { private static final Logger LOG = Logger.getLogger(MetaContextReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java index 9490a78..a6223a3 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java @@ -25,6 +25,7 @@ import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.PropertyConverter; +import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -36,6 +37,7 @@ import java.util.logging.Logger; /** * Metaconfiguration reader to read property sources and property source providers. */ +@Component public class PropertyConverterReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(PropertyConverterReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java index 818b785..2b2bcb8 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java @@ -23,6 +23,7 @@ import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; import org.apache.tamaya.spi.ConfigurationContextBuilder; +import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -35,6 +36,7 @@ import java.util.logging.Logger; /** * Metaconfiguration reader that reads the configuration combination policy to be used. */ +@Component @Priority(Integer.MAX_VALUE) public class PropertyFilterOrderingReader implements MetaConfigurationReader{ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java index be6fa2b..5b4f80c 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java @@ -24,6 +24,7 @@ import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.PropertyFilter; +import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -35,6 +36,7 @@ import java.util.logging.Logger; /** * Metaconfiguration reader that reads the configuration filters to be used. */ +@Component public class PropertyFilterReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(PropertyFilterReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java index b811afa..e7cd29c 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java @@ -24,6 +24,7 @@ import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.PropertyValueCombinationPolicy; +import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -36,6 +37,7 @@ import java.util.logging.Logger; /** * Metaconfiguration reader that reads the configuration combination policy to be used. */ +@Component @Priority(Integer.MAX_VALUE) public class PropertySourceOrderingReader implements MetaConfigurationReader{ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java index 0fdac29..1957bf6 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java @@ -32,6 +32,7 @@ import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.PropertyFilter; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spi.PropertySourceProvider; +import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -43,6 +44,7 @@ import java.util.logging.Logger; /** * Metaconfiguration reader to read property sources and property source providers. */ +@Component public class PropertySourceReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(PropertySourceReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java index c5af56c..81b18eb 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/CLIArgumentsFactory.java @@ -22,12 +22,14 @@ import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spisupport.CLIPropertySource; import org.apache.tamaya.spisupport.EnvironmentPropertySource; +import org.osgi.service.component.annotations.Component; import java.util.Map; /** * Factory for configuring CLI argument based property sources. */ +@Component public final class CLIArgumentsFactory implements ItemFactory<PropertySource>{ @Override public String getName() { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java index f6c9909..ab8212f 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/EnvPropertiesFactory.java @@ -22,12 +22,14 @@ package org.apache.tamaya.metamodel.internal.factories; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spisupport.EnvironmentPropertySource; +import org.osgi.service.component.annotations.Component; import java.util.Map; /** * Factory for configuring environment properties based property sources. */ +@Component public final class EnvPropertiesFactory implements ItemFactory<PropertySource>{ @Override public String getName() { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java index 5acfefd..f26b567 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/FilePropertySourceFactory.java @@ -27,6 +27,7 @@ import org.apache.tamaya.resource.ConfigResources; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spisupport.PropertiesResourcePropertySource; import org.apache.tamaya.spisupport.SimplePropertySource; +import org.osgi.service.component.annotations.Component; import java.io.File; import java.net.MalformedURLException; @@ -41,6 +42,7 @@ import java.util.logging.Logger; /** * Factory for configuring file based property sources. */ +@Component public final class FilePropertySourceFactory extends ResourcePropertySourceFactory{ private static final Logger LOG = Logger.getLogger(FilePropertySourceFactory.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java index 0248100..bdbc618 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceFactory.java @@ -25,6 +25,7 @@ import org.apache.tamaya.format.MappedConfigurationDataPropertySource; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spisupport.PropertiesResourcePropertySource; +import org.osgi.service.component.annotations.Component; import java.net.MalformedURLException; import java.net.URL; @@ -35,6 +36,7 @@ import java.util.logging.Logger; /** * Factory for configuring resource based property sources. */ +@Component public class ResourcePropertySourceFactory extends URLPropertySourceFactory{ private static final Logger LOG = Logger.getLogger(ResourcePropertySourceFactory.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceProviderFactory.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceProviderFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceProviderFactory.java index db5c9b9..7b34ea4 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceProviderFactory.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/ResourcePropertySourceProviderFactory.java @@ -26,6 +26,7 @@ import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.resource.ConfigResources; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spi.PropertySourceProvider; +import org.osgi.service.component.annotations.Component; import java.net.URL; import java.util.*; @@ -35,6 +36,7 @@ import java.util.logging.Logger; /** * Factory for configuring resource based property sources. */ +@Component public class ResourcePropertySourceProviderFactory implements ItemFactory<PropertySourceProvider>{ private static final Logger LOG = Logger.getLogger(ResourcePropertySourceProviderFactory.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java index aec4837..ec85ba0 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/SysPropertiesFactory.java @@ -22,12 +22,14 @@ package org.apache.tamaya.metamodel.internal.factories; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spisupport.SystemPropertySource; +import org.osgi.service.component.annotations.Component; import java.util.Map; /** * Factory for configuring system properties based property sources. */ +@Component public final class SysPropertiesFactory implements ItemFactory<PropertySource>{ @Override public String getName() { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java index 7cf6ab6..80e102c 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/factories/URLPropertySourceFactory.java @@ -27,6 +27,7 @@ import org.apache.tamaya.metamodel.internal.ComponentConfigurator; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spisupport.PropertiesResourcePropertySource; +import org.osgi.service.component.annotations.Component; import javax.security.auth.RefreshFailedException; import javax.security.auth.Refreshable; @@ -40,6 +41,7 @@ import java.util.logging.Logger; /** * Factory for configuring resource based property sources. */ +@Component public class URLPropertySourceFactory implements ItemFactory<PropertySource>{ private static final Logger LOG = Logger.getLogger(FilePropertySourceFactory.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java index 2739da9..ed3e7df 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java @@ -21,6 +21,7 @@ package org.apache.tamaya.metamodel.internal.resolver; import bsh.*; import org.apache.tamaya.metamodel.MetaContext; import org.apache.tamaya.metamodel.spi.SimpleResolver; +import org.osgi.service.component.annotations.Component; import java.io.*; import java.util.Map; @@ -37,6 +38,7 @@ import java.util.logging.Logger; * <li>{@code ${java:expression} }, whereas <i>expression</i> evaluates to the required type.</li> * </ul> */ +@Component public final class JavaResolver implements SimpleResolver{ private static final Logger LOG = Logger.getLogger(JavaResolver.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java index 4e70e03..083daae 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/PropertiesResolver.java @@ -20,6 +20,7 @@ package org.apache.tamaya.metamodel.internal.resolver; import org.apache.tamaya.metamodel.MetaContext; import org.apache.tamaya.metamodel.spi.SimpleResolver; +import org.osgi.service.component.annotations.Component; import java.net.URI; @@ -36,6 +37,7 @@ import java.net.URI; * * Hereby the _default_ parameter defines the default value to be applied, if no value was found. */ +@Component public final class PropertiesResolver implements SimpleResolver{ @Override public String getResolverId() { http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/microprofile/bnd.bnd ---------------------------------------------------------------------- diff --git a/microprofile/bnd.bnd b/microprofile/bnd.bnd new file mode 100644 index 0000000..da67308 --- /dev/null +++ b/microprofile/bnd.bnd @@ -0,0 +1,34 @@ +-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 - Microprofile +Bundle-SymbolicName: org.apache.tamaya.microprofile +Bundle-Description: Apacha Tamaya Config - Microprofile Implementation +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org +Export-Package: \ + org.apache.tamaya.microprofile,\ + org.apache.tamaya.microprofile.cdi,\ + org.apache.tamaya.microprofile.converter +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi,\ + org.eclipse.microprofile.config +Export-Service: \ + org.apache.tamaya.spi.PropertyConverter,\ + org.apache.tamaya.spi.ProperySource,\ + org.eclipse.microprofile.config.spi.ConfigProviderResolver,\ + javax.enterprise.inject.spi.Extension http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java ---------------------------------------------------------------------- diff --git a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java index e6c1174..eb1ac61 100644 --- a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java +++ b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java @@ -26,9 +26,12 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.ConfigBuilder; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; +import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.*; import javax.enterprise.inject.spi.InjectionPoint; +import javax.inject.Provider; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Type; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/CDIPlainInjectionTest.java ---------------------------------------------------------------------- diff --git a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/CDIPlainInjectionTest.java b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/CDIPlainInjectionTest.java index 443e8d8..e3b137e 100644 --- a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/CDIPlainInjectionTest.java +++ b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/CDIPlainInjectionTest.java @@ -68,7 +68,7 @@ public class CDIPlainInjectionTest{ @Module @Classes(cdi = true, value = { - SimpleValuesBean.class, /*DynamicValuesBean.class, */ DefaultPropertyBean.class, + SimpleValuesBean.class, DynamicValuesBean.class, DefaultPropertyBean.class, MicroprofileCDIExtension.class, MicroprofileConfigurationProducer.class, ConfiguredType.class, ConfiguredMethod.class, ConfiguredField.class, @@ -102,7 +102,6 @@ public class CDIPlainInjectionTest{ } @Test - @Ignore public void can_inject_dynamic_values_via_CDI_provider() { clear_all_property_values(); @@ -206,7 +205,7 @@ public class CDIPlainInjectionTest{ } -// @Dependent + @Dependent public static class DynamicValuesBean { @Inject http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/osgi/common/bnd.bnd ---------------------------------------------------------------------- diff --git a/osgi/common/bnd.bnd b/osgi/common/bnd.bnd index 12952bb..56e697f 100644 --- a/osgi/common/bnd.bnd +++ b/osgi/common/bnd.bnd @@ -1,13 +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 - OSGI ConfigAdmin +Bundle-SymbolicName: org.apache.tamaya.osgi +Bundle-Description: Apacha Tamaya Configuration - OSGI ConfigAdmin +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org +Bundle-Activator: org.apache.tamaya.osgi.Activator Export-Package: \ org.apache.tamaya.osgi -Bundle-Activator: org.apache.tamaya.osgi.Activator -Export-Service: org.osgi.service.cm.ConfigurationAdmin Import-Package: \ org.osgi.service.cm,\ org.osgi.framework,\ org.apache.tamaya,\ - org.apache.tamaya.core,\ org.apache.tamaya.spi,\ org.apache.tamaya.functions,\ org.apache.tamaya.spisupport -Bundle-SymbolicName: org.apache.tamaya.osgi \ No newline at end of file +Export-Service: org.osgi.service.cm.ConfigurationAdmin http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/osgi/karaf-features/src/main/features/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf-features/src/main/features/features.xml b/osgi/karaf-features/src/main/features/features.xml index 5a36bff..691b93f 100644 --- a/osgi/karaf-features/src/main/features/features.xml +++ b/osgi/karaf-features/src/main/features/features.xml @@ -12,12 +12,12 @@ limitations under the License. --> <features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"; name="org-apache-tamaya"> - <feature name="configadmin" version="${project.version}"> - <bundle>mvn:${project.groupId}/tamaya-osgi/${project.version}/jar</bundle> - <bundle>mvn:${project.groupId}/tamaya-functions/${project.version}/jar</bundle> - <bundle>mvn:${project.groupId}/tamaya-spi-support/${project.version}/jar</bundle> - <bundle>mvn:org.apache.tamaya/tamaya-api/${project.version}/jar</bundle> - <bundle>mvn:org.apache.tamaya/tamaya-core/${project.version}/jar</bundle> + <feature name="configadmin" version="0.3-incubating"> + <bundle>mvn:org.apache.tamaya.ext/tamaya-osgi_alpha/0.4-incubating-SNAPSHOT/jar</bundle> + <bundle>mvn:org.apache.tamaya.ext/tamaya-functions/0.3-incubating/jar</bundle> + <bundle>mvn:org.apache.tamaya.ext/tamaya-spisupport/0.3-incubating/jar</bundle> + <bundle>mvn:org.apache.tamaya/tamaya-api/0.3-incubating/jar</bundle> + <bundle>mvn:org.apache.tamaya/tamaya-core/0.3-incubating/jar</bundle> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.2_spec/1.0-alpha-1/jar</bundle> </feature> </features> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f58043c..ba3f3c7 100644 --- a/pom.xml +++ b/pom.xml @@ -750,10 +750,10 @@ under the License. <module>camel</module> <module>propertysources</module> <!--<module>ui</module>--> - <!--<module>osgi</module>--> + <module>osgi</module> <module>management</module> <module>metamodel</module> - <!--<module>microprofile</module>--> + <module>microprofile</module> <module>uom</module> <module>vertx</module> </modules> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/propertysources/bnd.bnd ---------------------------------------------------------------------- diff --git a/propertysources/bnd.bnd b/propertysources/bnd.bnd index ce86061..dae0996 100644 --- a/propertysources/bnd.bnd +++ b/propertysources/bnd.bnd @@ -1,3 +1,27 @@ +-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 - More PropertySources +Bundle-SymbolicName: org.apache.tamaya.propertysources +Bundle-Description: Apacha Tamaya Configuration - Reusable PropertySources +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.propertysources -Bundle-SymbolicName: org.apache.tamaya.propertysources \ No newline at end of file +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi,\ + org.apache.tamaya.spisupport http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/remote/bnd.bnd ---------------------------------------------------------------------- diff --git a/remote/bnd.bnd b/remote/bnd.bnd index 20bc0ee..c475190 100644 --- a/remote/bnd.bnd +++ b/remote/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 - Server Client +Bundle-SymbolicName: org.apache.tamaya.remote +Bundle-Description: Apacha Tamaya Configuration - Tamaya Config Client +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.remote -Bundle-SymbolicName: org.apache.tamaya.remote \ 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-sandbox/blob/5925c34d/server/bnd.bnd ---------------------------------------------------------------------- diff --git a/server/bnd.bnd b/server/bnd.bnd index 0a7371a..caee7cb 100644 --- a/server/bnd.bnd +++ b/server/bnd.bnd @@ -1,4 +1,27 @@ +-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 - Server +Bundle-SymbolicName: org.apache.tamaya.server +Bundle-Description: Apacha Tamaya Configuration - Tamaya Config Server +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.server,\ - org.apache.tamaya.server.spi -Bundle-SymbolicName: org.apache.tamaya.server \ No newline at end of file + org.apache.tamaya.server.spi +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/ui/base/bnd.bnd ---------------------------------------------------------------------- diff --git a/ui/base/bnd.bnd b/ui/base/bnd.bnd index 397b100..2d32c37 100644 --- a/ui/base/bnd.bnd +++ b/ui/base/bnd.bnd @@ -1,6 +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 - UI +Bundle-SymbolicName: org.apache.tamaya.ui +Bundle-Description: Apacha Tamaya Configuration - Web UI +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.ui,\ - org.apache.tamaya.ui.event,\ - org.apache.tamaya.ui.spi,\ - org.apache.tamaya.ui.views -Bundle-SymbolicName: org.apache.tamaya.ui \ No newline at end of file + org.apache.tamaya.ui.event,\ + org.apache.tamaya.ui.spi,\ + org.apache.tamaya.ui.views +Private-Package: \ + org.apache.tamaya.ui.internal +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi +Export-Service: \ + org.apache.tamaya.ui.spi.MessageProvider,\ + org.apache.tamaya.ui.spi.SystemInfoProvider,\ + org.apache.tamaya.ui.spi.UserService,\ + org.apache.tamaya.ui.ViewProvider \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/ui/events/bnd.bnd ---------------------------------------------------------------------- diff --git a/ui/events/bnd.bnd b/ui/events/bnd.bnd index 1a68458..ca3d14e 100644 --- a/ui/events/bnd.bnd +++ b/ui/events/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 - UI (Events) +Bundle-SymbolicName: org.apache.tamaya.ui.events +Bundle-Description: Apacha Tamaya Configuration - Web UI (Events) +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.ui.events -Bundle-SymbolicName: org.apache.tamaya.ui.events \ No newline at end of file +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi,\ + org.apache.tamaya.ui,\ + org.apache.tamaya.ui.event,\ + org.apache.tamaya.ui.spi,\ + org.apache.tamaya.ui.views +Export-Service: \ + org.apache.tamaya.ui.ViewProvider \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/ui/mutableconfig/bnd.bnd ---------------------------------------------------------------------- diff --git a/ui/mutableconfig/bnd.bnd b/ui/mutableconfig/bnd.bnd index a86aff9..c4b6661 100644 --- a/ui/mutableconfig/bnd.bnd +++ b/ui/mutableconfig/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 - UI (MutableConfig) +Bundle-SymbolicName: org.apache.tamaya.ui.mutableconfig +Bundle-Description: Apacha Tamaya Configuration - Web UI (Mutable Config) +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.ui.mutableconfig -Bundle-SymbolicName: org.apache.tamaya.ui.mutableconfig \ No newline at end of file +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi,\ + org.apache.tamaya.ui,\ + org.apache.tamaya.ui.event,\ + org.apache.tamaya.ui.spi,\ + org.apache.tamaya.ui.views +Export-Service: \ + org.apache.tamaya.ui.ViewProvider \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/uom/bnd.bnd ---------------------------------------------------------------------- diff --git a/uom/bnd.bnd b/uom/bnd.bnd index ae1b4b1..b23d0f7 100644 --- a/uom/bnd.bnd +++ b/uom/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 - UoM +Bundle-SymbolicName: org.apache.tamaya.ui.uom +Bundle-Description: Apacha Tamaya Configuration - Units of Measurement Converters +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ - org.apache.tamaya.uom -Bundle-SymbolicName: org.apache.tamaya.uom \ No newline at end of file + org.apache.tamaya.ui.uom +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi +Export-Service: \ + org.apache.tamaya.spi.PropertyConverter http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/usagetracker/bnd.bnd ---------------------------------------------------------------------- diff --git a/usagetracker/bnd.bnd b/usagetracker/bnd.bnd index 89b854c..22b6dd1 100644 --- a/usagetracker/bnd.bnd +++ b/usagetracker/bnd.bnd @@ -1,4 +1,33 @@ +-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 - Usagetracker +Bundle-SymbolicName: org.apache.tamaya.usagetracker +Bundle-Description: Apacha Tamaya Configuration - UsageTracker +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.usagetracker,\ - org.apache.tamaya.usagetracker.spi -Bundle-SymbolicName: org.apache.tamaya.usagetracker + org.apache.tamaya.usagetracker.spi +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi,\ + org.apache.tamaya.events +Export-Service: \ + org.apache.tamaya.events.ConfigEventListener,\ + org.apache.tamaya.model.spi.ModelProviderSpi,\ + org.apache.tamaya.spi.PropertyFilter,\ + org.apache.tamaya.usagetracker.spi.ConfigUsageSpi http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/validation/bnd.bnd ---------------------------------------------------------------------- diff --git a/validation/bnd.bnd b/validation/bnd.bnd index e8be357..4cdf44c 100644 --- a/validation/bnd.bnd +++ b/validation/bnd.bnd @@ -1,4 +1,33 @@ +-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 - Validator +Bundle-SymbolicName: org.apache.tamaya.validation +Bundle-Description: Apacha Tamaya Configuration - Validation +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.validation,\ - org.apache.tamaya.validation.spi -Bundle-SymbolicName: org.apache.tamaya.validation + org.apache.tamaya.validation.spi +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi,\ + org.apache.tamaya.events +Export-Service: \ + org.apache.tamaya.events.ConfigEventListener,\ + org.apache.tamaya.validation.spi.ConfigDocumentationMBean,\ + org.apache.tamaya.validation.spi.ModelProviderSpi + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/5925c34d/vertx/bnd.bnd ---------------------------------------------------------------------- diff --git a/vertx/bnd.bnd b/vertx/bnd.bnd index 115c2e4..0a64402 100644 --- a/vertx/bnd.bnd +++ b/vertx/bnd.bnd @@ -1,3 +1,27 @@ +-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 - Vertx Integration +Bundle-SymbolicName: org.apache.tamaya.vertx +Bundle-Description: Apacha Tamaya Configuration - Vertx Integration +Bundle-Category: Implementation +Bundle-Copyright: (C) Apache Foundation +Bundle-License: Apache Licence version 2 +Bundle-Vendor: Apache Software Foundation +Bundle-ContactAddress: [email protected] +Bundle-DocURL: http://tamaya.apache.org Export-Package: \ org.apache.tamaya.vertx -Bundle-SymbolicName: org.apache.tamaya.vertx +Import-Package: \ + org.apache.tamaya,\ + org.apache.tamaya.spi +
