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:37 UTC
[12/14] incubator-tamaya-extensions git commit: TAMAYA-297: Fixes on
OSGI commands, added propagation flag.
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";