Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/master 2949a137a -> 166b3a3dd
TAMAYA-202: Use bnd-maven-plugin. 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/3dab25ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/3dab25ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/3dab25ff Branch: refs/heads/master Commit: 3dab25ff0dfb7176b31a1b026b5e78b0ed2d500b Parents: 2949a13 Author: anatole <[email protected]> Authored: Sat Nov 26 23:38:22 2016 +0100 Committer: anatole <[email protected]> Committed: Sat Nov 26 23:38:22 2016 +0100 ---------------------------------------------------------------------- osgi/bnd.bnd | 4 ++- osgi/pom.xml | 28 +------------------- .../java/org/apache/tamaya/osgi/Activator.java | 2 +- .../tamaya/osgi/OSGIConfigRootMapper.java | 2 +- .../tamaya/osgi/OSGIEnhancedConfiguration.java | 2 +- .../tamaya/osgi/TamayaConfigAdminImpl.java | 2 +- .../tamaya/osgi/TamayaConfigurationImpl.java | 2 +- 7 files changed, 9 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3dab25ff/osgi/bnd.bnd ---------------------------------------------------------------------- diff --git a/osgi/bnd.bnd b/osgi/bnd.bnd index 222f607..585492b 100644 --- a/osgi/bnd.bnd +++ b/osgi/bnd.bnd @@ -1,2 +1,4 @@ Export-Package: \ - org.apache.tamaya.osgi \ No newline at end of file + org.apache.tamaya.osgi +Bundle-Activator: org.apache.tamaya.integration.osgi.Activator +Export-Service: org.osgi.service.cm.ConfigurationAdmin http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3dab25ff/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/pom.xml b/osgi/pom.xml index 9d3682a..5d3beb8 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -29,36 +29,10 @@ </parent> <artifactId>tamaya-osgi</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>Apache Tamaya Integration - OSGi Services :: Tamaya Config</name> <description>Tamaya Based OSGI Implementation of ConfigAdmin and Config Injection</description> - <properties> - <felix.plugin.version>2.5.4</felix.plugin.version> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>${felix.plugin.version}</version> - <inherited>true</inherited> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator> - org.apache.tamaya.integration.osgi.Activator - </Bundle-Activator> - <Export-Service> - org.osgi.service.cm.ConfigurationAdmin - </Export-Service> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>org.apache.felix</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3dab25ff/osgi/src/main/java/org/apache/tamaya/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/osgi/src/main/java/org/apache/tamaya/osgi/Activator.java b/osgi/src/main/java/org/apache/tamaya/osgi/Activator.java index 91dfda4..4270324 100644 --- a/osgi/src/main/java/org/apache/tamaya/osgi/Activator.java +++ b/osgi/src/main/java/org/apache/tamaya/osgi/Activator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tamaya.integration.osgi; +package org.apache.tamaya.osgi; import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3dab25ff/osgi/src/main/java/org/apache/tamaya/osgi/OSGIConfigRootMapper.java ---------------------------------------------------------------------- diff --git a/osgi/src/main/java/org/apache/tamaya/osgi/OSGIConfigRootMapper.java b/osgi/src/main/java/org/apache/tamaya/osgi/OSGIConfigRootMapper.java index 836df8b..79cc387 100644 --- a/osgi/src/main/java/org/apache/tamaya/osgi/OSGIConfigRootMapper.java +++ b/osgi/src/main/java/org/apache/tamaya/osgi/OSGIConfigRootMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tamaya.integration.osgi; +package org.apache.tamaya.osgi; /** * Mapping function for mapping Tamaya configuration sections to OSGI pids. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3dab25ff/osgi/src/main/java/org/apache/tamaya/osgi/OSGIEnhancedConfiguration.java ---------------------------------------------------------------------- diff --git a/osgi/src/main/java/org/apache/tamaya/osgi/OSGIEnhancedConfiguration.java b/osgi/src/main/java/org/apache/tamaya/osgi/OSGIEnhancedConfiguration.java index 5e813af..66f9b1c 100644 --- a/osgi/src/main/java/org/apache/tamaya/osgi/OSGIEnhancedConfiguration.java +++ b/osgi/src/main/java/org/apache/tamaya/osgi/OSGIEnhancedConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tamaya.integration.osgi; +package org.apache.tamaya.osgi; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spisupport.BasePropertySource; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3dab25ff/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigAdminImpl.java ---------------------------------------------------------------------- diff --git a/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigAdminImpl.java b/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigAdminImpl.java index 7bf4da7..35c55e7 100644 --- a/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigAdminImpl.java +++ b/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigAdminImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tamaya.integration.osgi; +package org.apache.tamaya.osgi; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3dab25ff/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigurationImpl.java b/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigurationImpl.java index c7b0864..eef01d7 100644 --- a/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigurationImpl.java +++ b/osgi/src/main/java/org/apache/tamaya/osgi/TamayaConfigurationImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tamaya.integration.osgi; +package org.apache.tamaya.osgi; import java.io.IOException; import java.util.*;
