[prev in list] [next in list] [prev in thread] [next in thread]
List: flume-commits
Subject: git commit: FLUME-2266. Update Morphline Sink to kite-0.10.0.
From: hshreedharan () apache ! org
Date: 2013-12-12 23:14:50
Message-ID: 3dc7e87717f247a39dc8c0f635b50777 () git ! apache ! org
[Download RAW message or body]
Updated Branches:
refs/heads/trunk 9790ca758 -> d76118d72
FLUME-2266. Update Morphline Sink to kite-0.10.0.
(Wolfgang Hoschek via Hari Shreedharan)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/d76118d7
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/d76118d7
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/d76118d7
Branch: refs/heads/trunk
Commit: d76118d729d2fe0888b934b0dc743f5f068f63dd
Parents: 9790ca7
Author: Hari Shreedharan <hshreedharan@apache.org>
Authored: Thu Dec 12 15:11:00 2013 -0800
Committer: Hari Shreedharan <hshreedharan@apache.org>
Committed: Thu Dec 12 15:13:33 2013 -0800
----------------------------------------------------------------------
.../flume-ng-morphline-solr-sink/pom.xml | 14 +++++++-------
.../sink/solr/morphline/MorphlineHandlerImpl.java | 18 +++++++++---------
.../sink/solr/morphline/MorphlineInterceptor.java | 6 +++---
.../flume/sink/solr/morphline/MorphlineSink.java | 2 +-
.../sink/solr/morphline/MorphlineSolrSink.java | 4 ++--
.../sink/solr/morphline/TestEnvironment.java | 2 +-
.../solr/morphline/TestMorphlineInterceptor.java | 2 +-
.../solr/morphline/TestMorphlineSolrSink.java | 18 +++++++++---------
.../src/test/resources/log4j.properties | 2 +-
.../test-morphlines/grokIfNotMatchDropRecord.conf | 2 +-
.../test-morphlines/ifDetectMimeType.conf | 2 +-
.../resources/test-morphlines/noOperation.conf | 2 +-
.../test/resources/test-morphlines/readClob.conf | 2 +-
.../test-morphlines/solrCellDocumentTypes.conf | 2 +-
14 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml index c78788d..7d90651 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
@@ -33,7 +33,7 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<solr.version>4.3.0</solr.version>
<solr.expected.version>4.3.0</solr.expected.version> <!-- sanity check to verify \
we actually run against the expected version rather than some \
outdated version -->
- <cdk.version>0.8.0</cdk.version>
+ <kite.version>0.10.0</kite.version>
<slf4j.version>1.6.1</slf4j.version>
<surefire.version>2.12.4</surefire.version>
</properties>
@@ -74,9 +74,9 @@ limitations under the License.
</dependency>
<dependency>
- <groupId>com.cloudera.cdk</groupId>
- <artifactId>cdk-morphlines-all</artifactId>
- <version>${cdk.version}</version>
+ <groupId>org.kitesdk</groupId>
+ <artifactId>kite-morphlines-all</artifactId>
+ <version>${kite.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
@@ -108,9 +108,9 @@ limitations under the License.
</dependency>
<dependency>
- <groupId>com.cloudera.cdk</groupId>
- <artifactId>cdk-morphlines-solr-core</artifactId>
- <version>${cdk.version}</version>
+ <groupId>org.kitesdk</groupId>
+ <artifactId>kite-morphlines-solr-core</artifactId>
+ <version>${kite.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-mor \
phline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineHandlerImpl.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineHandlerImpl.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineHandlerImpl.java
index cb88dc2..d3154af 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineHandlerImpl.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineHandlerImpl.java
@@ -24,15 +24,15 @@ import org.apache.flume.Event;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.cloudera.cdk.morphline.api.Command;
-import com.cloudera.cdk.morphline.api.MorphlineCompilationException;
-import com.cloudera.cdk.morphline.api.MorphlineContext;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.Compiler;
-import com.cloudera.cdk.morphline.base.FaultTolerance;
-import com.cloudera.cdk.morphline.base.Fields;
-import com.cloudera.cdk.morphline.base.Metrics;
-import com.cloudera.cdk.morphline.base.Notifications;
+import org.kitesdk.morphline.api.Command;
+import org.kitesdk.morphline.api.MorphlineCompilationException;
+import org.kitesdk.morphline.api.MorphlineContext;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.Compiler;
+import org.kitesdk.morphline.base.FaultTolerance;
+import org.kitesdk.morphline.base.Fields;
+import org.kitesdk.morphline.base.Metrics;
+import org.kitesdk.morphline.base.Notifications;
import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.SharedMetricRegistries;
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-mor \
phline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineInterceptor.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineInterceptor.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineInterceptor.java
index ac0ccb6..8e5e4b3 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineInterceptor.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineInterceptor.java
@@ -32,9 +32,9 @@ import org.apache.flume.FlumeException;
import org.apache.flume.event.EventBuilder;
import org.apache.flume.interceptor.Interceptor;
-import com.cloudera.cdk.morphline.api.Command;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.Fields;
+import org.kitesdk.morphline.api.Command;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.Fields;
import com.google.common.base.Preconditions;
import com.google.common.io.ByteStreams;
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-mor \
phline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSink.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSink.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSink.java
index 1e52a66..7c784c4 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSink.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSink.java
@@ -29,7 +29,7 @@ import org.apache.flume.sink.AbstractSink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.cloudera.cdk.morphline.api.Command;
+import org.kitesdk.morphline.api.Command;
/**
* Flume sink that extracts search documents from Flume events and processes them \
using a morphline
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-mor \
phline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSolrSink.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSolrSink.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSolrSink.java
index bc07a2e..e403b10 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSolrSink.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/main/java/org/apache/flume/sink/solr/morphline/MorphlineSolrSink.java
@@ -18,8 +18,8 @@ package org.apache.flume.sink.solr.morphline;
import org.apache.flume.Context;
-import com.cloudera.cdk.morphline.api.Command;
-import com.cloudera.cdk.morphline.base.FaultTolerance;
+import org.kitesdk.morphline.api.Command;
+import org.kitesdk.morphline.base.FaultTolerance;
/**
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-mor \
phline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestEnvironment.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestEnvironment.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestEnvironment.java
index 5576d1d..933a6b1 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestEnvironment.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestEnvironment.java
@@ -20,7 +20,7 @@ import java.net.UnknownHostException;
import org.junit.Test;
-import com.cloudera.cdk.morphline.solr.EnvironmentTest;
+import org.kitesdk.morphline.solr.EnvironmentTest;
/** Print and verify some info about the environment in which the unit tests are \
running */ public class TestEnvironment extends EnvironmentTest {
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-mor \
phline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineInterceptor.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineInterceptor.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineInterceptor.java
index f330ecb..22cfe96 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineInterceptor.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineInterceptor.java
@@ -28,7 +28,7 @@ import org.apache.flume.event.EventBuilder;
import org.junit.Assert;
import org.junit.Test;
-import com.cloudera.cdk.morphline.base.Fields;
+import org.kitesdk.morphline.base.Fields;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-mor \
phline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineSolrSink.java
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineSolrSink.java \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineSolrSink.java
index 5fbb22b..232c092 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineSolrSink.java
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/java/org/apache/flume/sink/solr/morphline/TestMorphlineSolrSink.java
@@ -50,15 +50,15 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.cloudera.cdk.morphline.api.MorphlineContext;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.FaultTolerance;
-import com.cloudera.cdk.morphline.base.Fields;
-import com.cloudera.cdk.morphline.solr.DocumentLoader;
-import com.cloudera.cdk.morphline.solr.SolrLocator;
-import com.cloudera.cdk.morphline.solr.SolrMorphlineContext;
-import com.cloudera.cdk.morphline.solr.SolrServerDocumentLoader;
-import com.cloudera.cdk.morphline.solr.TestEmbeddedSolrServer;
+import org.kitesdk.morphline.api.MorphlineContext;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.FaultTolerance;
+import org.kitesdk.morphline.base.Fields;
+import org.kitesdk.morphline.solr.DocumentLoader;
+import org.kitesdk.morphline.solr.SolrLocator;
+import org.kitesdk.morphline.solr.SolrMorphlineContext;
+import org.kitesdk.morphline.solr.SolrServerDocumentLoader;
+import org.kitesdk.morphline.solr.TestEmbeddedSolrServer;
import com.codahale.metrics.MetricRegistry;
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableListMultimap;
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j.properties \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j.properties \
index 1763bfe..4bfd3fc 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j.properties
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j.properties
@@ -20,7 +20,7 @@ log4j.logger.org.apache.flume.sink=INFO
#log4j.logger.org.apache.flume.sink.solr=DEBUG
log4j.logger.org.apache.solr=INFO
#log4j.logger.org.apache.solr.hadoop=DEBUG
-log4j.logger.com.cloudera.cdk.morphline=DEBUG
+log4j.logger.org.kitesdk.morphline=DEBUG
log4j.logger.org.apache.solr.morphline=DEBUG
log4j.logger.org.apache.solr.update.processor.LogUpdateProcessor=WARN
log4j.logger.org.apache.solr.core.SolrCore=WARN
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-mor \
phline-solr-sink/src/test/resources/test-morphlines/grokIfNotMatchDropRecord.conf
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/grokIfNotMatchDropRecord.conf \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/grokIfNotMatchDropRecord.conf
index 6578219..bdd56ee 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/grokIfNotMatchDropRecord.conf
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/grokIfNotMatchDropRecord.conf
@@ -18,7 +18,7 @@
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**"]
+ importCommands : ["org.kitesdk.**"]
commands : [
{
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/ifDetectMimeType.conf
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/ifDetectMimeType.conf \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/ifDetectMimeType.conf
index 92fa33f..cfe0893 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/ifDetectMimeType.conf
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/ifDetectMimeType.conf
@@ -20,7 +20,7 @@ MY.MIME_TYPE : myDefault
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**", "org.apache.solr.**"]
+ importCommands : ["org.kitesdk.**", "org.apache.solr.**"]
commands : [
{
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/noOperation.conf
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/noOperation.conf \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/noOperation.conf
index 4e4389b..f5b493c 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/noOperation.conf
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/noOperation.conf
@@ -18,7 +18,7 @@
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**"]
+ importCommands : ["org.kitesdk.**"]
commands : [
{ logDebug { format : "output record: {}", args : ["@{}"] } }
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/readClob.conf
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/readClob.conf \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/readClob.conf
index 234377f..ac9df9b 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/readClob.conf
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/readClob.conf
@@ -18,7 +18,7 @@
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**", "org.apache.solr.**"]
+ importCommands : ["org.kitesdk.**", "org.apache.solr.**"]
commands : [
{
http://git-wip-us.apache.org/repos/asf/flume/blob/d76118d7/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/solrCellDocumentTypes.conf
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/solrCellDocumentTypes.conf \
b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/solrCellDocumentTypes.conf
index 2574144..88e6345 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/solrCellDocumentTypes.conf
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/test-morphlines/solrCellDocumentTypes.conf
@@ -27,7 +27,7 @@
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**", "org.apache.solr.**"]
+ importCommands : ["org.kitesdk.**", "org.apache.solr.**"]
commands : [
{ separateAttachments {} }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic