Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15733: Separate out a solrj-streaming module (#1099)

Joel Bernsteindb28836ac463
diff --git a/settings.gradle b/settings.gradle
index 83476e73ad9..1ae8f59846c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,6 +28,7 @@ includeBuild("dev-tools/solr-missing-doclet")
include "solr:solrj"
include "solr:solrj-zookeeper"
+include "solr:solrj-streaming"
include "solr:core"
include "solr:server"
include "solr:modules:analysis-extras"
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 570a2a645e5..51b4d0780ed 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -68,6 +68,8 @@ dependencies {
api project(':solr:solrj')
api project(':solr:solrj-zookeeper')
+ api project(':solr:solrj-streaming')
+
api 'io.dropwizard.metrics:metrics-core'
implementation ('io.dropwizard.metrics:metrics-graphite', {
diff --git a/solr/modules/sql/build.gradle b/solr/modules/sql/build.gradle
index 4cbfe402eb5..45695e1dc22 100644
--- a/solr/modules/sql/build.gradle
+++ b/solr/modules/sql/build.gradle
@@ -22,6 +22,7 @@ description = 'SQL Module'
dependencies {
implementation project(':solr:core')
implementation project(':solr:solrj')
+ implementation project(':solr:solrj-streaming')
implementation project(':solr:solrj-zookeeper')
implementation 'org.slf4j:slf4j-api'
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc
index d8e11837f0c..64156f54af8 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solrj.adoc
@@ -56,6 +56,8 @@ compile group: 'org.apache.solr', name: 'solr-solrj', version: '{solr-full-versi
If you want to use `CloudSolrClient` _and_ have it talk directly to ZooKeeper, you will need to add a dependency on the `solr-solrj-zookeeper` artifact.
+If you want to build and use xref:query-guide:streaming-expressions.adoc[Streaming Expressions] classes in your Java code, you will need to add a dependency on the `solr-solrj-streaming` artifact.
+
=== Adding SolrJ to the Classpath Manually
If you are not using one of the above build system, it's still easy to add SolrJ to your build.
diff --git a/solr/solr-ref-guide/modules/query-guide/pages/stream-decorator-reference.adoc b/solr/solr-ref-guide/modules/query-guide/pages/stream-decorator-reference.adoc
index 5f5e590d38a..be9c83b970c 100644
--- a/solr/solr-ref-guide/modules/query-guide/pages/stream-decorator-reference.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/pages/stream-decorator-reference.adoc
@@ -571,7 +571,7 @@ This command will stop a specific daemon function and remove it from memory.
=== Continuous Pull Streaming
-The {solr-javadocs}/solrj/org/apache/solr/client/solrj/io/stream/DaemonStream.html[DaemonStream] java class (part of the SolrJ libraries) can also be embedded in a java application to provide continuous pull streaming.
+The {solr-javadocs}/solrj-streaming/org/apache/solr/client/solrj/io/stream/DaemonStream.html[DaemonStream] java class (part of the SolrJ libraries) can also be embedded in a java application to provide continuous pull streaming.
Sample code:
[source,java]
diff --git a/solr/solrj-streaming/build.gradle b/solr/solrj-streaming/build.gradle
new file mode 100644
index 00000000000..9e4b6b4f3cc
--- /dev/null
+++ b/solr/solrj-streaming/build.gradle
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'java-library'
+
+description = 'Solrj-Streaming - SolrJ requiring Streaming Expressions'
+
+dependencies {
+ implementation project(':solr:solrj')
+
+ // declare dependencies we use even though already declared by solrj-core
+ implementation 'org.slf4j:slf4j-api'
+ implementation 'org.apache.httpcomponents:httpclient'
+ implementation 'org.apache.httpcomponents:httpcore'
+ implementation 'org.apache.commons:commons-math3'
+
+ testImplementation project(':solr:test-framework')
+ testImplementation project(':solr:core')
+ testImplementation project(':solr:solrj-zookeeper')
+
+ testRuntimeOnly project(':solr:modules:sql')
+ testRuntimeOnly "org.hsqldb:hsqldb" // runtime because via JDBC reflection
+
+ testImplementation 'com.carrotsearch.randomizedtesting:randomizedtesting-runner'
+ testImplementation 'org.apache.lucene:lucene-test-framework'
+ testImplementation 'junit:junit'
+
+ testImplementation('org.apache.zookeeper:zookeeper', {
+ exclude group: "org.apache.yetus", module: "audience-annotations"
+ })
+ permitTestUnusedDeclared 'org.apache.zookeeper:zookeeper'
+
+ permitTestUsedUndeclared project(':solr:solrj-streaming') // duh!
+}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ClassificationEvaluation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ClassificationEvaluation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ClassificationEvaluation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ClassificationEvaluation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/Lang.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/Lang.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ModelCache.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ModelCache.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Tuple.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/Tuple.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/Tuple.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/Tuple.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorLambda.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/ComparatorLambda.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorLambda.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/ComparatorLambda.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorOrder.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/ComparatorOrder.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorOrder.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/ComparatorOrder.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/SingleValueComparator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/SingleValueComparator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/SingleValueComparator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/SingleValueComparator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/StreamComparator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/StreamComparator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/StreamComparator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/StreamComparator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/package-info.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/Equalitor.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/Equalitor.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/Equalitor.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/Equalitor.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/StreamEqualitor.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/StreamEqualitor.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/StreamEqualitor.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/StreamEqualitor.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/package-info.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AbsoluteValueEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AbsoluteValueEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AbsoluteValueEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AbsoluteValueEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AddEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AddEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AddEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AddEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AkimaEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AkimaEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AkimaEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AkimaEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AndEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AndEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AndEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AndEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AppendEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AppendEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AppendEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AppendEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArcCosineEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ArcCosineEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArcCosineEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ArcCosineEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArcSineEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ArcSineEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArcSineEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ArcSineEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArcTangentEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ArcTangentEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArcTangentEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ArcTangentEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArrayEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ArrayEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArrayEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ArrayEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AscEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AscEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AscEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/AscEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/Attributes.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Attributes.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/Attributes.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Attributes.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/BetaDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BetaDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/BetaDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BetaDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/BicubicSplineEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BicubicSplineEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/BicubicSplineEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BicubicSplineEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/BinomialCoefficientEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BinomialCoefficientEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/BinomialCoefficientEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BinomialCoefficientEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/BinomialDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BinomialDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/BinomialDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BinomialDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CanberraEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CanberraEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CanberraEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CanberraEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CeilingEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CeilingEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CeilingEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CeilingEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ChebyshevDistanceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ChebyshevDistanceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ChebyshevDistanceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ChebyshevDistanceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ChebyshevEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ChebyshevEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ChebyshevEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ChebyshevEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ChiSquareDataSetEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ChiSquareDataSetEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ChiSquareDataSetEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ChiSquareDataSetEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CoalesceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CoalesceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CoalesceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CoalesceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ColumnAtEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ColumnAtEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ColumnAtEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ColumnAtEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ColumnCountEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ColumnCountEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ColumnCountEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ColumnCountEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ColumnEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ColumnEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ColumnEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ColumnEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConcatEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConcatEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConcatEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConcatEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConstantDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConstantDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConstantDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConstantDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConversionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConversionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConversionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConversionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvexHullEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConvexHullEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvexHullEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConvexHullEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CopyOfEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CopyOfEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfRangeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CopyOfRangeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfRangeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CopyOfRangeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationSignificanceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CorrelationSignificanceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationSignificanceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CorrelationSignificanceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CosineDistanceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CosineDistanceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CosineDistanceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CosineDistanceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CosineEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CosineEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CosineEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CosineEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CosineSimilarityEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CosineSimilarityEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CosineSimilarityEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CosineSimilarityEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CubedRootEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CubedRootEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CubedRootEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CubedRootEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CumulativeProbabilityEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CumulativeProbabilityEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CumulativeProbabilityEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/CumulativeProbabilityEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DateEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DateEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DateEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DateEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DbscanEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DbscanEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DbscanEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DbscanEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DensityEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DensityEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DensityEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DensityEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DerivativeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DerivativeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DerivativeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DerivativeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DescribeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DescribeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DescribeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DescribeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DivideEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DivideEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DivideEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DivideEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DotProductEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DotProductEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DotProductEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DotProductEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DoubleEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DoubleEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DoubleEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/DoubleEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EBEAddEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EBEAddEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EBEAddEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EBEAddEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EBEDivideEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EBEDivideEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EBEDivideEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EBEDivideEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EBEMultiplyEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EBEMultiplyEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EBEMultiplyEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EBEMultiplyEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EBESubtractEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EBESubtractEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EBESubtractEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EBESubtractEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EarthMoversEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EarthMoversEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EarthMoversEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EarthMoversEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EmpiricalDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EmpiricalDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EmpiricalDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EmpiricalDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EnclosingDiskEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EnclosingDiskEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EnclosingDiskEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EnclosingDiskEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EnumeratedDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EnumeratedDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EnumeratedDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EnumeratedDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EqualToEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EqualToEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EqualToEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EqualToEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EuclideanDistanceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EuclideanDistanceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EuclideanDistanceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EuclideanDistanceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EuclideanEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EuclideanEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EuclideanEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EuclideanEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EvaluatorException.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EvaluatorException.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EvaluatorException.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/EvaluatorException.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ExclusiveOrEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ExclusiveOrEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ExclusiveOrEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ExclusiveOrEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ExponentialMovingAverageEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ExponentialMovingAverageEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ExponentialMovingAverageEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ExponentialMovingAverageEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FFTEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FFTEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FFTEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FFTEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FactorialEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FactorialEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FactorialEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FactorialEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FeatureSelectEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FeatureSelectEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FeatureSelectEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FeatureSelectEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FieldValueEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FieldValueEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FieldValueEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FieldValueEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FloorEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FloorEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FloorEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FloorEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FrequencyTableEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FrequencyTableEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FrequencyTableEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FrequencyTableEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FuzzyKmeansEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FuzzyKmeansEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FuzzyKmeansEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/FuzzyKmeansEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GTestDataSetEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GTestDataSetEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GTestDataSetEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GTestDataSetEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GammaDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GammaDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GammaDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GammaDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GaussFitEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GaussFitEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GaussFitEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GaussFitEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GeometricDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GeometricDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GeometricDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GeometricDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAmplitudeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAmplitudeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAmplitudeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAmplitudeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAngularFrequencyEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAngularFrequencyEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAngularFrequencyEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAngularFrequencyEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAreaEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAreaEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAreaEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAreaEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAttributeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAttributeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAttributeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAttributeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAttributesEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAttributesEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetAttributesEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetAttributesEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetBaryCenterEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetBaryCenterEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetBaryCenterEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetBaryCenterEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetBoundarySizeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetBoundarySizeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetBoundarySizeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetBoundarySizeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetCacheEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetCacheEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetCacheEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetCacheEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetCenterEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetCenterEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetCenterEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetCenterEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetCentroidsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetCentroidsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetCentroidsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetCentroidsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetClusterEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetClusterEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetClusterEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetClusterEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetColumnLabelsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetColumnLabelsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetColumnLabelsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetColumnLabelsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetMembershipMatrixEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetMembershipMatrixEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetMembershipMatrixEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetMembershipMatrixEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetPhaseEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetPhaseEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetPhaseEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetPhaseEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetRadiusEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetRadiusEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetRadiusEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetRadiusEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetRowLabelsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetRowLabelsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetRowLabelsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetRowLabelsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetSupportPointsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetSupportPointsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetSupportPointsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetSupportPointsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetValueEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetValueEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetValueEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetValueEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetVerticesEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetVerticesEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GetVerticesEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GetVerticesEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GrandSumEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GrandSumEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GrandSumEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GrandSumEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GreaterThanEqualToEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GreaterThanEqualToEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GreaterThanEqualToEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GreaterThanEqualToEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GreaterThanEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GreaterThanEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GreaterThanEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/GreaterThanEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HarmonicFitEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HarmonicFitEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HarmonicFitEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HarmonicFitEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HistogramEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HistogramEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HistogramEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HistogramEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicCosineEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicCosineEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicCosineEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicCosineEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicSineEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicSineEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicSineEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicSineEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicTangentEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicTangentEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicTangentEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/HyperbolicTangentEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IFFTEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IFFTEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IFFTEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IFFTEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IfThenElseEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IfThenElseEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IfThenElseEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IfThenElseEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IndexOfEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IndexOfEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IndexOfEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IndexOfEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IntegrateEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IntegrateEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IntegrateEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IntegrateEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IsNullEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IsNullEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IsNullEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IsNullEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/KmeansEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KmeansEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/KmeansEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KmeansEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/KnnEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KnnEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/KnnEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KnnEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/KnnRegressionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KnnRegressionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/KnnRegressionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KnnRegressionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/KolmogorovSmirnovEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KolmogorovSmirnovEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/KolmogorovSmirnovEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KolmogorovSmirnovEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/L1NormEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/L1NormEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/L1NormEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/L1NormEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LInfNormEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LInfNormEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LInfNormEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LInfNormEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LatLonVectorsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LatLonVectorsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LatLonVectorsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LatLonVectorsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LeftShiftEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LeftShiftEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LeftShiftEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LeftShiftEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LengthEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LengthEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LengthEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LengthEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LerpEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LerpEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LerpEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LerpEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LessThanEqualToEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LessThanEqualToEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LessThanEqualToEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LessThanEqualToEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LessThanEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LessThanEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LessThanEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LessThanEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ListCacheEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ListCacheEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ListCacheEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ListCacheEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LoessEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LoessEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LoessEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LoessEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/Log10Evaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Log10Evaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/Log10Evaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Log10Evaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LogNormalDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LogNormalDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LogNormalDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LogNormalDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LongEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LongEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LongEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LongEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LowerEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LowerEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LowerEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/LowerEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ManhattanEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ManhattanEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ManhattanEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ManhattanEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MannWhitneyUEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MannWhitneyUEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MannWhitneyUEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MannWhitneyUEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ManyValueWorker.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ManyValueWorker.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ManyValueWorker.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ManyValueWorker.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MarkovChainEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MarkovChainEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MarkovChainEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MarkovChainEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MatchesEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MatchesEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MatchesEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MatchesEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/Matrix.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Matrix.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/Matrix.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Matrix.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MatrixEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MatrixEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MatrixEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MatrixEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MatrixMultiplyEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MatrixMultiplyEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MatrixMultiplyEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MatrixMultiplyEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MeanDifferenceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MeanDifferenceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MeanDifferenceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MeanDifferenceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MeanEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MeanEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MeanEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MeanEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MemsetEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MemsetEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MemsetEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MemsetEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MinMaxScaleEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MinMaxScaleEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MinMaxScaleEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MinMaxScaleEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ModeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ModeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ModeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ModeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ModuloEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ModuloEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ModuloEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ModuloEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MonteCarloEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MonteCarloEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MonteCarloEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MonteCarloEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingAverageEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MovingAverageEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingAverageEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MovingAverageEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingMADEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MovingMADEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingMADEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MovingMADEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingMedianEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MovingMedianEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingMedianEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MovingMedianEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MultiKmeansEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MultiKmeansEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MultiKmeansEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MultiKmeansEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MultiVariateNormalDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MultiVariateNormalDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MultiVariateNormalDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MultiVariateNormalDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MultiplyEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MultiplyEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MultiplyEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/MultiplyEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NaturalEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NaturalEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NaturalEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NaturalEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NaturalLogEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NaturalLogEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NaturalLogEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NaturalLogEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NormEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NormEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NormalDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NormalDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeSumEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NormalizeSumEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeSumEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NormalizeSumEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NotEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NotEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NotEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NotEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NotNullEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NotNullEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NotNullEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NotNullEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OLSRegressionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OLSRegressionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OLSRegressionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OLSRegressionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OneValueWorker.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OneValueWorker.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OneValueWorker.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OneValueWorker.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OnesEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OnesEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OnesEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OnesEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OrEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OrEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OrEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OrEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OscillateEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OscillateEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OscillateEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OscillateEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OutliersEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OutliersEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/OutliersEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/OutliersEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PairSortEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PairSortEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PairSortEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PairSortEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PairedTTestEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PairedTTestEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PairedTTestEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PairedTTestEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PivotEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PivotEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PivotEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PivotEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PoissonDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PoissonDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PoissonDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PoissonDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PolyFitDerivativeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PolyFitDerivativeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PolyFitDerivativeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PolyFitDerivativeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PolyFitEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PolyFitEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PolyFitEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PolyFitEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PowerEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PowerEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PowerEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PowerEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PrecisionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PrecisionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PrecisionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PrecisionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PrimesEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PrimesEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PrimesEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PrimesEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ProbabilityEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ProbabilityEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ProbabilityEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ProbabilityEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ProjectToBorderEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ProjectToBorderEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ProjectToBorderEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ProjectToBorderEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PutCacheEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PutCacheEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PutCacheEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PutCacheEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RawValueEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RawValueEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RawValueEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RawValueEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecNumEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecNumEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecNumEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecNumEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecipEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecipEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecipEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecipEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveBooleanEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveBooleanEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveBooleanEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveBooleanEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveNumericEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveNumericEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveNumericEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveNumericEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveNumericListEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveNumericListEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveNumericListEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveNumericListEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveObjectEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveObjectEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveObjectEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveObjectEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveTemporalEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveTemporalEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RecursiveTemporalEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveTemporalEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RegressionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RegressionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RegressionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RegressionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RemoveCacheEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RemoveCacheEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RemoveCacheEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RemoveCacheEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RepeatEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RepeatEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RepeatEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RepeatEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RightShiftEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RightShiftEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RightShiftEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RightShiftEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RoundEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RoundEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RoundEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RoundEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RowAtEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RowAtEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RowAtEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RowAtEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RowCountEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RowCountEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RowCountEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RowCountEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SampleEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SampleEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SampleEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SampleEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScalarAddEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScalarAddEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScalarAddEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScalarAddEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScalarDivideEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScalarDivideEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScalarDivideEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScalarDivideEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScalarMultiplyEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScalarMultiplyEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScalarMultiplyEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScalarMultiplyEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScalarSubtractEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScalarSubtractEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScalarSubtractEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScalarSubtractEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SetColumnLabelsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SetColumnLabelsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SetColumnLabelsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SetColumnLabelsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SetRowLabelsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SetRowLabelsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SetRowLabelsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SetRowLabelsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SetValueEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SetValueEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SetValueEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SetValueEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SineEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SineEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SineEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SineEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SourceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SourceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SourceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SourceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SplineEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SplineEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SplineEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SplineEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SplitEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SplitEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SplitEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SplitEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SquareRootEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SquareRootEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SquareRootEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SquareRootEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/StandardDeviationEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/StandardDeviationEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/StandardDeviationEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/StandardDeviationEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/StreamEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/StreamEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/StreamEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/StreamEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/StreamEvaluatorException.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/StreamEvaluatorException.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/StreamEvaluatorException.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/StreamEvaluatorException.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SubtractEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SubtractEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SubtractEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SubtractEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SumColumnsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SumColumnsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SumColumnsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SumColumnsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SumDifferenceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SumDifferenceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SumDifferenceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SumDifferenceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SumRowsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SumRowsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SumRowsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SumRowsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SumSqEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SumSqEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SumSqEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/SumSqEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TTestEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TTestEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TTestEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TTestEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TangentEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TangentEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TangentEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TangentEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDay.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDay.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDay.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDay.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfQuarter.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfQuarter.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfQuarter.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfQuarter.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfYear.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfYear.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfYear.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfYear.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorEpoch.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorEpoch.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorEpoch.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorEpoch.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorHour.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorHour.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorHour.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorHour.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMinute.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMinute.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMinute.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMinute.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMonth.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMonth.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMonth.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMonth.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorQuarter.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorQuarter.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorQuarter.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorQuarter.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorSecond.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorSecond.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorSecond.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorSecond.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorWeek.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorWeek.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorWeek.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorWeek.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorYear.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorYear.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorYear.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorYear.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TermVectorsEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TermVectorsEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TermVectorsEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TermVectorsEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TimeDifferencingEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TimeDifferencingEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TimeDifferencingEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TimeDifferencingEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TopFeaturesEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TopFeaturesEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TopFeaturesEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TopFeaturesEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TransposeEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TransposeEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TransposeEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TransposeEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TriangularDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TriangularDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TriangularDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TriangularDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TrimEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TrimEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TrimEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TrimEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TruncEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TruncEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TruncEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TruncEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TwoValueWorker.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TwoValueWorker.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TwoValueWorker.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/TwoValueWorker.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UniformDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UniformDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UniformDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UniformDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UniformIntegerDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UniformIntegerDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UniformIntegerDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UniformIntegerDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UnitEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UnitEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UnitEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UnitEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UpperEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UpperEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UpperEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UpperEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UuidEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UuidEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UuidEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/UuidEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ValueAtEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ValueAtEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ValueAtEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ValueAtEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ValueWorker.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ValueWorker.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ValueWorker.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ValueWorker.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/VarianceEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/VarianceEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/VarianceEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/VarianceEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/VectorFunction.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/VectorFunction.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/VectorFunction.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/VectorFunction.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/WeibullDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/WeibullDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/WeibullDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/WeibullDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ZerosEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ZerosEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ZerosEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ZerosEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ZipFDistributionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ZipFDistributionEvaluator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ZipFDistributionEvaluator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ZipFDistributionEvaluator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/package-info.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/Node.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/Node.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/Node.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/Node.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/Traversal.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/Traversal.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/Traversal.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/Traversal.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/TraversalIterator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/TraversalIterator.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/TraversalIterator.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/TraversalIterator.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/package-info.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ConcatOperation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ConcatOperation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ConcatOperation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ConcatOperation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/DistinctOperation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/DistinctOperation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/DistinctOperation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/DistinctOperation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReduceOperation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ReduceOperation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReduceOperation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ReduceOperation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceOperation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ReplaceOperation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceOperation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ReplaceOperation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithFieldOperation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithFieldOperation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithFieldOperation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithFieldOperation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithValueOperation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithValueOperation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithValueOperation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithValueOperation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/StreamOperation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/StreamOperation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/StreamOperation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/StreamOperation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/ops/package-info.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/package-info.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/PreparedStatementImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/PreparedStatementImpl.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/PreparedStatementImpl.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/PreparedStatementImpl.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetMetaDataImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/ResultSetMetaDataImpl.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetMetaDataImpl.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/ResultSetMetaDataImpl.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/package-info.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CalculatorStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CalculatorStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CalculatorStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CalculatorStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CellStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CellStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CellStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CellStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CsvStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CsvStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CsvStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CsvStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeleteStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeleteStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeleteStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeleteStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DrillStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DrillStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DrillStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DrillStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/EchoStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/EchoStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/EchoStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/EchoStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/EvalStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/EvalStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/EvalStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/EvalStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExecutorStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ExecutorStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExecutorStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ExecutorStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/Facet2DStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FetchStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/GetStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/GetStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/GetStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/GetStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HashRollupStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HashRollupStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HashRollupStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HashRollupStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LetStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LetStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LetStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LetStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ListStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ListStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ListStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ListStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/NoOpStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NoOpStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/NoOpStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NoOpStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/NullStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NullStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/NullStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NullStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelMetricsRollup.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelMetricsRollup.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelMetricsRollup.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelMetricsRollup.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PlotStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PlotStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PlotStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PlotStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PriorityStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PriorityStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PriorityStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PriorityStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PushBackStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PushBackStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PushBackStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PushBackStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RandomFacadeStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RandomFacadeStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RandomFacadeStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RandomFacadeStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RandomStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RandomStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RandomStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RandomStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RollupStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RollupStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RollupStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/RollupStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ScoreNodesStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ScoreNodesStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ScoreNodesStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ScoreNodesStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SearchFacadeStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchFacadeStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SearchFacadeStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchFacadeStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SelectStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SelectStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SelectStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SelectStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ShuffleStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ShuffleStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ShuffleStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ShuffleStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TsvStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TsvStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TsvStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TsvStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStreamParser.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupleStreamParser.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStreamParser.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupleStreamParser.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ZplotStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ZplotStream.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ZplotStream.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ZplotStream.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/DefaultStreamFactory.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/DefaultStreamFactory.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/DefaultStreamFactory.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/DefaultStreamFactory.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/Explanation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/Explanation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/Explanation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/Explanation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/Expressible.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/Expressible.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/Expressible.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/Expressible.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectedExpressionException.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectedExpressionException.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectedExpressionException.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectedExpressionException.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectionDefense.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectionDefense.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectionDefense.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/InjectionDefense.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExplanation.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExplanation.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExplanation.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExplanation.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpression.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpression.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpression.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpression.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParameter.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParameter.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParameter.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParameter.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionValue.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionValue.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionValue.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionValue.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Bucket.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/Bucket.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Bucket.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/Bucket.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountDistinctMetric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountDistinctMetric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountDistinctMetric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountDistinctMetric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountMetric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountMetric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountMetric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountMetric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MaxMetric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/MaxMetric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MaxMetric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/MaxMetric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MeanMetric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/MeanMetric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MeanMetric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/MeanMetric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Metric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/Metric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Metric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/Metric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MinMetric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/MinMetric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MinMetric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/MinMetric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/PercentileMetric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/PercentileMetric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/PercentileMetric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/PercentileMetric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/StdMetric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/StdMetric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/StdMetric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/StdMetric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/SumMetric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/SumMetric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/SumMetric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/SumMetric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetric.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetric.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetric.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetric.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/package-info.java
similarity index 100%
rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java
rename to solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/package-info.java
diff --git a/solr/solrj/src/resources/META-INF/services/java.sql.Driver b/solr/solrj-streaming/src/resources/META-INF/services/java.sql.Driver
similarity index 100%
rename from solr/solrj/src/resources/META-INF/services/java.sql.Driver
rename to solr/solrj-streaming/src/resources/META-INF/services/java.sql.Driver
diff --git a/solr/solrj-streaming/src/test-files/solrj/README b/solr/solrj-streaming/src/test-files/solrj/README
new file mode 100644
index 00000000000..10f878acccb
--- /dev/null
+++ b/solr/solrj-streaming/src/test-files/solrj/README
@@ -0,0 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+This directory is where any non-transient, non-java files needed
+for the execution of tests should live.
+
+It is used as the CWD when running JUnit tests.
diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/schema.xml b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/schema.xml
new file mode 100644
index 00000000000..0c9ee9c9688
--- /dev/null
+++ b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/schema.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The Solr schema file. This file should be named "schema.xml" and
+ should be located where the classloader for the Solr webapp can find it.
+
+ This schema is used for testing, and as such has everything and the
+ kitchen sink thrown in. See example/solr/conf/schema.xml for a
+ more concise example.
+
+ -->
+
+<schema name="test" version="1.6">
+
+ <fieldType name="int" docValues="true" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" docValues="true" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+
+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+
+ <fieldType name="random" class="solr.RandomSortField" indexed="true" />
+
+ <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+
+ <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
+ seconds part (.999) is optional.
+ -->
+ <fieldtype name="date" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0"/>
+ <fieldtype name="tdate" class="${solr.tests.DateFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="6"/>
+
+
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="_version_" type="long" indexed="true" stored="true" docValues="true"/>
+
+ <!-- Dynamic field definitions. If a field name is not found, dynamicFields
+ will be used if the name matches any of the patterns.
+ RESTRICTION: the glob-like pattern in the name attribute must have
+ a "*" only at the start or the end.
+ EXAMPLE: name="*_i" will match any field ending in _i (like myid_i, z_i)
+ Longer patterns will be matched first. if equal size patterns
+ both match, the first appearing in the schema will be used.
+ -->
+ <dynamicField name="*_b" type="boolean" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_bs" type="boolean" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_i" type="int" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_is" type="int" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_l" type="long" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_ls" type="long" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_f" type="float" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_fs" type="float" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_d" type="double" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_ds" type="double" indexed="true" stored="true" multiValued="true"/>
+
+ <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_ss" type="string" indexed="true" stored="true" multiValued="true"/>
+ <uniqueKey>id</uniqueKey>
+</schema>
diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
new file mode 100644
index 00000000000..dab985bb68e
--- /dev/null
+++ b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
+-->
+<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+ <indexConfig>
+ <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
+ </indexConfig>
+ <dataDir>${solr.data.dir:}</dataDir>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
+
+ <updateHandler class="solr.DirectUpdateHandler2">
+ <updateLog>
+ <str name="dir">${solr.data.dir:}</str>
+ </updateLog>
+ </updateHandler>
+
+
+ <requestDispatcher>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
+ </requestDispatcher>
+
+ <requestHandler name="/select" class="solr.SearchHandler"/>
+
+</config>
diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml
new file mode 100644
index 00000000000..42b1e70017d
--- /dev/null
+++ b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml
@@ -0,0 +1,598 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The Solr schema file. This file should be named "schema.xml" and
+ should be located where the classloader for the Solr webapp can find it.
+
+ This schema is used for testing, and as such has everything and the
+ kitchen sink thrown in. See example/solr/conf/schema.xml for a
+ more concise example.
+
+ -->
+
+<schema name="test" version="1.6">
+
+ <!-- field type definitions... note that the "name" attribute is
+ just a label to be used by field definitions. The "class"
+ attribute and any other attributes determine the real type and
+ behavior of the fieldtype.
+ -->
+
+ <!-- numeric field types that store and index the text
+ value verbatim (and hence don't sort correctly or support range queries.)
+ These are provided more for backward compatability, allowing one
+ to create a schema that matches an existing lucene index.
+ -->
+
+
+ <fieldType name="int" docValues="true" class="${solr.tests.IntegerFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" docValues="true" class="${solr.tests.FloatFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" docValues="true" class="${solr.tests.LongFieldType}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+
+ <fieldType name="tint" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+
+ <fieldType name="random" class="solr.RandomSortField" indexed="true" />
+
+ <!-- numeric field types that manipulate the value into
+ a string value that isn't human readable in it's internal form,
+ but sorts correctly and supports range queries.
+
+ If sortMissingLast="true" then a sort on this field will cause documents
+ without the field to come after documents with the field,
+ regardless of the requested sort order.
+ If sortMissingFirst="true" then a sort on this field will cause documents
+ without the field to come before documents with the field,
+ regardless of the requested sort order.
+ If sortMissingLast="false" and sortMissingFirst="false" (the default),
+ then default lucene sorting will be used which places docs without the field
+ first in an ascending sort and last in a descending sort.
+ -->
+
+
+
+ <!-- Field type demonstrating an Analyzer failure -->
+ <fieldtype name="failtype1" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.FlattenGraphFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+ <!-- Demonstrating ignoreCaseChange -->
+ <fieldtype name="wdf_nocase" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.FlattenGraphFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+ <fieldtype name="wdf_preserve" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.FlattenGraphFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+
+ <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
+
+ <!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
+ seconds part (.999) is optional.
+ -->
+ <fieldtype name="date" class="${solr.tests.DateFieldType}" precisionStep="0" docValues="true"/>
+ <fieldtype name="tdate" class="${solr.tests.DateFieldType}" precisionStep="6" docValues="true"/>
+
+
+ <!-- solr.TextField allows the specification of custom
+ text analyzers specified as a tokenizer and a list
+ of token filters.
+ -->
+ <fieldtype name="text" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.StopFilterFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+
+ <fieldtype name="nametext" class="solr.TextField">
+ <analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
+ </fieldtype>
+
+ <!-- fieldtypes in this section isolate tokenizers and tokenfilters for testing -->
+ <fieldtype name="keywordtok" class="solr.TextField">
+ <analyzer><tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/></analyzer>
+ </fieldtype>
+ <fieldtype name="standardtok" class="solr.TextField">
+ <analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
+ </fieldtype>
+ <fieldtype name="lettertok" class="solr.TextField">
+ <analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
+ </fieldtype>
+ <fieldtype name="whitetok" class="solr.TextField">
+ <analyzer><tokenizer class="solr.MockTokenizerFactory"/></analyzer>
+ </fieldtype>
+ <fieldtype name="HTMLstandardtok" class="solr.TextField">
+ <analyzer>
+ <charFilter class="solr.HTMLStripCharFilterFactory"/>
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="HTMLwhitetok" class="solr.TextField">
+ <analyzer>
+ <charFilter class="solr.HTMLStripCharFilterFactory"/>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="standardtokfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="standardfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="lowerfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="lowerpunctfilt" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="1" splitOnCaseChange="1"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.FlattenGraphFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="1" splitOnCaseChange="1"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="patternreplacefilt" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
+ <filter class="solr.PatternReplaceFilterFactory"
+ pattern="([^a-zA-Z])" replacement="_" replace="all"
+ />
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="patterntok" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.PatternTokenizerFactory" pattern=","/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="porterfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+ <!-- fieldtype name="snowballfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.SnowballPorterFilterFactory"/>
+ </analyzer>
+ </fieldtype -->
+ <fieldtype name="engporterfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="custengporterfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="stopfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.StopFilterFactory" ignoreCase="true"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="custstopfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ </analyzer>
+ </fieldtype>
+ <fieldtype name="lengthfilt" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LengthFilterFactory" min="2" max="5"/>
+ </analyzer>
+ </fieldtype>
+ <fieldType name="charfilthtmlmap" class="solr.TextField">
+ <analyzer>
+ <charFilter class="solr.HTMLStripCharFilterFactory"/>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
+
+ <fieldtype name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.StopFilterFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ <filter class="solr.FlattenGraphFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.StopFilterFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+ <fieldtype name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" splitOnNumerics="0" splitOnCaseChange="0" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
+ <filter class="solr.StopFilterFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ <filter class="solr.FlattenGraphFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" splitOnNumerics="0" splitOnCaseChange="0" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.StopFilterFactory"/>
+ <filter class="solr.PorterStemFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+ <fieldtype name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" splitOnNumerics="0" splitOnCaseChange="0" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
+ <filter class="solr.FlattenGraphFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+
+ <!-- more flexible in matching skus, but more chance of a false match -->
+ <fieldtype name="skutype1" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.FlattenGraphFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+ <!-- less flexible in matching skus, but less chance of a false match -->
+ <fieldtype name="skutype2" class="solr.TextField">
+ <analyzer type="index">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ <filter class="solr.FlattenGraphFilterFactory"/>
+ </analyzer>
+ <analyzer type="query">
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+ <!-- less flexible in matching skus, but less chance of a false match -->
+ <fieldtype name="syn" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ </analyzer>
+ </fieldtype>
+
+
+ <fieldtype name="unstored" class="solr.StrField" indexed="true" stored="false"/>
+
+
+ <fieldtype name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ <filter class="solr.LowerCaseFilterFactory"/>
+ </analyzer>
+ </fieldtype>
+
+ <fieldType name="uuid" class="solr.UUIDField" />
+
+ <!-- A specialized field for geospatial search filters and distance sorting. -->
+ <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
+
+ <!-- some per-field similarity examples -->
+
+ <!-- specify a Similarity classname directly -->
+ <!--
+ <fieldType name="sim1" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ </analyzer>
+ <similarity class="org.apache.lucene.misc.SweetSpotSimilarity"/>
+ </fieldType>
+ -->
+ <!-- specify a Similarity factory -->
+ <!--
+ <fieldType name="sim2" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ </analyzer>
+ <similarity class="org.apache.solr.search.similarities.CustomSimilarityFactory">
+ <str name="echo">is there an echo?</str>
+ </similarity>
+ </fieldType>
+ -->
+ <!-- don't specify any sim at all: get the default -->
+ <!--
+ <fieldType name="sim3" class="solr.TextField">
+ <analyzer>
+ <tokenizer class="solr.MockTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
+ -->
+
+
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="signatureField" type="string" indexed="true" stored="false"/>
+
+ <field name="s_multi" type="string" indexed="true" stored="true" docValues="true" multiValued="true"/>
+ <field name="i_multi" type="int" indexed="true" stored="true" docValues="true" multiValued="true"/>
+ <field name="f_multi" type="float" indexed="true" stored="true" docValues="true" multiValued="true"/>
+ <field name="l_multi" type="long" indexed="true" stored="true" docValues="true" multiValued="true"/>
+ <field name="d_multi" type="double" indexed="true" stored="true" docValues="true" multiValued="true"/>
+ <field name="dt_multi" type="date" indexed="true" stored="true" docValues="true" multiValued="true"/>
+ <field name="b_multi" type="boolean" indexed="true" stored="true" docValues="true" multiValued="true"/>
+
+ <field name="s_sing" type="string" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <field name="i_sing" type="int" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <field name="f_sing" type="float" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <field name="l_sing" type="long" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <field name="d_sing" type="double" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <field name="dt_sing" type="tdate" indexed="true" stored="true" docValues="true" multiValued="false"/>
+ <field name="b_sing" type="boolean" indexed="true" stored="true" docValues="true" multiValued="false"/>
+
+
+ <field name="uuid" type="uuid" stored="true" />
+ <field name="name" type="nametext" indexed="true" stored="true"/>
+ <field name="text" type="text" indexed="true" stored="false"/>
+ <field name="subject" type="text" indexed="true" stored="true"/>
+ <field name="title" type="nametext" indexed="true" stored="true"/>
+ <field name="weight" type="float" indexed="true" stored="true" multiValued="false"/>
+ <field name="bday" type="date" indexed="true" stored="true" multiValued="false"/>
+
+ <field name="title_stemmed" type="text" indexed="true" stored="false"/>
+ <field name="title_lettertok" type="lettertok" indexed="true" stored="false"/>
+
+ <field name="syn" type="syn" indexed="true" stored="true"/>
+
+ <!-- to test property inheritance and overriding -->
+ <field name="shouldbeunstored" type="unstored" />
+ <field name="shouldbestored" type="unstored" stored="true"/>
+ <field name="shouldbeunindexed" type="unstored" indexed="false" stored="true"/>
+
+ <!-- test different combinations of indexed and stored -->
+ <field name="bind" type="boolean" indexed="true" stored="false"/>
+ <field name="bsto" type="boolean" indexed="false" stored="true"/>
+ <field name="bindsto" type="boolean" indexed="true" stored="true"/>
+ <field name="isto" type="int" indexed="false" stored="true"/>
+ <field name="iind" type="int" indexed="true" stored="false"/>
+ <field name="ssto" type="string" indexed="false" stored="true"/>
+ <field name="sind" type="string" indexed="true" stored="false"/>
+ <field name="sindsto" type="string" indexed="true" stored="true"/>
+
+ <!-- test combinations of term vector settings -->
+ <field name="test_basictv" type="text" termVectors="true"/>
+ <field name="test_notv" type="text" termVectors="false"/>
+ <field name="test_postv" type="text" termVectors="true" termPositions="true"/>
+ <field name="test_offtv" type="text" termVectors="true" termOffsets="true"/>
+ <field name="test_posofftv" type="text" termVectors="true"
+ termPositions="true" termOffsets="true"/>
+
+ <!-- fields to test individual tokenizers and tokenfilters -->
+ <field name="keywordtok" type="keywordtok" indexed="true" stored="true"/>
+ <field name="standardtok" type="standardtok" indexed="true" stored="true"/>
+ <field name="HTMLstandardtok" type="HTMLstandardtok" indexed="true" stored="true"/>
+ <field name="lettertok" type="lettertok" indexed="true" stored="true"/>
+ <field name="whitetok" type="whitetok" indexed="true" stored="true"/>
+ <field name="HTMLwhitetok" type="HTMLwhitetok" indexed="true" stored="true"/>
+ <field name="standardtokfilt" type="standardtokfilt" indexed="true" stored="true"/>
+ <field name="standardfilt" type="standardfilt" indexed="true" stored="true"/>
+ <field name="lowerfilt" type="lowerfilt" indexed="true" stored="true"/>
+ <field name="lowerfilt1" type="lowerfilt" indexed="true" stored="true"/>
+ <field name="lowerfilt1and2" type="lowerfilt" indexed="true" stored="true"/>
+ <field name="patterntok" type="patterntok" indexed="true" stored="true"/>
+ <field name="patternreplacefilt" type="patternreplacefilt" indexed="true" stored="true"/>
+ <field name="porterfilt" type="porterfilt" indexed="true" stored="true"/>
+ <field name="engporterfilt" type="engporterfilt" indexed="true" stored="true"/>
+ <field name="custengporterfilt" type="custengporterfilt" indexed="true" stored="true"/>
+ <field name="stopfilt" type="stopfilt" indexed="true" stored="true"/>
+ <field name="custstopfilt" type="custstopfilt" indexed="true" stored="true"/>
+ <field name="lengthfilt" type="lengthfilt" indexed="true" stored="true"/>
+ <field name="wdf_nocase" type="wdf_nocase" indexed="true" stored="true"/>
+ <field name="wdf_preserve" type="wdf_preserve" indexed="true" stored="true"/>
+
+ <field name="numberpartfail" type="failtype1" indexed="true" stored="true"/>
+
+ <field name="nullfirst" type="string" indexed="true" stored="true" sortMissingFirst="true" multiValued="false"/>
+
+ <field name="subword" type="subword" indexed="true" stored="true"/>
+ <field name="subword_offsets" type="subword" indexed="true" stored="true" termOffsets="true"/>
+ <field name="numericsubword" type="numericsubword" indexed="true" stored="true"/>
+ <field name="protectedsubword" type="protectedsubword" indexed="true" stored="true"/>
+
+ <field name="sku1" type="skutype1" indexed="true" stored="true"/>
+ <field name="sku2" type="skutype2" indexed="true" stored="true"/>
+
+ <field name="textgap" type="textgap" indexed="true" stored="true"/>
+
+ <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
+ <field name="multiDefault" type="string" indexed="true" stored="true" default="muLti-Default" multiValued="true"/>
+ <field name="intDefault" type="int" indexed="true" stored="true" default="42" multiValued="false"/>
+
+ <!--
+ <field name="sim1text" type="sim1" indexed="true" stored="true"/>
+ <field name="sim2text" type="sim2" indexed="true" stored="true"/>
+ <field name="sim3text" type="sim3" indexed="true" stored="true"/>
+ -->
+
+ <field name="tlong" type="tlong" indexed="true" stored="true" />
+
+ <field name="_version_" type="long" indexed="true" stored="true"/>
+
+ <!-- Dynamic field definitions. If a field name is not found, dynamicFields
+ will be used if the name matches any of the patterns.
+ RESTRICTION: the glob-like pattern in the name attribute must have
+ a "*" only at the start or the end.
+ EXAMPLE: name="*_i" will match any field ending in _i (like myid_i, z_i)
+ Longer patterns will be matched first. if equal size patterns
+ both match, the first appearing in the schema will be used.
+ -->
+ <dynamicField name="*_i" type="int" indexed="true" stored="true"/>
+ <dynamicField name="*_i1" type="int" indexed="true" stored="true" multiValued="false"/>
+
+ <dynamicField name="*_s" type="string" indexed="true" stored="true"/>
+ <dynamicField name="*_ss" type="string" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_s1" type="string" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_l" type="long" indexed="true" stored="true"/>
+ <dynamicField name="*_ls" type="long" indexed="true" stored="true" multiValued="true"/>
+ <dynamicField name="*_l1" type="long" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_t" type="text" indexed="true" stored="true"/>
+ <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
+ <dynamicField name="*_f" type="float" indexed="true" stored="true"/>
+ <dynamicField name="*_f1" type="float" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_d" type="double" indexed="true" stored="true"/>
+ <dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_dt" type="date" indexed="true" stored="true"/>
+ <dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
+
+ <!-- some trie-coded dynamic fields for faster range queries -->
+ <dynamicField name="*_ti" type="tint" indexed="true" stored="true"/>
+ <dynamicField name="*_ti1" type="tint" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tl" type="tlong" indexed="true" stored="true"/>
+ <dynamicField name="*_tl1" type="tlong" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tf" type="tfloat" indexed="true" stored="true"/>
+ <dynamicField name="*_tf1" type="tfloat" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
+ <dynamicField name="*_td1" type="tdouble" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tds" type="tdouble" indexed="true" stored="true" multiValued="false"/>
+ <dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
+ <dynamicField name="*_tdt1" type="tdate" indexed="true" stored="true" multiValued="false"/>
+
+
+
+
+ <dynamicField name="*_sI" type="string" indexed="true" stored="false"/>
+ <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
+ <dynamicField name="t_*" type="text" indexed="true" stored="true"/>
+ <dynamicField name="tv_*" type="text" indexed="true" stored="true"
+ termVectors="true" termPositions="true" termOffsets="true"/>
+ <dynamicField name="tv_mv_*" type="text" indexed="true" stored="true" multiValued="true"
+ termVectors="true" termPositions="true" termOffsets="true"/>
+
+ <dynamicField name="*_p" type="location" indexed="true" stored="true" multiValued="false"/>
+
+ <!-- special fields for dynamic copyField test -->
+ <dynamicField name="dynamic_*" type="string" indexed="true" stored="true"/>
+ <dynamicField name="*_dynamic" type="string" indexed="true" stored="true"/>
+
+ <!-- for testing to ensure that longer patterns are matched first -->
+ <dynamicField name="*aa" type="string" indexed="true" stored="true"/>
+
+ <!-- ignored becuase not stored or indexed -->
+ <dynamicField name="*_ignored" type="text" indexed="false" stored="false"/>
+
+ <dynamicField name="*_mfacet" type="string" indexed="true" stored="false" multiValued="true" />
+
+ <dynamicField name="random_*" type="random" />
+
+
+ <!-- make sure custom sims work with dynamic fields -->
+ <!--
+ <dynamicField name="*_sim1" type="sim1" indexed="true" stored="true"/>
+ <dynamicField name="*_sim2" type="sim2" indexed="true" stored="true"/>
+ <dynamicField name="*_sim3" type="sim3" indexed="true" stored="true"/>
+ -->
+
+ <uniqueKey>id</uniqueKey>
+
+ <!-- copyField commands copy one field to another at the time a document
+ is added to the index. It's used either to index the same field different
+ ways, or to add multiple fields to the same field for easier/faster searching.
+ -->
+ <copyField source="title" dest="title_stemmed"/>
+ <copyField source="title" dest="title_lettertok"/>
+
+ <copyField source="title" dest="text"/>
+ <copyField source="subject" dest="text"/>
+
+ <copyField source="lowerfilt1" dest="lowerfilt1and2"/>
+ <copyField source="lowerfilt" dest="lowerfilt1and2"/>
+
+ <copyField source="*_t" dest="text"/>
+
+
+
+
+
+ <!-- dynamic destination -->
+ <copyField source="*_dynamic" dest="dynamic_*"/>
+
+</schema>
diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
new file mode 100644
index 00000000000..69eb458d741
--- /dev/null
+++ b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
+-->
+<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+ <indexConfig>
+ <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
+ </indexConfig>
+ <dataDir>${solr.data.dir:}</dataDir>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+ <schemaFactory class="ClassicIndexSchemaFactory"/>
+
+ <updateHandler class="solr.DirectUpdateHandler2">
+ <updateLog>
+ <str name="dir">${solr.data.dir:}</str>
+ </updateLog>
+ </updateHandler>
+
+ <updateRequestProcessorChain default="true">
+ <!-- be tolerant of errors for testing optimistic concurrency of delete() stream -->
+ <processor class="solr.TolerantUpdateProcessorFactory" />
+ <processor class="solr.RunUpdateProcessorFactory" />
+ </updateRequestProcessorChain>
+
+ <requestDispatcher>
+ <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
+ </requestDispatcher>
+
+ <requestHandler name="/select" class="solr.SearchHandler"/>
+
+ <initParams path="/select">
+ <lst name="defaults">
+ <str name="df">text</str>
+ </lst>
+ </initParams>
+
+</config>
diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml b/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml
new file mode 100644
index 00000000000..76d992170f1
--- /dev/null
+++ b/solr/solrj-streaming/src/test-files/solrj/solr/solr.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+<!--
+ All (relative) paths are relative to the installation path
+-->
+<solr>
+
+ <str name="shareSchema">${shareSchema:false}</str>
+ <str name="configSetBaseDir">${configSetBaseDir:configsets}</str>
+ <str name="coreRootDirectory">${coreRootDirectory:.}</str>
+ <str name="allowUrls">${solr.tests.allowUrls:}</str>
+
+ <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
+ <str name="urlScheme">${urlScheme:}</str>
+ <int name="socketTimeout">${socketTimeout:90000}</int>
+ <int name="connTimeout">${connTimeout:15000}</int>
+ </shardHandlerFactory>
+
+ <solrcloud>
+ <str name="host">127.0.0.1</str>
+ <int name="hostPort">${hostPort:8983}</int>
+ <str name="hostContext">${hostContext:solr}</str>
+ <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
+ <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+ <int name="leaderVoteWait">0</int>
+ <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
+ <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
+ </solrcloud>
+
+</solr>
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/TestLang.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/TestLang.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TupleTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/TupleTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/TupleTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/TupleTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcDriverTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcDriverTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcDriverTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcDriverTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/RecordCountStream.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/RecordCountStream.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/RecordCountStream.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/RecordCountStream.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamAssert.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamAssert.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamAssert.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamAssert.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExplanationTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExplanationTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExplanationTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExplanationTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AbsoluteValueEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AndEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AndEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AndEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AndEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcCosineEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcSineEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ArcTangentEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArrayEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ArrayEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ArrayEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ArrayEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AscEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AscEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AscEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AscEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CeilingEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CosineEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CubedRootEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/DivideEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/DivideEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/DivideEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/DivideEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ExclusiveOrEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ExclusiveOrEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ExclusiveOrEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ExclusiveOrEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FieldValueEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/FieldValueEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FieldValueEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/FieldValueEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/FloorEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEqualToEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEqualToEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEqualToEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEqualToEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/GreaterThanEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicCosineEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicSineEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/HyperbolicTangentEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LengthEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/LengthEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LengthEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/LengthEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEqualToEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEqualToEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEqualToEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEqualToEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/LessThanEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ModuloEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ModuloEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ModuloEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ModuloEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MovingAverageEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/MovingAverageEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MovingAverageEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/MovingAverageEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/MultiplyEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/NaturalLogEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalDistributionEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalDistributionEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalDistributionEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalDistributionEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NotEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/NotEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NotEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/NotEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/OrEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/OrEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/OrEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/OrEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/PowerEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RawValueEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/RawValueEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RawValueEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/RawValueEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RecursiveEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/RecursiveEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RecursiveEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/RecursiveEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RegressionEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/RegressionEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RegressionEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/RegressionEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ReverseEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ReverseEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ReverseEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/ReverseEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/RoundEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/SineEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/SquareRootEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/SubtractEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/TangentEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UniformDistributionEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/UniformDistributionEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UniformDistributionEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/UniformDistributionEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UuidEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/UuidEvaluatorTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/UuidEvaluatorTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/UuidEvaluatorTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/InjectionDefenseTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/expr/InjectionDefenseTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/InjectionDefenseTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/expr/InjectionDefenseTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetricTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetricTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetricTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/metrics/WeightedSumMetricTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java
similarity index 100%
rename from solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java
rename to solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index a2b4ff43e8f..abd4a1656c3 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -25,8 +25,6 @@ dependencies {
implementation 'org.slf4j:slf4j-api'
runtimeOnly 'org.slf4j:jcl-over-slf4j'
- implementation 'org.apache.commons:commons-math3'
-
api 'org.eclipse.jetty.http2:http2-client'
implementation 'org.eclipse.jetty.http2:http2-http-client-transport'
implementation 'org.eclipse.jetty:jetty-http'
@@ -44,7 +42,6 @@ dependencies {
testImplementation project(':solr:test-framework')
testImplementation project(':solr:core')
testImplementation project(':solr:solrj')
- testRuntimeOnly project(':solr:modules:sql')
// ideally ZK centric tests move to solrj-zookeeper but sometimes we depend on ZK here anyway
testImplementation project(':solr:solrj-zookeeper')
@@ -77,7 +74,6 @@ dependencies {
testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl", {
exclude group: "org.apache.logging.log4j", module: "log4j-api"
})
- testRuntimeOnly "org.hsqldb:hsqldb" // runtime because via JDBC reflection
testImplementation 'org.apache.commons:commons-lang3'
testImplementation 'com.google.guava:guava'
testImplementation 'io.dropwizard.metrics:metrics-core'