Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf-decanter
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/fc488f2c Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/fc488f2c Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/fc488f2c Branch: refs/heads/DS-target Commit: fc488f2c14d9321355b10fb0be4ee88d96ae1809 Parents: ae8d397 18e8b29 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Feb 18 15:31:22 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Feb 18 15:31:22 2016 +0100 ---------------------------------------------------------------------- appender/camel/pom.xml | 2 +- .../decanter/appender/camel/Activator.java | 77 -------- .../decanter/appender/camel/CamelAppender.java | 29 ++- appender/cassandra/pom.xml | 1 - .../decanter/appender/cassandra/Activator.java | 128 ------------- .../appender/cassandra/CassandraAppender.java | 73 +++++--- .../cassandra/CassandraAppenderTest.java | 8 +- appender/elasticsearch-native-1.x/pom.xml | 1 - .../appender/elasticsearch/Activator.java | 94 ---------- .../elasticsearch/ElasticsearchAppender.java | 55 ++++-- .../TestElasticsearchAppender.java | 11 +- appender/elasticsearch-native-2.x/pom.xml | 1 - .../appender/elasticsearch/Activator.java | 94 ---------- .../elasticsearch/ElasticsearchAppender.java | 51 ++++-- .../TestElasticsearchAppender.java | 25 +-- appender/elasticsearch-rest/pom.xml | 1 - .../appender/elasticsearch/rest/Activator.java | 95 ---------- .../rest/ElasticsearchAppender.java | 76 +++++--- .../rest/TestElasticsearchAppender.java | 9 +- appender/kafka/pom.xml | 3 +- .../decanter/appender/kafka/Activator.java | 138 -------------- .../decanter/appender/kafka/KafkaAppender.java | 69 +++++-- appender/log/pom.xml | 1 - .../karaf/decanter/appender/log/Activator.java | 39 ---- .../decanter/appender/log/LogAppender.java | 11 +- assembly/src/main/feature/feature.xml | 2 + collector/file/pom.xml | 1 - .../decanter/collector/file/Activator.java | 124 ------------- .../collector/file/DecanterTailerListener.java | 60 +++++-- collector/jmx/pom.xml | 1 - .../karaf/decanter/collector/jmx/Activator.java | 123 ------------- .../decanter/collector/jmx/JmxCollector.java | 33 +++- collector/log/pom.xml | 1 - .../karaf/decanter/collector/log/Activator.java | 62 ------- .../decanter/collector/log/LogAppender.java | 16 +- collector/log4j-socket/pom.xml | 2 +- .../decanter/appender/log/socket/Activator.java | 105 ----------- .../appender/log/socket/SocketCollector.java | 156 ---------------- .../collector/log/socket/SocketCollector.java | 178 +++++++++++++++++++ .../log/socket/SocketCollectorTest.java | 30 ---- .../log/socket/SocketCollectorTest.java | 31 ++++ .../decanter/collector/rest/RestCollector.java | 7 +- collector/system/pom.xml | 1 - .../decanter/collector/system/Activator.java | 83 --------- .../collector/system/SystemCollector.java | 25 ++- elasticsearch-1.x/pom.xml | 1 - .../karaf/decanter/elasticsearch/Activator.java | 93 ---------- .../decanter/elasticsearch/EmbeddedNode.java | 41 +++-- .../elasticsearch/TestEmbeddedNode.java | 9 +- elasticsearch-2.x/pom.xml | 1 - .../karaf/decanter/elasticsearch/Activator.java | 93 ---------- .../decanter/elasticsearch/EmbeddedNode.java | 26 ++- .../elasticsearch/TestEmbeddedNode.java | 7 +- .../marshaller/json/JsonMarshaller.java | 4 +- .../marshaller/json/JsonUnmarshaller.java | 3 +- pom.xml | 11 -- scheduler/simple/bnd.bnd | 1 - scheduler/simple/pom.xml | 1 - .../decanter/scheduler/simple/Activator.java | 76 -------- .../scheduler/simple/SimpleScheduler.java | 63 ++++--- 60 files changed, 712 insertions(+), 1851 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fc488f2c/assembly/src/main/feature/feature.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/fc488f2c/pom.xml ----------------------------------------------------------------------
