You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/01/15 22:39:06 UTC
svn commit: r1558572 - in /lucene/dev/branches/branch_4x: ./ lucene/ solr/
solr/contrib/ solr/contrib/map-reduce/
solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/
solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/
solr/contrib/m...
Author: markrmiller
Date: Wed Jan 15 21:39:04 2014
New Revision: 1558572
URL: http://svn.apache.org/r1558572
Log:
SOLR-1301: Update to Kite 0.10 from CDK 0.9
Added:
lucene/dev/branches/branch_4x/solr/licenses/Saxon-HE-9.5.1-3.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/Saxon-HE-9.5.1-3.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-avro-0.10.0.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-avro-0.10.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-avro-LICENSE-ASL.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-avro-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-avro-NOTICE.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-avro-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-core-0.10.0-tests.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-core-0.10.0-tests.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-core-0.10.0.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-core-0.10.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-core-LICENSE-ASL.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-core-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-core-NOTICE.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-core-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-hadoop-sequencefile-0.10.0.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-hadoop-sequencefile-0.10.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-hadoop-sequencefile-LICENSE-ASL.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-hadoop-sequencefile-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-hadoop-sequencefile-NOTICE.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-hadoop-sequencefile-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-json-0.10.0.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-json-0.10.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-json-LICENSE-ASL.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-json-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-json-NOTICE.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-json-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-saxon-0.10.0.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-saxon-0.10.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-saxon-LICENSE-ASL.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-saxon-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-saxon-NOTICE.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-saxon-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-tika-core-0.10.0.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-tika-core-0.10.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-tika-core-LICENSE-ASL.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-tika-core-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-tika-core-NOTICE.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-tika-core-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-tika-decompress-0.10.0.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-tika-decompress-0.10.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-tika-decompress-LICENSE-ASL.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-tika-decompress-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-tika-decompress-NOTICE.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-tika-decompress-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-twitter-0.10.0.jar.sha1
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-twitter-0.10.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-twitter-LICENSE-ASL.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-twitter-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/kite-morphlines-twitter-NOTICE.txt
- copied unchanged from r1552381, lucene/dev/trunk/solr/licenses/kite-morphlines-twitter-NOTICE.txt
Removed:
lucene/dev/branches/branch_4x/solr/licenses/Saxon-HE-9.5.1-2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-avro-0.9.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-avro-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-avro-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-core-0.9.0-tests.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-core-0.9.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-core-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-core-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-hadoop-sequencefile-0.9.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-hadoop-sequencefile-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-hadoop-sequencefile-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-json-0.9.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-json-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-json-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-saxon-0.9.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-saxon-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-saxon-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-tika-core-0.9.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-tika-core-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-tika-core-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-tika-decompress-0.9.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-tika-decompress-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-tika-decompress-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-twitter-0.9.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-twitter-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/cdk-morphlines-twitter-NOTICE.txt
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/loadSolrBasic.conf
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellDocumentTypes.conf
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellJPGCompressed.conf
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellXML.conf
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tokenizeText.conf
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tutorialReadAvroContainer.conf
lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrMorphlineContext.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
Modified: lucene/dev/branches/branch_4x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-versions.properties?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-versions.properties Wed Jan 15 21:39:04 2014
@@ -14,16 +14,6 @@ com.carrotsearch.randomizedtesting.versi
/com.carrotsearch/hppc = 0.5.2
-com.cloudera.cdk.cdk-morphlines.version = 0.9.0
-/com.cloudera.cdk/cdk-morphlines-avro = ${com.cloudera.cdk.cdk-morphlines.version}
-/com.cloudera.cdk/cdk-morphlines-core = ${com.cloudera.cdk.cdk-morphlines.version}
-/com.cloudera.cdk/cdk-morphlines-hadoop-sequencefile = ${com.cloudera.cdk.cdk-morphlines.version}
-/com.cloudera.cdk/cdk-morphlines-json = ${com.cloudera.cdk.cdk-morphlines.version}
-/com.cloudera.cdk/cdk-morphlines-saxon = ${com.cloudera.cdk.cdk-morphlines.version}
-/com.cloudera.cdk/cdk-morphlines-tika-core = ${com.cloudera.cdk.cdk-morphlines.version}
-/com.cloudera.cdk/cdk-morphlines-tika-decompress = ${com.cloudera.cdk.cdk-morphlines.version}
-/com.cloudera.cdk/cdk-morphlines-twitter = ${com.cloudera.cdk.cdk-morphlines.version}
-
com.codahale.metrics.version = 3.0.1
/com.codahale.metrics/metrics-core = ${com.codahale.metrics.version}
/com.codahale.metrics/metrics-healthchecks = ${com.codahale.metrics.version}
@@ -87,7 +77,7 @@ com.sun.jersey.version = 1.8
/mecab/mecab-ipadic = 2.7.0-20070801
/mecab/mecab-naist-jdic = 0.6.3b-20111013
/net.arnx/jsonic = 1.2.7
-/net.sf.saxon/Saxon-HE = 9.5.1-2
+/net.sf.saxon/Saxon-HE = 9.5.1-3
/net.sourceforge.argparse4j/argparse4j = 0.4.0
/net.sourceforge.nekohtml/nekohtml = 1.9.17
/org.antlr/antlr-runtime = 3.5
@@ -201,6 +191,16 @@ org.gagravarr.vorbis.java.version = 0.1
/org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version}
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
+org.kitesdk.kite-morphlines.version = 0.10.0
+/org.kitesdk/kite-morphlines-avro = ${org.kitesdk.kite-morphlines.version}
+/org.kitesdk/kite-morphlines-core = ${org.kitesdk.kite-morphlines.version}
+/org.kitesdk/kite-morphlines-hadoop-sequencefile = ${org.kitesdk.kite-morphlines.version}
+/org.kitesdk/kite-morphlines-json = ${org.kitesdk.kite-morphlines.version}
+/org.kitesdk/kite-morphlines-saxon = ${org.kitesdk.kite-morphlines.version}
+/org.kitesdk/kite-morphlines-tika-core = ${org.kitesdk.kite-morphlines.version}
+/org.kitesdk/kite-morphlines-tika-decompress = ${org.kitesdk.kite-morphlines.version}
+/org.kitesdk/kite-morphlines-twitter = ${org.kitesdk.kite-morphlines.version}
+
/org.mockito/mockito-core = 1.9.5
org.mortbay.jetty.version = 6.1.26
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/ivy.xml?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/ivy.xml Wed Jan 15 21:39:04 2014
@@ -27,10 +27,10 @@
<dependencies>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="${/org.apache.hadoop/hadoop-mapreduce-client-core}" conf="compile->*" />
<dependency org="net.sourceforge.argparse4j" name="argparse4j" rev="${/net.sourceforge.argparse4j/argparse4j}" conf="compile->*" />
- <dependency org="com.cloudera.cdk" name="cdk-morphlines-saxon" rev="${/com.cloudera.cdk/cdk-morphlines-saxon}" conf="compile->*" />
+ <dependency org="org.kitesdk" name="kite-morphlines-saxon" rev="${/org.kitesdk/kite-morphlines-saxon}" conf="compile->*" />
<dependency org="net.sf.saxon" name="Saxon-HE" rev="${/net.sf.saxon/Saxon-HE}" conf="compile->*" />
- <dependency org="com.cloudera.cdk" name="cdk-morphlines-hadoop-sequencefile" rev="${/com.cloudera.cdk/cdk-morphlines-hadoop-sequencefile}" conf="compile->*" />
+ <dependency org="org.kitesdk" name="kite-morphlines-hadoop-sequencefile" rev="${/org.kitesdk/kite-morphlines-hadoop-sequencefile}" conf="compile->*" />
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}" />
</dependencies>
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java Wed Jan 15 21:39:04 2014
@@ -82,7 +82,7 @@ import org.apache.solr.hadoop.morphline.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.cloudera.cdk.morphline.base.Fields;
+import org.kitesdk.morphline.base.Fields;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import com.google.common.io.ByteStreams;
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java Wed Jan 15 21:39:04 2014
@@ -30,8 +30,8 @@ import org.apache.solr.hadoop.dedup.Upda
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.cloudera.cdk.morphline.api.ExceptionHandler;
-import com.cloudera.cdk.morphline.base.FaultTolerance;
+import org.kitesdk.morphline.api.ExceptionHandler;
+import org.kitesdk.morphline.base.FaultTolerance;
import com.google.common.base.Preconditions;
/**
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java Wed Jan 15 21:39:04 2014
@@ -39,15 +39,15 @@ import org.apache.solr.schema.IndexSchem
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.MetricRegistry;
import com.codahale.metrics.Timer;
import com.google.common.annotations.Beta;
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/loadSolrBasic.conf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/loadSolrBasic.conf?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/loadSolrBasic.conf (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/loadSolrBasic.conf Wed Jan 15 21:39:04 2014
@@ -39,7 +39,7 @@ SOLR_LOCATOR : ${?ENV_SOLR_LOCATOR}
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**", "org.apache.solr.**"]
+ importCommands : ["org.kitesdk.**", "org.apache.solr.**"]
commands : [
{
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellDocumentTypes.conf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellDocumentTypes.conf?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellDocumentTypes.conf (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellDocumentTypes.conf Wed Jan 15 21:39:04 2014
@@ -22,7 +22,7 @@
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**", "org.apache.solr.**"]
+ importCommands : ["org.kitesdk.**", "org.apache.solr.**"]
commands : [
{ separateAttachments {} }
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellJPGCompressed.conf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellJPGCompressed.conf?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellJPGCompressed.conf (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellJPGCompressed.conf Wed Jan 15 21:39:04 2014
@@ -25,7 +25,7 @@
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**", "org.apache.solr.**"]
+ importCommands : ["org.kitesdk.**", "org.apache.solr.**"]
commands : [
{ separateAttachments {} }
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellXML.conf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellXML.conf?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellXML.conf (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellXML.conf Wed Jan 15 21:39:04 2014
@@ -25,7 +25,7 @@
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**", "org.apache.solr.**"]
+ importCommands : ["org.kitesdk.**", "org.apache.solr.**"]
commands : [
{
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tokenizeText.conf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tokenizeText.conf?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tokenizeText.conf (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tokenizeText.conf Wed Jan 15 21:39:04 2014
@@ -16,7 +16,7 @@
morphlines : [
{
id : morphline1
- importCommands : ["com.cloudera.**", "org.apache.solr.**"]
+ importCommands : ["org.kitesdk.**", "org.apache.solr.**"]
commands : [
{
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tutorialReadAvroContainer.conf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tutorialReadAvroContainer.conf?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tutorialReadAvroContainer.conf (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test-files/test-morphlines/tutorialReadAvroContainer.conf Wed Jan 15 21:39:04 2014
@@ -44,7 +44,7 @@ morphlines : [
# Import all morphline commands in these java packages and their subpackages.
# Other commands that may be present on the classpath are not visible to this morphline.
- importCommands : ["com.cloudera.**", "org.apache.solr.**"]
+ importCommands : ["org.kitesdk.**", "org.apache.solr.**"]
commands : [
{
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/ivy.xml?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/ivy.xml Wed Jan 15 21:39:04 2014
@@ -25,10 +25,10 @@
</configurations>
<dependencies>
- <dependency org="com.cloudera.cdk" name="cdk-morphlines-tika-core" rev="${/com.cloudera.cdk/cdk-morphlines-tika-core}" conf="compile->*" />
- <dependency org="com.cloudera.cdk" name="cdk-morphlines-tika-decompress" rev="${/com.cloudera.cdk/cdk-morphlines-tika-decompress}" conf="compile->*" />
- <dependency org="com.cloudera.cdk" name="cdk-morphlines-json" rev="${/com.cloudera.cdk/cdk-morphlines-json}" conf="compile->*" />
- <dependency org="com.cloudera.cdk" name="cdk-morphlines-twitter" rev="${/com.cloudera.cdk/cdk-morphlines-twitter}" conf="compile->*" />
+ <dependency org="org.kitesdk" name="kite-morphlines-tika-core" rev="${/org.kitesdk/kite-morphlines-tika-core}" conf="compile->*" />
+ <dependency org="org.kitesdk" name="kite-morphlines-tika-decompress" rev="${/org.kitesdk/kite-morphlines-tika-decompress}" conf="compile->*" />
+ <dependency org="org.kitesdk" name="kite-morphlines-json" rev="${/org.kitesdk/kite-morphlines-json}" conf="compile->*" />
+ <dependency org="org.kitesdk" name="kite-morphlines-twitter" rev="${/org.kitesdk/kite-morphlines-twitter}" conf="compile->*" />
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}" />
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java Wed Jan 15 21:39:04 2014
@@ -55,15 +55,15 @@ import org.apache.xml.serialize.XMLSeria
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import com.cloudera.cdk.morphline.api.Command;
-import com.cloudera.cdk.morphline.api.CommandBuilder;
-import com.cloudera.cdk.morphline.api.MorphlineCompilationException;
-import com.cloudera.cdk.morphline.api.MorphlineContext;
-import com.cloudera.cdk.morphline.api.MorphlineRuntimeException;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.Configs;
-import com.cloudera.cdk.morphline.base.Fields;
-import com.cloudera.cdk.morphline.stdio.AbstractParser;
+import org.kitesdk.morphline.api.Command;
+import org.kitesdk.morphline.api.CommandBuilder;
+import org.kitesdk.morphline.api.MorphlineCompilationException;
+import org.kitesdk.morphline.api.MorphlineContext;
+import org.kitesdk.morphline.api.MorphlineRuntimeException;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.Configs;
+import org.kitesdk.morphline.base.Fields;
+import org.kitesdk.morphline.stdio.AbstractParser;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.ArrayListMultimap;
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/ivy.xml?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/ivy.xml Wed Jan 15 21:39:04 2014
@@ -27,12 +27,12 @@
</configurations>
<dependencies>
- <dependency org="com.cloudera.cdk" name="cdk-morphlines-core" rev="${/com.cloudera.cdk/cdk-morphlines-core}" conf="compile->*;test->*" >
- <artifact name="cdk-morphlines-core" ext="jar"/>
- <artifact name="cdk-morphlines-core" type="test" ext="jar" maven:classifier="tests"/>
+ <dependency org="org.kitesdk" name="kite-morphlines-core" rev="${/org.kitesdk/kite-morphlines-core}" conf="compile->*;test->*" >
+ <artifact name="kite-morphlines-core" ext="jar"/>
+ <artifact name="kite-morphlines-core" type="test" ext="jar" maven:classifier="tests"/>
</dependency>
- <dependency org="com.cloudera.cdk" name="cdk-morphlines-avro" rev="${/com.cloudera.cdk/cdk-morphlines-avro}" conf="compile->*" />
+ <dependency org="org.kitesdk" name="kite-morphlines-avro" rev="${/org.kitesdk/kite-morphlines-avro}" conf="compile->*" />
<dependency org="com.codahale.metrics" name="metrics-core" rev="${/com.codahale.metrics/metrics-core}" conf="compile->*" />
<dependency org="com.codahale.metrics" name="metrics-healthchecks" rev="${/com.codahale.metrics/metrics-healthchecks}" conf="compile->*" />
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java Wed Jan 15 21:39:04 2014
@@ -23,15 +23,15 @@ import java.util.Random;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
+import org.kitesdk.morphline.api.Command;
+import org.kitesdk.morphline.api.CommandBuilder;
+import org.kitesdk.morphline.api.MorphlineContext;
+import org.kitesdk.morphline.api.MorphlineRuntimeException;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.AbstractCommand;
+import org.kitesdk.morphline.base.Fields;
+import org.kitesdk.morphline.base.Notifications;
-import com.cloudera.cdk.morphline.api.Command;
-import com.cloudera.cdk.morphline.api.CommandBuilder;
-import com.cloudera.cdk.morphline.api.MorphlineContext;
-import com.cloudera.cdk.morphline.api.MorphlineRuntimeException;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.AbstractCommand;
-import com.cloudera.cdk.morphline.base.Fields;
-import com.cloudera.cdk.morphline.base.Notifications;
import com.typesafe.config.Config;
/**
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java Wed Jan 15 21:39:04 2014
@@ -25,15 +25,15 @@ import java.util.Map;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.common.SolrInputDocument;
-import com.cloudera.cdk.morphline.api.Command;
-import com.cloudera.cdk.morphline.api.CommandBuilder;
-import com.cloudera.cdk.morphline.api.MorphlineContext;
-import com.cloudera.cdk.morphline.api.MorphlineRuntimeException;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.AbstractCommand;
-import com.cloudera.cdk.morphline.base.Configs;
-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.CommandBuilder;
+import org.kitesdk.morphline.api.MorphlineContext;
+import org.kitesdk.morphline.api.MorphlineRuntimeException;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.AbstractCommand;
+import org.kitesdk.morphline.base.Configs;
+import org.kitesdk.morphline.base.Metrics;
+import org.kitesdk.morphline.base.Notifications;
import com.codahale.metrics.Timer;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java Wed Jan 15 21:39:04 2014
@@ -24,11 +24,11 @@ import java.util.TreeMap;
import org.apache.solr.schema.IndexSchema;
-import com.cloudera.cdk.morphline.api.Command;
-import com.cloudera.cdk.morphline.api.CommandBuilder;
-import com.cloudera.cdk.morphline.api.MorphlineContext;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.AbstractCommand;
+import org.kitesdk.morphline.api.Command;
+import org.kitesdk.morphline.api.CommandBuilder;
+import org.kitesdk.morphline.api.MorphlineContext;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.AbstractCommand;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.typesafe.config.Config;
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java Wed Jan 15 21:39:04 2014
@@ -16,12 +16,15 @@
*/
package org.apache.solr.morphlines.solr;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import javax.xml.parsers.ParserConfigurationException;
-
+import org.kitesdk.morphline.api.MorphlineCompilationException;
+import org.kitesdk.morphline.api.MorphlineContext;
+import org.kitesdk.morphline.api.MorphlineRuntimeException;
+import org.kitesdk.morphline.base.Configs;
+import com.google.common.base.Preconditions;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigRenderOptions;
+import com.typesafe.config.ConfigUtil;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.impl.CloudSolrServer;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -35,15 +38,9 @@ import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import com.cloudera.cdk.morphline.api.MorphlineCompilationException;
-import com.cloudera.cdk.morphline.api.MorphlineContext;
-import com.cloudera.cdk.morphline.api.MorphlineRuntimeException;
-import com.cloudera.cdk.morphline.base.Configs;
-import com.google.common.base.Preconditions;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-import com.typesafe.config.ConfigRenderOptions;
-import com.typesafe.config.ConfigUtil;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
/**
* Set of configuration parameters that identify the location and schema of a Solr server or
@@ -94,14 +91,10 @@ public class SolrLocator {
if (collectionName == null || collectionName.length() == 0) {
throw new MorphlineCompilationException("Parameter 'zkHost' requires that you also pass parameter 'collection'", config);
}
- try {
- CloudSolrServer cloudSolrServer = new CloudSolrServer(zkHost);
- cloudSolrServer.setDefaultCollection(collectionName);
- cloudSolrServer.connect();
- return new SolrServerDocumentLoader(cloudSolrServer, batchSize);
- } catch (MalformedURLException e) {
- throw new MorphlineRuntimeException(e);
- }
+ CloudSolrServer cloudSolrServer = new CloudSolrServer(zkHost);
+ cloudSolrServer.setDefaultCollection(collectionName);
+ cloudSolrServer.connect();
+ return new SolrServerDocumentLoader(cloudSolrServer, batchSize);
} else {
if (solrUrl == null || solrUrl.length() == 0) {
throw new MorphlineCompilationException("Missing parameter 'solrUrl'", config);
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrMorphlineContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrMorphlineContext.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrMorphlineContext.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrMorphlineContext.java Wed Jan 15 21:39:04 2014
@@ -18,7 +18,7 @@ package org.apache.solr.morphlines.solr;
import org.apache.solr.schema.IndexSchema;
-import com.cloudera.cdk.morphline.api.MorphlineContext;
+import org.kitesdk.morphline.api.MorphlineContext;
/**
* A context that is specific to Solr.
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java Wed Jan 15 21:39:04 2014
@@ -28,13 +28,13 @@ import org.apache.lucene.analysis.tokena
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
-import com.cloudera.cdk.morphline.api.Command;
-import com.cloudera.cdk.morphline.api.CommandBuilder;
-import com.cloudera.cdk.morphline.api.MorphlineCompilationException;
-import com.cloudera.cdk.morphline.api.MorphlineContext;
-import com.cloudera.cdk.morphline.api.MorphlineRuntimeException;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.AbstractCommand;
+import org.kitesdk.morphline.api.Command;
+import org.kitesdk.morphline.api.CommandBuilder;
+import org.kitesdk.morphline.api.MorphlineCompilationException;
+import org.kitesdk.morphline.api.MorphlineContext;
+import org.kitesdk.morphline.api.MorphlineRuntimeException;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.AbstractCommand;
import com.google.common.base.Preconditions;
import com.typesafe.config.Config;
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java Wed Jan 15 21:39:04 2014
@@ -44,15 +44,15 @@ import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.cloudera.cdk.morphline.api.Collector;
-import com.cloudera.cdk.morphline.api.Command;
-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.Notifications;
-import com.cloudera.cdk.morphline.stdlib.PipeBuilder;
+import org.kitesdk.morphline.api.Collector;
+import org.kitesdk.morphline.api.Command;
+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.Notifications;
+import org.kitesdk.morphline.stdlib.PipeBuilder;
import com.codahale.metrics.MetricRegistry;
import com.google.common.io.Files;
import com.typesafe.config.Config;
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java Wed Jan 15 21:39:04 2014
@@ -34,14 +34,14 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.cloudera.cdk.morphline.api.Command;
-import com.cloudera.cdk.morphline.api.Collector;
-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.Notifications;
-import com.cloudera.cdk.morphline.stdlib.PipeBuilder;
+import org.kitesdk.morphline.api.Command;
+import org.kitesdk.morphline.api.Collector;
+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.Notifications;
+import org.kitesdk.morphline.stdlib.PipeBuilder;
import com.codahale.metrics.MetricRegistry;
import com.google.common.collect.ListMultimap;
import com.typesafe.config.Config;
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java Wed Jan 15 21:39:04 2014
@@ -22,9 +22,9 @@ import org.apache.lucene.util.Constants;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.Fields;
-import com.cloudera.cdk.morphline.base.Notifications;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.Fields;
+import org.kitesdk.morphline.base.Notifications;
public class SolrMorphlineTest extends AbstractSolrMorphlineTestBase {
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java Wed Jan 15 21:39:04 2014
@@ -39,9 +39,9 @@ import com.carrotsearch.randomizedtestin
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Consequence;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.Fields;
-import com.cloudera.cdk.morphline.base.Notifications;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.Fields;
+import org.kitesdk.morphline.base.Notifications;
@ThreadLeakAction({Action.WARN})
@ThreadLeakLingering(linger = 0)
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java Wed Jan 15 21:39:04 2014
@@ -43,9 +43,9 @@ import com.carrotsearch.randomizedtestin
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Consequence;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.Fields;
-import com.cloudera.cdk.morphline.base.Notifications;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.Fields;
+import org.kitesdk.morphline.base.Notifications;
import com.google.common.base.Preconditions;
import com.google.common.io.Files;
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java?rev=1558572&r1=1558571&r2=1558572&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java Wed Jan 15 21:39:04 2014
@@ -33,9 +33,9 @@ import com.carrotsearch.randomizedtestin
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Consequence;
-import com.cloudera.cdk.morphline.api.Record;
-import com.cloudera.cdk.morphline.base.Fields;
-import com.cloudera.cdk.morphline.base.Notifications;
+import org.kitesdk.morphline.api.Record;
+import org.kitesdk.morphline.base.Fields;
+import org.kitesdk.morphline.base.Notifications;
@ThreadLeakAction({Action.WARN})
@ThreadLeakLingering(linger = 0)