Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/master 5a598699c -> 3aa3145e2
TAMAYA-300 Added OSGI injection module. 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/3aa3145e Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/3aa3145e Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/3aa3145e Branch: refs/heads/master Commit: 3aa3145e2523942b43bdc66df614d19ea8253121 Parents: 5a59869 Author: Anatole Tresch <[email protected]> Authored: Sat Oct 14 08:14:56 2017 +0200 Committer: Anatole Tresch <[email protected]> Committed: Sat Oct 14 08:14:56 2017 +0200 ---------------------------------------------------------------------- osgi/injection/bnd.bnd | 34 +++++++++ osgi/injection/pom.xml | 72 ++++++++++++++++++++ .../injection/OSGIConfigurationInjector.java | 1 - .../osgi/injection/TamayaOSGIInjector.java | 1 - 4 files changed, 106 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3aa3145e/osgi/injection/bnd.bnd ---------------------------------------------------------------------- diff --git a/osgi/injection/bnd.bnd b/osgi/injection/bnd.bnd new file mode 100644 index 0000000..69e9637 --- /dev/null +++ b/osgi/injection/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-Activator: org.apache.tamaya.osgi.injection.Activator +Bundle-Version: ${version}.${tstamp} +Bundle-Name: Apache Tamaya - OSGI Configuration Injection +Bundle-SymbolicName: org.apache.tamaya.osgi.injection +Bundle-Description: Apacha Tamaya Configuration - OSGI Service Configuration Injection +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 +Import-Package: \ + org.osgi.service.cm,\ + org.osgi.framework,\ + org.osgi.util.tracker,\ + org.apache.tamaya,\ + org.apache.tamaya.spi,\ + org.apache.tamaya.functions,\ + org.apache.tamaya.spisupport,\ + org.apache.tamaya.osgi,\ + org.apache.tamaya.inject.api,\ + org.apache.tamaya.inject.spi,\ + org.apache.tamaya.inject http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3aa3145e/osgi/injection/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/injection/pom.xml b/osgi/injection/pom.xml new file mode 100644 index 0000000..692e98f --- /dev/null +++ b/osgi/injection/pom.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.tamaya.ext</groupId> + <artifactId>tamaya-osgi-all</artifactId> + <version>0.4-incubating-SNAPSHOT</version> + </parent> + + <artifactId>tamaya-osgi-injection</artifactId> + <packaging>jar</packaging> + <name>Apache Tamaya :: OSGI :: Config Injection</name> + <description>Tamaya OSGI Configuration Injector</description> + + <dependencies> + + <dependency> + <groupId>org.apache.tamaya.ext</groupId> + <artifactId>tamaya-injection</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tamaya.ext</groupId> + <artifactId>tamaya-osgi</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </dependency> + + <!-- Testing --> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>java-hamcrest</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3aa3145e/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/OSGIConfigurationInjector.java ---------------------------------------------------------------------- diff --git a/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/OSGIConfigurationInjector.java b/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/OSGIConfigurationInjector.java index 656f565..887939b 100644 --- a/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/OSGIConfigurationInjector.java +++ b/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/OSGIConfigurationInjector.java @@ -21,7 +21,6 @@ package org.apache.tamaya.osgi.injection; import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.inject.ConfigurationInjection; -import org.osgi.framework.BundleContext; import org.osgi.service.cm.ConfigurationAdmin; import java.util.Objects; http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3aa3145e/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/TamayaOSGIInjector.java ---------------------------------------------------------------------- diff --git a/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/TamayaOSGIInjector.java b/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/TamayaOSGIInjector.java index 4c04d41..19fd795 100644 --- a/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/TamayaOSGIInjector.java +++ b/osgi/injection/src/main/java/org/apache/tamaya/osgi/injection/TamayaOSGIInjector.java @@ -19,7 +19,6 @@ package org.apache.tamaya.osgi.injection; import org.apache.tamaya.osgi.TamayaConfigPlugin; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference;
