You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/02/10 15:00:36 UTC
karaf-decanter git commit: KARAF-3698 - Fix configuration parsing
issue in Cassandra appender activator. Add decanter-appender-cassandra
feature. Cleanup code.
Repository: karaf-decanter
Updated Branches:
refs/heads/master 82687b578 -> b32497bed
KARAF-3698 - Fix configuration parsing issue in Cassandra appender activator.
Add decanter-appender-cassandra feature.
Cleanup code.
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/b32497be
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/b32497be
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/b32497be
Branch: refs/heads/master
Commit: b32497bedc6f4d41d258ebb08c994fb81228e60d
Parents: 82687b5
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Feb 10 14:59:47 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Feb 10 14:59:47 2016 +0100
----------------------------------------------------------------------
appender/cassandra/pom.xml | 21 ++--------------
.../decanter/appender/cassandra/Activator.java | 2 +-
.../appender/cassandra/CassandraAppender.java | 12 ---------
assembly/src/main/feature/feature.xml | 26 +++++++++++++++++---
pom.xml | 10 +++++---
5 files changed, 31 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/b32497be/appender/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index 26330cd..476ff62 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -39,22 +39,6 @@
<artifactId>org.apache.karaf.decanter.api</artifactId>
</dependency>
- <!-- JSON builder -->
- <dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- </dependency>
-
- <!-- OSGi -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
-
<!-- SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -64,8 +48,7 @@
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
- <version>2.2.0-rc1</version>
- <scope>provided</scope>
+ <version>${cassandra.driver.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
@@ -85,7 +68,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>2.2.4</version>
+ <version>${cassandra.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/b32497be/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/Activator.java
----------------------------------------------------------------------
diff --git a/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/Activator.java b/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/Activator.java
index 4688c34..f1415b1 100644
--- a/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/Activator.java
+++ b/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/Activator.java
@@ -108,7 +108,7 @@ public class Activator implements BundleActivator {
Integer cassandraPort = 9042;
if (config != null && config.get("cassandra.port") != null) {
- cassandraPort = (Integer) config.get("cassandra.port");
+ cassandraPort = Integer.parseInt((String) config.get("cassandra.port"));
}
try {
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/b32497be/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
----------------------------------------------------------------------
diff --git a/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java b/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
index 62fbcbf..18cc410 100644
--- a/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
+++ b/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
@@ -16,20 +16,10 @@
*/
package org.apache.karaf.decanter.appender.cassandra;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.util.List;
-import java.util.Map;
-
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
import org.apache.karaf.decanter.api.marshaller.Marshaller;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.event.Event;
@@ -48,8 +38,6 @@ public class CassandraAppender implements EventHandler {
private final static Logger LOGGER = LoggerFactory.getLogger(CassandraAppender.class);
- private final SimpleDateFormat tsFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss,SSS'Z'");
-
private String cassandraHost;
private Integer cassandraPort;
private String cassandraUser;
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/b32497be/assembly/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index 01cd075..9e55620 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -78,7 +78,7 @@
<feature name="decanter-appender-elasticsearch" version="${project.version}" description="Karaf Decanter Elasticsearch Appender">
<feature version="${project.version}">decanter-common</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch.bundle.version}</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.elasticsearch.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch/${project.version}/cfg</configfile>
</feature>
@@ -104,19 +104,37 @@
<feature name="decanter-appender-kafka" version="${project.version}" description="Karaf Decanter Kafka Appender">
<feature version="${project.version}">decanter-common</feature>
-
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/0.8.2.2_1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/0.8.2.2_1</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.kafka/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.kafka.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.kafka/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-appender-mqtt" version="${project.version}" description="Karaf Decanter MQTT Appender">
<feature version="${project.version}">decanter-common</feature>
- <bundle>mvn:org.eclipse.paho/org.eclipse.paho.client.mqttv3/${paho.version}</bundle>
+ <bundle dependency="true">mvn:org.eclipse.paho/org.eclipse.paho.client.mqttv3/${paho.version}</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.mqtt/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.mqtt.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.mqtt/${project.version}/cfg</configfile>
</feature>
+ <feature name="decanter-appender-cassandra" version="${project.version}" description="Karaf Decanter Cassandra Appender">
+ <feature version="${project.version}">decanter-common</feature>
+ <bundle dependency="true">mvn:com.google.guava/guava/16.0.1</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-handler/4.0.33.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-transport-native-epoll/4.0.33.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-buffer/4.0.33.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-common/4.0.33.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-transport/4.0.33.Final</bundle>
+ <bundle dependency="true">mvn:io.netty/netty-codec/4.0.33.Final</bundle>
+ <bundle dependency="true">mvn:io.dropwizard.metrics/metrics-core/3.1.2</bundle>
+ <bundle dependency="true">mvn:io.dropwizard.metrics/metrics-json/3.1.2</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.6.3</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.6.3</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.6.3</bundle>
+ <bundle dependency="true">mvn:com.datastax.cassandra/cassandra-driver-core/${cassandra.driver.version}</bundle>
+ <bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.cassandra/${project.version}</bundle>
+ <configfile finalname="/etc/org.apache.karaf.decanter.appender.cassandra.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.cassandra/${project.version}/cfg</configfile>
+ </feature>
+
<feature name="decanter-sla" version="${project.version}" description="Karaf Decanter SLA support">
<feature version="${project.version}">decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.sla/org.apache.karaf.decanter.sla.checker/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/b32497be/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d181782..f3280c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,15 +38,17 @@
<baseline>1.0.0</baseline>
<baseline.skip>true</baseline.skip>
+ <activemq.version>5.12.2</activemq.version>
<camel.version>2.13.2</camel.version>
+ <cassandra.version>2.2.4</cassandra.version>
+ <cassandra.driver.version>2.2.0-rc1</cassandra.driver.version>
<elasticsearch.version>1.7.3</elasticsearch.version>
<elasticsearch.bundle.version>1.7.3_1</elasticsearch.bundle.version>
- <kibana.version>3.1.1</kibana.version>
- <slf4j.version>1.7.7</slf4j.version>
- <json-api.version>1.0</json-api.version>
<glassfish-json.version>1.0.4</glassfish-json.version>
- <activemq.version>5.12.2</activemq.version>
+ <json-api.version>1.0</json-api.version>
+ <kibana.version>3.1.1</kibana.version>
<paho.version>1.0.2</paho.version>
+ <slf4j.version>1.7.7</slf4j.version>
</properties>
<modules>