You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2016/03/01 16:08:54 UTC
karaf-decanter git commit: [KARAF-4369] Also listen to typical OSGi
and karaf events
Repository: karaf-decanter
Updated Branches:
refs/heads/master 31098cd7f -> 315ae2923
[KARAF-4369] Also listen to typical OSGi and karaf events
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/315ae292
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/315ae292
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/315ae292
Branch: refs/heads/master
Commit: 315ae2923fb6fc8e841c59ef468b47e0dff5095b
Parents: 31098cd
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Mar 1 16:08:39 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Mar 1 16:08:39 2016 +0100
----------------------------------------------------------------------
.../appender/elasticsearch/ElasticsearchAppender.java | 6 ++++--
.../appender/elasticsearch/ElasticsearchAppender.java | 5 ++++-
.../org/apache/karaf/decanter/appender/jms/JmsAppender.java | 8 ++++++--
.../apache/karaf/decanter/appender/kafka/KafkaAppender.java | 6 +++++-
4 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/315ae292/appender/elasticsearch-native-1.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-native-1.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java b/appender/elasticsearch-native-1.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
index 736f743..ec71c97 100644
--- a/appender/elasticsearch-native-1.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
+++ b/appender/elasticsearch-native-1.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
@@ -37,7 +37,6 @@ import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.Event;
-import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +47,10 @@ import org.slf4j.LoggerFactory;
@Component(
name = "org.apache.karaf.decanter.appender.elasticsearch",
immediate = true,
- property = EventConstants.EVENT_TOPIC + "=decanter/collect/*"
+ property = {"event.topics=decanter/collect/*",
+ "event.topics=org/osgi/framework/*",
+ "event.topics=org/apache/karaf/*"
+ }
)
public class ElasticsearchAppender implements EventHandler {
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/315ae292/appender/elasticsearch-native-2.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-native-2.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java b/appender/elasticsearch-native-2.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
index cd40c67..1df536c 100644
--- a/appender/elasticsearch-native-2.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
+++ b/appender/elasticsearch-native-2.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
@@ -47,7 +47,10 @@ import org.slf4j.LoggerFactory;
@Component(
name = "org.apache.karaf.decanter.appender.elasticsearch",
immediate = true,
- property = EventConstants.EVENT_TOPIC + "=decanter/collect/*"
+ property = {"event.topics=decanter/collect/*",
+ "event.topics=org/osgi/framework/*",
+ "event.topics=org/apache/karaf/*"
+ }
)
public class ElasticsearchAppender implements EventHandler {
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/315ae292/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java
----------------------------------------------------------------------
diff --git a/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java b/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java
index f72bfab..e8bebfa 100644
--- a/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java
+++ b/appender/jms/src/main/java/org/apache/karaf/decanter/appender/jms/JmsAppender.java
@@ -31,7 +31,6 @@ import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.Event;
-import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +38,12 @@ import org.slf4j.LoggerFactory;
@Component(
name = "org.apache.karaf.decanter.appender.jms",
immediate = true,
- property = EventConstants.EVENT_TOPIC + "=decanter/collect/*"
+ property =
+ {
+ "event.topics=decanter/collect/*",
+ "event.topics=org/osgi/framework/*",
+ "event.topics=org/apache/karaf/*"
+ }
)
public class JmsAppender implements EventHandler {
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/315ae292/appender/kafka/src/main/java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java
----------------------------------------------------------------------
diff --git a/appender/kafka/src/main/java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java b/appender/kafka/src/main/java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java
index afa9c77..7408995 100644
--- a/appender/kafka/src/main/java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java
+++ b/appender/kafka/src/main/java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java
@@ -35,7 +35,11 @@ import org.slf4j.LoggerFactory;
@Component(
name = "org.apache.karaf.decanter.appender.kafka",
immediate = true,
- property = EventConstants.EVENT_TOPIC + "=decanter/collect/*"
+ property = {
+ "event.topics=decanter/collect/*",
+ "event.topics=org/osgi/framework/*",
+ "event.topics=org/apache/karaf/*"
+ }
)
public class KafkaAppender implements EventHandler {
private final static Logger LOGGER = LoggerFactory.getLogger(KafkaAppender.class);