lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arafa...@apache.org
Subject [7/7] lucene-solr:master: SOLR-11694: Remove outdated UIMA module
Date Sat, 07 Jul 2018 15:04:47 GMT
SOLR-11694: Remove outdated UIMA module


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b7d14c50
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b7d14c50
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b7d14c50

Branch: refs/heads/master
Commit: b7d14c50fbae3d11b32b9331287636c98730987a
Parents: 6d6e671
Author: Alexandre Rafalovitch <arafalov@apache.org>
Authored: Sat Jul 7 09:20:40 2018 -0400
Committer: Alexandre Rafalovitch <arafalov@apache.org>
Committed: Sat Jul 7 09:58:57 2018 -0400

----------------------------------------------------------------------
 build.xml                                       |   4 +-
 dev-tools/idea/.idea/ant.xml                    |   2 -
 dev-tools/idea/.idea/modules.xml                |   2 -
 dev-tools/idea/.idea/workspace.xml              |  18 -
 .../idea/lucene/analysis/uima/analysis-uima.iml |  30 -
 dev-tools/idea/solr/contrib/uima/uima.iml       |  36 -
 .../maven/lucene/analysis/pom.xml.template      |   1 -
 .../maven/lucene/analysis/uima/pom.xml.template |  74 --
 dev-tools/maven/solr/contrib/pom.xml.template   |   1 -
 .../maven/solr/contrib/uima/pom.xml.template    |  83 --
 dev-tools/scripts/SOLR-2452.patch.hack.pl       |  15 -
 dev-tools/scripts/addVersion.py                 |   1 -
 lucene/analysis/README.txt                      |   6 -
 lucene/analysis/build.xml                       |   7 +-
 lucene/analysis/uima/build.xml                  |  50 --
 lucene/analysis/uima/ivy.xml                    |  30 -
 .../lucene/analysis/uima/BaseUIMATokenizer.java |  96 ---
 .../analysis/uima/UIMAAnnotationsTokenizer.java |  90 ---
 .../uima/UIMAAnnotationsTokenizerFactory.java   |  47 --
 .../lucene/analysis/uima/UIMABaseAnalyzer.java  |  44 --
 .../analysis/uima/UIMATypeAwareAnalyzer.java    |  44 --
 .../uima/UIMATypeAwareAnnotationsTokenizer.java | 113 ---
 ...IMATypeAwareAnnotationsTokenizerFactory.java |  50 --
 .../lucene/analysis/uima/ae/AEProvider.java     |  34 -
 .../analysis/uima/ae/AEProviderFactory.java     |  76 --
 .../analysis/uima/ae/BasicAEProvider.java       |  87 ---
 .../uima/ae/OverridingParamsAEProvider.java     |  69 --
 .../lucene/analysis/uima/ae/package-info.java   |  21 -
 .../lucene/analysis/uima/package-info.java      |  21 -
 lucene/analysis/uima/src/java/overview.html     |  29 -
 ...apache.lucene.analysis.util.TokenizerFactory |  17 -
 .../src/resources/uima/AggregateSentenceAE.xml  |  70 --
 .../test-files/uima/TestAggregateSentenceAE.xml |  55 --
 .../test-files/uima/TestEntityAnnotatorAE.xml   |  66 --
 .../src/test-files/uima/TestPoSTaggerAE.xml     |  44 --
 .../src/test-files/uima/TestWSTokenizerAE.xml   |  78 --
 .../analysis/uima/UIMABaseAnalyzerTest.java     | 137 ----
 .../uima/UIMATypeAwareAnalyzerTest.java         |  70 --
 .../analysis/uima/ae/AEProviderFactoryTest.java |  44 --
 .../analysis/uima/ae/BasicAEProviderTest.java   |  36 -
 .../uima/ae/OverridingParamsAEProviderTest.java |  59 --
 .../analysis/uima/an/SampleEntityAnnotator.java |  64 --
 .../analysis/uima/an/SamplePoSTagger.java       |  57 --
 .../uima/an/SampleWSTokenizerAnnotator.java     |  66 --
 lucene/build.xml                                |   1 -
 lucene/common-build.xml                         |   2 -
 .../org/apache/lucene/analysis/Analyzer.java    |   2 -
 lucene/ivy-versions.properties                  |   8 -
 lucene/licenses/Tagger-2.3.1.jar.sha1           |   1 -
 lucene/licenses/Tagger-LICENSE-ASL.txt          | 202 -----
 lucene/licenses/Tagger-NOTICE.txt               |   7 -
 .../licenses/WhitespaceTokenizer-2.3.1.jar.sha1 |   1 -
 .../WhitespaceTokenizer-LICENSE-ASL.txt         | 202 -----
 lucene/licenses/WhitespaceTokenizer-NOTICE.txt  |   7 -
 lucene/licenses/uimaj-core-2.3.1.jar.sha1       |   1 -
 lucene/licenses/uimaj-core-LICENSE-ASL.txt      | 202 -----
 lucene/licenses/uimaj-core-NOTICE.txt           |  13 -
 lucene/module-build.xml                         |  22 -
 lucene/tools/junit4/tests.policy                |   3 +-
 solr/CHANGES.txt                                |   4 +-
 solr/common-build.xml                           |   3 +-
 solr/contrib/uima/README.txt                    | 109 ---
 solr/contrib/uima/build.xml                     |  63 --
 solr/contrib/uima/ivy.xml                       |  35 -
 .../uima/processor/FieldMappingException.java   |  27 -
 .../uima/processor/SolrUIMAConfiguration.java   | 117 ---
 .../processor/SolrUIMAConfigurationReader.java  | 116 ---
 .../solr/uima/processor/UIMAToSolrMapper.java   |  87 ---
 .../processor/UIMAUpdateRequestProcessor.java   | 189 -----
 .../UIMAUpdateRequestProcessorFactory.java      |  72 --
 .../solr/uima/processor/package-info.java       |  25 -
 solr/contrib/uima/src/java/overview.html        |  21 -
 .../apache/uima/desc/AggregateSentenceAE.xml    |  41 -
 .../org/apache/uima/desc/HmmTagger.xml          | 121 ---
 .../apache/uima/desc/OpenCalaisAnnotator.xml    | 194 -----
 .../uima/desc/OverridingParamsExtServicesAE.xml | 147 ----
 .../desc/TextCategorizationAEDescriptor.xml     | 102 ---
 .../desc/TextConceptTaggingAEDescriptor.xml     | 196 -----
 .../desc/TextKeywordExtractionAEDescriptor.xml  | 107 ---
 .../desc/TextLanguageDetectionAEDescriptor.xml  | 107 ---
 .../TextRankedEntityExtractionAEDescriptor.xml  | 403 ----------
 .../apache/uima/desc/WhitespaceTokenizer.xml    | 115 ---
 .../desc/baseAlchemyTypeSystemDescriptor.xml    |  41 -
 .../collection1/conf/aggregate-uima-config.xml  |  48 --
 .../solr/collection1/conf/uima-fields.xml       |   9 -
 .../src/test-files/uima/AggregateSentenceAE.xml |  70 --
 .../test-files/uima/DummyEntityAEDescriptor.xml |  68 --
 .../uima/DummyExceptionAEDescriptor.xml         |  40 -
 .../uima/DummySentimentAnalysisAEDescriptor.xml |  60 --
 .../contrib/uima/src/test-files/uima/TestAE.xml |  72 --
 .../src/test-files/uima/TestExceptionAE.xml     |  54 --
 .../uima/solr/collection1/conf/protwords.txt    |  21 -
 .../uima/solr/collection1/conf/schema.xml       | 612 ---------------
 .../uima/solr/collection1/conf/solrconfig.xml   | 773 -------------------
 .../uima/solr/collection1/conf/spellings.txt    |   2 -
 .../uima/solr/collection1/conf/stopwords.txt    |  58 --
 .../uima/solr/collection1/conf/synonyms.txt     |  31 -
 .../uima/src/test-files/uima/stoptypes.txt      |  25 -
 .../test-files/uima/uima-tokenizers-schema.xml  | 613 ---------------
 .../uima/uima-tokenizers-solrconfig.xml         | 653 ----------------
 .../UIMATokenizersSolrIntegrationTest.java      |  72 --
 .../UIMAUpdateRequestProcessorTest.java         | 186 -----
 .../uima/processor/an/DummyEntityAnnotator.java |  47 --
 .../processor/an/DummyExceptionAnnotator.java   |  30 -
 .../processor/an/DummySentimentAnnotator.java   |  60 --
 .../solr/uima/ts/DummySentimentAnnotation.java  |  81 --
 .../uima/ts/DummySentimentAnnotation_Type.java  |  80 --
 .../apache/solr/uima/ts/EntityAnnotation.java   |  99 ---
 .../solr/uima/ts/EntityAnnotation_Type.java     | 102 ---
 solr/example/README.txt                         |   2 +-
 .../licenses/AlchemyAPIAnnotator-2.3.1.jar.sha1 |   1 -
 .../AlchemyAPIAnnotator-LICENSE-ASL.txt         | 202 -----
 solr/licenses/AlchemyAPIAnnotator-NOTICE.txt    |   7 -
 .../licenses/OpenCalaisAnnotator-2.3.1.jar.sha1 |   1 -
 .../OpenCalaisAnnotator-LICENSE-ASL.txt         | 202 -----
 solr/licenses/OpenCalaisAnnotator-NOTICE.txt    |   7 -
 solr/licenses/Tagger-2.3.1.jar.sha1             |   1 -
 solr/licenses/Tagger-LICENSE-ASL.txt            | 202 -----
 solr/licenses/Tagger-NOTICE.txt                 |   7 -
 .../licenses/WhitespaceTokenizer-2.3.1.jar.sha1 |   1 -
 .../WhitespaceTokenizer-LICENSE-ASL.txt         | 202 -----
 solr/licenses/WhitespaceTokenizer-NOTICE.txt    |   7 -
 solr/licenses/commons-digester-2.1.jar.sha1     |   1 -
 solr/licenses/uimaj-core-2.3.1.jar.sha1         |   1 -
 solr/licenses/uimaj-core-LICENSE-ASL.txt        | 202 -----
 solr/licenses/uimaj-core-NOTICE.txt             |  13 -
 solr/server/README.txt                          |   2 +-
 .../src/indexing-and-basic-data-operations.adoc |   4 +-
 solr/solr-ref-guide/src/uima-integration.adoc   | 122 ---
 .../src/update-request-processors.adoc          |   4 -
 130 files changed, 10 insertions(+), 10307 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9c8deff..96fc565 100755
--- a/build.xml
+++ b/build.xml
@@ -264,7 +264,7 @@
     <!-- TODO: find a better way to exclude duplicate JAR files & fix the servlet-api mess! -->
     <pathconvert property="netbeans.path.libs" pathsep=":" dirsep="/">
       <fileset dir="${basedir}/lucene" includes="**/lib/*.jar" 
-               excludes="**/*servlet-api*.jar, analysis/uima/**, tools/**, build/**"/>
+               excludes="**/*servlet-api*.jar, tools/**, build/**"/>
       <fileset dir="${basedir}/solr" includes="**/test-lib/*.jar,**/lib/*.jar" 
                excludes="core/test-lib/*servlet-api*.jar, contrib/analysis-extras/**, test-framework/lib/junit*, test-framework/lib/ant*, test-framework/lib/randomizedtesting*, build/**, dist/**, package/**, server/solr-webapp/**" />
       <map from="${basedir}/" to=""/>
@@ -311,7 +311,7 @@
     </pathconvert>
     <!-- TODO: find a better way to exclude duplicate JAR files & fix the servlet-api mess! -->
     <pathconvert property="eclipse.fileset.libs" pathsep="|" dirsep="/">
-      <fileset dir="${basedir}/lucene" includes="**/lib/*.jar" excludes="**/*servlet-api*.jar, analysis/uima/**, tools/**, build/**"/>
+      <fileset dir="${basedir}/lucene" includes="**/lib/*.jar" excludes="**/*servlet-api*.jar, tools/**, build/**"/>
       <fileset dir="${basedir}/solr" includes="**/test-lib/*.jar,**/lib/*.jar" excludes="core/test-lib/*servlet-api*.jar, contrib/analysis-extras/**, test-framework/lib/junit*, test-framework/lib/ant*, test-framework/lib/randomizedtesting*, build/**, dist/**, package/**" />
       <map from="${basedir}/" to=""/>
     </pathconvert>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/idea/.idea/ant.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/ant.xml b/dev-tools/idea/.idea/ant.xml
index 172c265..229d832 100644
--- a/dev-tools/idea/.idea/ant.xml
+++ b/dev-tools/idea/.idea/ant.xml
@@ -15,7 +15,6 @@
     <buildFile url="file://$PROJECT_DIR$/lucene/analysis/phonetic/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/analysis/smartcn/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/analysis/stempel/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/analysis/uima/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/benchmark/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/classification/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/codecs/build.xml" />
@@ -48,7 +47,6 @@
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/langid/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/prometheus-exporter/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/solr/contrib/uima/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/velocity/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/solrj/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/test-framework/build.xml" />

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/idea/.idea/modules.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index f77c34a..65b57fb 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -20,7 +20,6 @@
       <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/phonetic/phonetic.iml" />
       <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/smartcn/smartcn.iml" />
       <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/stempel/stempel.iml" />
-      <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/uima/analysis-uima.iml" />
 
       <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/benchmark/src/benchmark.iml" />
       <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/benchmark/conf/benchmark-conf.iml" />
@@ -59,7 +58,6 @@
       <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
       <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/ltr/ltr.iml" />
       <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/prometheus-exporter/prometheus-exporter.iml" />
-      <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
       <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.iml" />
     </modules>
   </component>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/idea/.idea/workspace.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index ba9a383..6a1fd0a 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -76,14 +76,6 @@
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
       <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
     </configuration>
-    <configuration default="false" name="Module analyzers-uima" type="JUnit" factoryName="JUnit">
-      <module name="analysis-uima" />
-      <option name="TEST_OBJECT" value="pattern" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/analysis/uima" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-      <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
-    </configuration>
     <configuration default="false" name="Module backward-codecs" type="JUnit" factoryName="JUnit">
       <module name="backward-codecs" />
       <option name="TEST_OBJECT" value="pattern" />
@@ -332,14 +324,6 @@
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
       <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
     </configuration>
-    <configuration default="false" name="Solr uima contrib" type="JUnit" factoryName="JUnit">
-      <module name="uima" />
-      <option name="TEST_OBJECT" value="pattern" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-uima" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=@version.base@ -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-      <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
-    </configuration>
     <configuration default="false" name="Solr velocity contrib" type="JUnit" factoryName="JUnit">
       <module name="velocity" />
       <option name="TEST_OBJECT" value="pattern" />
@@ -359,7 +343,6 @@
       <item index="6" class="java.lang.String" itemvalue="JUnit.Module analyzers-phonetic" />
       <item index="7" class="java.lang.String" itemvalue="JUnit.Module analyzers-smartcn" />
       <item index="8" class="java.lang.String" itemvalue="JUnit.Module analyzers-stempel" />
-      <item index="9" class="java.lang.String" itemvalue="JUnit.Module analyzers-uima" />
       <item index="10" class="java.lang.String" itemvalue="JUnit.Module backward-codecs" />
       <item index="11" class="java.lang.String" itemvalue="JUnit.Module benchmark" />
       <item index="12" class="java.lang.String" itemvalue="JUnit.Module classification" />
@@ -391,7 +374,6 @@
       <item index="38" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
       <item index="39" class="java.lang.String" itemvalue="JUnit.Solr ltr contrib" />
       <item index="40" class="java.lang.String" itemvalue="JUnit.Solr prometheus-exporter contrib" />
-      <item index="41" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
       <item index="42" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
     </list>
   </component>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml b/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
deleted file mode 100644
index f80ea7b..0000000
--- a/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/uima/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../idea-build/lucene/analysis/uima/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test-files" type="java-test-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/lib" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
-    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
-    <orderEntry type="module" module-name="analysis-common" />
-    <orderEntry type="module" module-name="lucene-core" />
-  </component>
-</module>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/idea/solr/contrib/uima/uima.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/contrib/uima/uima.iml b/dev-tools/idea/solr/contrib/uima/uima.iml
deleted file mode 100644
index d084a25..0000000
--- a/dev-tools/idea/solr/contrib/uima/uima.iml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-uima/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-uima/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test-files" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/resources" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
-    <orderEntry type="library" name="Solr core library" level="project" />
-    <orderEntry type="library" name="Solrj library" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/lib" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
-      </library>
-    </orderEntry>
-    <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
-    <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
-    <orderEntry type="module" module-name="solr-core" />
-    <orderEntry type="module" module-name="solrj" />
-    <orderEntry type="module" module-name="lucene-core" />
-    <orderEntry type="module" module-name="analysis-uima" />
-    <orderEntry type="module" module-name="analysis-common" />
-  </component>
-</module>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/maven/lucene/analysis/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/lucene/analysis/pom.xml.template b/dev-tools/maven/lucene/analysis/pom.xml.template
index dada0d5..f41aa06 100644
--- a/dev-tools/maven/lucene/analysis/pom.xml.template
+++ b/dev-tools/maven/lucene/analysis/pom.xml.template
@@ -40,7 +40,6 @@
     <module>phonetic</module>
     <module>smartcn</module>
     <module>stempel</module>
-    <module>uima</module>
   </modules>
   <build>
     <plugins>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/maven/lucene/analysis/uima/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/lucene/analysis/uima/pom.xml.template b/dev-tools/maven/lucene/analysis/uima/pom.xml.template
deleted file mode 100644
index 9bdcd14..0000000
--- a/dev-tools/maven/lucene/analysis/uima/pom.xml.template
+++ /dev/null
@@ -1,74 +0,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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.lucene</groupId>
-    <artifactId>lucene-parent</artifactId>
-    <version>@version@</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  <groupId>org.apache.lucene</groupId>
-  <artifactId>lucene-analyzers-uima</artifactId>
-  <packaging>jar</packaging>
-  <name>Lucene UIMA Analysis Components</name>
-  <description>    
-    Lucene Integration with UIMA for extracting metadata from arbitrary (text)
-    fields and enrich document with features extracted from UIMA types 
-    (language, sentences, concepts, named entities, etc.)
-  </description>
-  <properties>
-    <module-directory>lucene/analysis/uima</module-directory>
-    <relative-top-level>../../../..</relative-top-level>
-    <module-path>${relative-top-level}/${module-directory}</module-path>
-  </properties>
-  <scm>
-    <connection>scm:git:${vc-anonymous-base-url}</connection>
-    <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
-    <url>${vc-browse-base-url};f=${module-directory}</url>
-  </scm>
-  <dependencies>
-    <dependency> 
-      <!-- lucene-test-framework dependency must be declared before lucene-core -->
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-test-framework</artifactId>
-      <scope>test</scope>
-    </dependency>
-@lucene-analyzers-uima.internal.dependencies@
-@lucene-analyzers-uima.external.dependencies@
-@lucene-analyzers-uima.internal.test.dependencies@
-@lucene-analyzers-uima.external.test.dependencies@
-  </dependencies>
-  <build>
-    <sourceDirectory>${module-path}/src/java</sourceDirectory>
-    <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
-    <resources>
-      <resource>
-        <directory>${module-path}/src/resources</directory>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${module-path}/src/test-files</directory>
-      </testResource>
-    </testResources>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/maven/solr/contrib/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/contrib/pom.xml.template b/dev-tools/maven/solr/contrib/pom.xml.template
index 733e308..b4b1bb1 100644
--- a/dev-tools/maven/solr/contrib/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/pom.xml.template
@@ -40,7 +40,6 @@
     <module>langid</module>
     <module>ltr</module>
     <module>prometheus-exporter</module>
-    <module>uima</module>
     <module>velocity</module>
   </modules>
   <build>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/maven/solr/contrib/uima/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/contrib/uima/pom.xml.template b/dev-tools/maven/solr/contrib/uima/pom.xml.template
deleted file mode 100644
index 1127d2d..0000000
--- a/dev-tools/maven/solr/contrib/uima/pom.xml.template
+++ /dev/null
@@ -1,83 +0,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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-parent</artifactId>
-    <version>@version@</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-uima</artifactId>
-  <packaging>jar</packaging>
-  <name>Apache Solr UIMA integration</name>
-  <description>Apache Solr - UIMA integration</description>
-  <properties>
-    <module-directory>solr/contrib/uima</module-directory>
-    <relative-top-level>../../../..</relative-top-level>
-    <module-path>${relative-top-level}/${module-directory}</module-path>
-  </properties>
-  <scm>
-    <connection>scm:git:${vc-anonymous-base-url}</connection>
-    <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
-    <url>${vc-browse-base-url};f=${module-directory}</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <!-- lucene-test-framework dependency must be declared before lucene-core -->
-      <!-- This dependency cannot be put into solr-parent, because local        -->
-      <!-- dependencies are always ordered before inherited dependencies.       -->
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-test-framework</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-test-framework</artifactId>
-      <scope>test</scope>
-    </dependency>
-@solr-uima.internal.dependencies@
-@solr-uima.external.dependencies@
-@solr-uima.internal.test.dependencies@
-@solr-uima.external.test.dependencies@
-  </dependencies>
-  <build>
-    <sourceDirectory>${module-path}/src/java</sourceDirectory>
-    <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
-    <resources>
-      <resource>
-        <directory>${module-path}/src/resources</directory>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${module-path}/src/test-files</directory>
-      </testResource>
-      <testResource>
-        <directory>${top-level}/dev-tools/maven/solr</directory>
-        <includes>
-          <include>maven.testlogging.properties</include>
-        </includes>
-      </testResource>
-    </testResources>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/scripts/SOLR-2452.patch.hack.pl
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/SOLR-2452.patch.hack.pl b/dev-tools/scripts/SOLR-2452.patch.hack.pl
index 3b1d1d6..7da5c54 100755
--- a/dev-tools/scripts/SOLR-2452.patch.hack.pl
+++ b/dev-tools/scripts/SOLR-2452.patch.hack.pl
@@ -87,21 +87,6 @@ my @moves = (
     'solr/contrib/extraction/src/main/java'
  => 'solr/contrib/extraction/src/java',
 
-    'solr/contrib/uima/src/test/java'
- => 'solr/contrib/uima/src/test',
-
-    'solr/contrib/uima/src/test/resources/solr-uima'
- => 'solr/contrib/uima/src/test-files/uima/solr',
-
-    'solr/contrib/uima/src/test/resources'
- => 'solr/contrib/uima/src/test-files/uima',
-
-    'solr/contrib/uima/src/main/java'
- => 'solr/contrib/uima/src/java',
-
-    'solr/contrib/uima/src/main/resources'
- => 'solr/contrib/uima/src/resources',
-
     'solr/src/test-files/books.csv'
  => 'solr/solrj/src/test-files/solrj/books.csv',
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/dev-tools/scripts/addVersion.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/addVersion.py b/dev-tools/scripts/addVersion.py
index 745cfd3..f093018 100644
--- a/dev-tools/scripts/addVersion.py
+++ b/dev-tools/scripts/addVersion.py
@@ -201,7 +201,6 @@ def get_solr_init_changes():
     Apache Tika %(org.apache.tika.version)s
     Carrot2 %(/org.carrot2/carrot2-mini)s
     Velocity %(/org.apache.velocity/velocity)s and Velocity Tools %(/org.apache.velocity/velocity-tools)s
-    Apache UIMA %(org.apache.uima.version)s
     Apache ZooKeeper %(/org.apache.zookeeper/zookeeper)s
     Jetty %(org.eclipse.jetty.version)s
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/README.txt
----------------------------------------------------------------------
diff --git a/lucene/analysis/README.txt b/lucene/analysis/README.txt
index 8a9c8d9..9961f3f 100644
--- a/lucene/analysis/README.txt
+++ b/lucene/analysis/README.txt
@@ -47,10 +47,6 @@ lucene-analyzers-stempel-XX.jar
   An add-on analysis library that contains a universal algorithmic stemmer,
   including tables for the Polish language.
 
-lucene-analyzers-uima-XX.jar
-  An add-on analysis library that contains tokenizers/analyzers using
-  Apache UIMA extracted annotations to identify tokens/types/etc.
-
 common/src/java
 icu/src/java
 kuromoji/src/java
@@ -60,7 +56,6 @@ opennlp/src/java
 phonetic/src/java
 smartcn/src/java
 stempel/src/java
-uima/src/java
   The source code for the libraries.
 
 common/src/test
@@ -72,5 +67,4 @@ opennlp/src/test
 phonetic/src/test
 smartcn/src/test
 stempel/src/test
-uima/src/test
   Unit tests for the libraries.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/build.xml
----------------------------------------------------------------------
diff --git a/lucene/analysis/build.xml b/lucene/analysis/build.xml
index 95dd7dc..6dc1500 100644
--- a/lucene/analysis/build.xml
+++ b/lucene/analysis/build.xml
@@ -28,7 +28,6 @@
       - nori: Korean Morphological Analyzer
       - smartcn: Smart Analyzer for Simplified Chinese Text
       - stempel: Algorithmic Stemmer for Polish
-      - uima: UIMA Analysis module
   </description>
 
   <dirname file="${ant.file.analyzers}" property="analyzers.dir"/>
@@ -86,12 +85,8 @@
     <ant dir="stempel" />
   </target>
 
-  <target name="uima">
-    <ant dir="uima" />
-  </target>
-
   <target name="default" depends="compile"/>
-  <target name="compile" depends="common,icu,kuromoji,morfologik,nori,opennlp,phonetic,smartcn,stempel,uima" />
+  <target name="compile" depends="common,icu,kuromoji,morfologik,nori,opennlp,phonetic,smartcn,stempel" />
 
   <target name="clean">
     <forall-analyzers target="clean"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/build.xml
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/build.xml b/lucene/analysis/uima/build.xml
deleted file mode 100644
index 2c7bd59..0000000
--- a/lucene/analysis/uima/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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.
- -->
-
-<project name="analyzers-uima" default="default">
-
-  <description>
-    Analysis integration with Apache UIMA
-  </description>
-  
-  <property name="tests.userdir" value="src/test-files"/>
-  <!-- TODO: why is this limited to one JVM? -->
-  <property name="tests.jvms.override" value="1" />
-  <!-- TODO: go fix this in uima, its stupid -->
-  <property name="tests.policy" location="../../tools/junit4/solr-tests.policy"/>
-
-  <path id="uimajars">
-    <fileset dir="lib"/>
-  </path>
-
-  <import file="../analysis-module-build.xml"/>
-
-  <path id="classpath">
-    <pathelement path="${analyzers-common.jar}"/>
-    <path refid="uimajars"/>
-    <path refid="base.classpath"/>
-  </path>
-  
-  <path id="test.classpath">
-    <path refid="test.base.classpath"/>
-    <pathelement path="${tests.userdir}"/>
-  </path>
-
-  <target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
-</project>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/ivy.xml
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/ivy.xml b/lucene/analysis/uima/ivy.xml
deleted file mode 100644
index f9a9f76..0000000
--- a/lucene/analysis/uima/ivy.xml
+++ /dev/null
@@ -1,30 +0,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.    
--->
-<ivy-module version="2.0">
-  <info organisation="org.apache.lucene" module="analyzers-uima"/>
-  <configurations defaultconfmapping="compile->master">
-    <conf name="compile" transitive="false"/>
-  </configurations>
-  <dependencies>
-    <dependency org="org.apache.uima" name="Tagger" rev="${/org.apache.uima/Tagger}" conf="compile"/>
-    <dependency org="org.apache.uima" name="WhitespaceTokenizer" rev="${/org.apache.uima/WhitespaceTokenizer}" conf="compile"/>
-    <dependency org="org.apache.uima" name="uimaj-core" rev="${/org.apache.uima/uimaj-core}" conf="compile"/>
-    <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
-  </dependencies>
-</ivy-module>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java
deleted file mode 100644
index 78b88dc..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java
+++ /dev/null
@@ -1,96 +0,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.
- */
-package org.apache.lucene.analysis.uima;
-
-
-import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.uima.ae.AEProviderFactory;
-import org.apache.lucene.util.AttributeFactory;
-import org.apache.uima.analysis_engine.AnalysisEngine;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
-import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.FSIterator;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.resource.ResourceInitializationException;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Map;
-
-/**
- * Abstract base implementation of a {@link Tokenizer} which is able to analyze the given input with a
- * UIMA {@link AnalysisEngine}
- */
-public abstract class BaseUIMATokenizer extends Tokenizer {
-
-  protected FSIterator<AnnotationFS> iterator;
-
-  private final String descriptorPath;
-  private final Map<String, Object> configurationParameters;
-
-  protected AnalysisEngine ae;
-  protected CAS cas;
-
-  protected BaseUIMATokenizer
-      (AttributeFactory factory, String descriptorPath, Map<String, Object> configurationParameters) {
-    super(factory);
-    this.descriptorPath = descriptorPath;
-    this.configurationParameters = configurationParameters;
-  }
-
-  /**
-   * analyzes the tokenizer input using the given analysis engine
-   * <p>
-   * {@link #cas} will be filled with  extracted metadata (UIMA annotations, feature structures)
-   *
-   * @throws IOException If there is a low-level I/O error.
-   */
-  protected void analyzeInput() throws ResourceInitializationException, AnalysisEngineProcessException, IOException {
-    if (ae == null) {
-      ae = AEProviderFactory.getInstance().getAEProvider(null, descriptorPath, configurationParameters).getAE();
-    }
-    if (cas == null) {
-      cas = ae.newCAS();
-    } else {
-      cas.reset();
-    }
-    cas.setDocumentText(toString(input));
-    ae.process(cas);
-  }
-
-  /**
-   * initialize the FSIterator which is used to build tokens at each incrementToken() method call
-   *
-   * @throws IOException If there is a low-level I/O error.
-   */
-  protected abstract void initializeIterator() throws IOException;
-
-  private String toString(Reader reader) throws IOException {
-    StringBuilder stringBuilder = new StringBuilder();
-    int ch;
-    while ((ch = reader.read()) > -1) {
-      stringBuilder.append((char) ch);
-    }
-    return stringBuilder.toString();
-  }
-
-  @Override
-  public void reset() throws IOException {
-    super.reset();
-    iterator = null;
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java
deleted file mode 100644
index 169be5f..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java
+++ /dev/null
@@ -1,90 +0,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.
- */
-package org.apache.lucene.analysis.uima;
-
-
-import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.util.AttributeFactory;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.resource.ResourceInitializationException;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * a {@link Tokenizer} which creates tokens from UIMA Annotations
- */
-public final class UIMAAnnotationsTokenizer extends BaseUIMATokenizer {
-
-  private final CharTermAttribute termAttr;
-
-  private final OffsetAttribute offsetAttr;
-
-  private final String tokenTypeString;
-
-  private int finalOffset = 0;
-
-  public UIMAAnnotationsTokenizer(String descriptorPath, String tokenType, Map<String, Object> configurationParameters) {
-    this(descriptorPath, tokenType, configurationParameters, DEFAULT_TOKEN_ATTRIBUTE_FACTORY);
-  }
-
-  public UIMAAnnotationsTokenizer(String descriptorPath, String tokenType, Map<String, Object> configurationParameters, 
-                                  AttributeFactory factory) {
-    super(factory, descriptorPath, configurationParameters);
-    this.tokenTypeString = tokenType;
-    this.termAttr = addAttribute(CharTermAttribute.class);
-    this.offsetAttr = addAttribute(OffsetAttribute.class);
-  }
-
-  @Override
-  protected void initializeIterator() throws IOException {
-    try {
-      analyzeInput();
-    } catch (AnalysisEngineProcessException | ResourceInitializationException e) {
-      throw new IOException(e);
-    }
-    finalOffset = correctOffset(cas.getDocumentText().length());
-    Type tokenType = cas.getTypeSystem().getType(tokenTypeString);
-    iterator = cas.getAnnotationIndex(tokenType).iterator();
-  }
-
-  @Override
-  public boolean incrementToken() throws IOException {
-    if (iterator == null) {
-      initializeIterator();
-    }
-    if (iterator.hasNext()) {
-      clearAttributes();
-      AnnotationFS next = iterator.next();
-      termAttr.append(next.getCoveredText());
-      offsetAttr.setOffset(correctOffset(next.getBegin()), correctOffset(next.getEnd()));
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  @Override
-  public void end() throws IOException {
-    super.end();
-    offsetAttr.setOffset(finalOffset, finalOffset);
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java
deleted file mode 100644
index 58ce024..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java
+++ /dev/null
@@ -1,47 +0,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.
- */
-package org.apache.lucene.analysis.uima;
-
-
-import org.apache.lucene.analysis.util.TokenizerFactory;
-import org.apache.lucene.util.AttributeFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * {@link org.apache.lucene.analysis.util.TokenizerFactory} for {@link UIMAAnnotationsTokenizer}
- */
-public class UIMAAnnotationsTokenizerFactory extends TokenizerFactory {
-
-  private String descriptorPath;
-  private String tokenType;
-  private final Map<String,Object> configurationParameters = new HashMap<>();
-
-  /** Creates a new UIMAAnnotationsTokenizerFactory */
-  public UIMAAnnotationsTokenizerFactory(Map<String,String> args) {
-    super(args);
-    tokenType = require(args, "tokenType");
-    descriptorPath = require(args, "descriptorPath");
-    configurationParameters.putAll(args);
-  }
-
-  @Override
-  public UIMAAnnotationsTokenizer create(AttributeFactory factory) {
-    return new UIMAAnnotationsTokenizer(descriptorPath, tokenType, configurationParameters, factory);
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMABaseAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMABaseAnalyzer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMABaseAnalyzer.java
deleted file mode 100644
index 07e5e2a..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMABaseAnalyzer.java
+++ /dev/null
@@ -1,44 +0,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.
- */
-package org.apache.lucene.analysis.uima;
-
-
-import org.apache.lucene.analysis.Analyzer;
-
-import java.util.Map;
-
-/**
- * An {@link Analyzer} which use the {@link UIMAAnnotationsTokenizer} for creating tokens
- */
-public final class UIMABaseAnalyzer extends Analyzer {
-
-  private final String descriptorPath;
-  private final String tokenType;
-  private final Map<String, Object> configurationParameters;
-
-  public UIMABaseAnalyzer(String descriptorPath, String tokenType, Map<String, Object> configurationParameters) {
-    this.descriptorPath = descriptorPath;
-    this.tokenType = tokenType;
-    this.configurationParameters = configurationParameters;
-  }
-
-  @Override
-  protected TokenStreamComponents createComponents(String fieldName) {
-    return new TokenStreamComponents(new UIMAAnnotationsTokenizer(descriptorPath, tokenType, configurationParameters));
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzer.java
deleted file mode 100644
index 9d3a7d7..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzer.java
+++ /dev/null
@@ -1,44 +0,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.
- */
-package org.apache.lucene.analysis.uima;
-
-
-import org.apache.lucene.analysis.Analyzer;
-
-import java.util.Map;
-
-/**
- * {@link Analyzer} which uses the {@link UIMATypeAwareAnnotationsTokenizer} for the tokenization phase
- */
-public final class UIMATypeAwareAnalyzer extends Analyzer {
-  private final String descriptorPath;
-  private final String tokenType;
-  private final String featurePath;
-  private final Map<String, Object> configurationParameters;
-
-  public UIMATypeAwareAnalyzer(String descriptorPath, String tokenType, String featurePath, Map<String, Object> configurationParameters) {
-    this.descriptorPath = descriptorPath;
-    this.tokenType = tokenType;
-    this.featurePath = featurePath;
-    this.configurationParameters = configurationParameters;
-  }
-
-  @Override
-  protected TokenStreamComponents createComponents(String fieldName) {
-    return new TokenStreamComponents(new UIMATypeAwareAnnotationsTokenizer(descriptorPath, tokenType, featurePath, configurationParameters));
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java
deleted file mode 100644
index 870086a..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java
+++ /dev/null
@@ -1,113 +0,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.
- */
-package org.apache.lucene.analysis.uima;
-
-
-import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
-import org.apache.lucene.util.AttributeFactory;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
-import org.apache.uima.cas.CASException;
-import org.apache.uima.cas.FeaturePath;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.resource.ResourceInitializationException;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * A {@link Tokenizer} which creates token from UIMA Annotations filling also their {@link TypeAttribute} according to
- * {@link org.apache.uima.cas.FeaturePath}s specified
- */
-public final class UIMATypeAwareAnnotationsTokenizer extends BaseUIMATokenizer {
-
-  private final TypeAttribute typeAttr;
-
-  private final CharTermAttribute termAttr;
-
-  private final OffsetAttribute offsetAttr;
-
-  private final String tokenTypeString;
-
-  private final String typeAttributeFeaturePath;
-
-  private FeaturePath featurePath;
-
-  private int finalOffset = 0;
-
-  public UIMATypeAwareAnnotationsTokenizer(String descriptorPath, String tokenType, String typeAttributeFeaturePath, Map<String, Object> configurationParameters) {
-    this(descriptorPath, tokenType, typeAttributeFeaturePath, configurationParameters, DEFAULT_TOKEN_ATTRIBUTE_FACTORY);
-  }
-
-  public UIMATypeAwareAnnotationsTokenizer(String descriptorPath, String tokenType, String typeAttributeFeaturePath, 
-                                           Map<String, Object> configurationParameters, AttributeFactory factory) {
-    super(factory, descriptorPath, configurationParameters);
-    this.tokenTypeString = tokenType;
-    this.termAttr = addAttribute(CharTermAttribute.class);
-    this.typeAttr = addAttribute(TypeAttribute.class);
-    this.offsetAttr = addAttribute(OffsetAttribute.class);
-    this.typeAttributeFeaturePath = typeAttributeFeaturePath;
-  }
-
-  @Override
-  protected void initializeIterator() throws IOException {
-    try {
-      analyzeInput();
-    } catch (AnalysisEngineProcessException | ResourceInitializationException e) {
-      throw new IOException(e);
-    }
-    featurePath = cas.createFeaturePath();
-    try {
-      featurePath.initialize(typeAttributeFeaturePath);
-    } catch (CASException e) {
-      featurePath = null;
-      throw new IOException(e);
-    }
-    finalOffset = correctOffset(cas.getDocumentText().length());
-    Type tokenType = cas.getTypeSystem().getType(tokenTypeString);
-    iterator = cas.getAnnotationIndex(tokenType).iterator();
-
-  }
-
-  @Override
-  public boolean incrementToken() throws IOException {
-    if (iterator == null) {
-      initializeIterator();
-    }
-    if (iterator.hasNext()) {
-      clearAttributes();
-      AnnotationFS next = iterator.next();
-      termAttr.append(next.getCoveredText());
-      offsetAttr.setOffset(correctOffset(next.getBegin()), correctOffset(next.getEnd()));
-      typeAttr.setType(featurePath.getValueAsString(next));
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  @Override
-  public void end() throws IOException {
-    super.end();
-    offsetAttr.setOffset(finalOffset, finalOffset);
-  }
-
-
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java
deleted file mode 100644
index f77f7d9..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java
+++ /dev/null
@@ -1,50 +0,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.
- */
-package org.apache.lucene.analysis.uima;
-
-
-import org.apache.lucene.analysis.util.TokenizerFactory;
-import org.apache.lucene.util.AttributeFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * {@link org.apache.lucene.analysis.util.TokenizerFactory} for {@link UIMATypeAwareAnnotationsTokenizer}
- */
-public class UIMATypeAwareAnnotationsTokenizerFactory extends TokenizerFactory {
-
-  private String descriptorPath;
-  private String tokenType;
-  private String featurePath;
-  private final Map<String,Object> configurationParameters = new HashMap<>();
-
-  /** Creates a new UIMATypeAwareAnnotationsTokenizerFactory */
-  public UIMATypeAwareAnnotationsTokenizerFactory(Map<String,String> args) {
-    super(args);
-    featurePath = require(args, "featurePath");
-    tokenType = require(args, "tokenType");
-    descriptorPath = require(args, "descriptorPath");
-    configurationParameters.putAll(args);
-  }
-
-  @Override
-  public UIMATypeAwareAnnotationsTokenizer create(AttributeFactory factory) {
-    return new UIMATypeAwareAnnotationsTokenizer
-        (descriptorPath, tokenType, featurePath, configurationParameters, factory);
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProvider.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProvider.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProvider.java
deleted file mode 100644
index 12dc2f0..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProvider.java
+++ /dev/null
@@ -1,34 +0,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.
- */
-package org.apache.lucene.analysis.uima.ae;
-
-
-import org.apache.uima.analysis_engine.AnalysisEngine;
-import org.apache.uima.resource.ResourceInitializationException;
-
-/**
- * provide an Apache UIMA {@link AnalysisEngine}
- * 
- */
-public interface AEProvider {
-
-  /**
-   * Returns the AnalysisEngine
-   */
-  public AnalysisEngine getAE() throws ResourceInitializationException;
-
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java
deleted file mode 100644
index cfa642f..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java
+++ /dev/null
@@ -1,76 +0,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.
- */
-package org.apache.lucene.analysis.uima.ae;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Singleton factory class responsible of {@link AEProvider}s' creation
- */
-public class AEProviderFactory {
-
-  private static final AEProviderFactory instance = new AEProviderFactory();
-
-  private final Map<String, AEProvider> providerCache = new HashMap<>();
-
-  private AEProviderFactory() {
-    // Singleton
-  }
-
-  public static AEProviderFactory getInstance() {
-    return instance;
-  }
-
-  /**
-   * @param keyPrefix         a prefix of the key used to cache the AEProvider
-   * @param aePath            the AnalysisEngine descriptor path
-   * @param runtimeParameters map of runtime parameters to configure inside the AnalysisEngine
-   * @return AEProvider
-   */
-  public synchronized AEProvider getAEProvider(String keyPrefix, String aePath, Map<String, Object> runtimeParameters) {
-    String key = new StringBuilder(keyPrefix != null ? keyPrefix : "").append(aePath).append(runtimeParameters != null ?
-        runtimeParameters.toString() : "").toString();
-    if (providerCache.get(key) == null) {
-      AEProvider aeProvider;
-      if (runtimeParameters != null)
-        aeProvider = new OverridingParamsAEProvider(aePath, runtimeParameters);
-      else
-        aeProvider = new BasicAEProvider(aePath);
-      providerCache.put(key, aeProvider);
-    }
-    return providerCache.get(key);
-  }
-
-  /**
-   * @param aePath the AnalysisEngine descriptor path
-   * @return AEProvider
-   */
-  public synchronized AEProvider getAEProvider(String aePath) {
-    return getAEProvider(null, aePath, null);
-  }
-
-  /**
-   * @param aePath            the AnalysisEngine descriptor path
-   * @param runtimeParameters map of runtime parameters to configure inside the AnalysisEngine
-   * @return AEProvider
-   */
-  public synchronized AEProvider getAEProvider(String aePath, Map<String, Object> runtimeParameters) {
-    return getAEProvider(null, aePath, runtimeParameters);
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/BasicAEProvider.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/BasicAEProvider.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/BasicAEProvider.java
deleted file mode 100644
index d553322..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/BasicAEProvider.java
+++ /dev/null
@@ -1,87 +0,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.
- */
-package org.apache.lucene.analysis.uima.ae;
-
-
-import java.io.IOException;
-
-import org.apache.lucene.util.IOUtils;
-import org.apache.uima.UIMAFramework;
-import org.apache.uima.analysis_engine.AnalysisEngine;
-import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.util.XMLInputSource;
-
-/**
- * Basic {@link AEProvider} which just instantiates a UIMA {@link AnalysisEngine} with no additional metadata,
- * parameters or resources
- */
-public class BasicAEProvider implements AEProvider {
-
-  private final String aePath;
-  private AnalysisEngineDescription cachedDescription;
-
-  public BasicAEProvider(String aePath) {
-    this.aePath = aePath;
-  }
-
-  @Override
-  public AnalysisEngine getAE() throws ResourceInitializationException {
-    synchronized(this) {
-      if (cachedDescription == null) {
-        XMLInputSource in = null;
-        boolean success = false;
-        try {
-          // get Resource Specifier from XML file
-          in = getInputSource();
-
-          // get AE description
-          cachedDescription = UIMAFramework.getXMLParser()
-              .parseAnalysisEngineDescription(in);
-          configureDescription(cachedDescription);
-          success = true;
-        } catch (Exception e) {
-            throw new ResourceInitializationException(e);
-        } finally {
-          if (success) {
-            try {
-              IOUtils.close(in.getInputStream());
-            } catch (IOException e) {
-              throw new ResourceInitializationException(e);
-            }
-          } else if (in != null) {
-            IOUtils.closeWhileHandlingException(in.getInputStream());
-          }
-        }
-      } 
-    }
-
-    return UIMAFramework.produceAnalysisEngine(cachedDescription);
-  }
-  
-  protected void configureDescription(AnalysisEngineDescription description) {
-    // no configuration
-  }
-  
-  private XMLInputSource getInputSource() throws IOException {
-    try {
-      return new XMLInputSource(aePath);
-    } catch (Exception e) {
-      return new XMLInputSource(getClass().getResource(aePath));
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProvider.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProvider.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProvider.java
deleted file mode 100644
index 67ccb7a..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProvider.java
+++ /dev/null
@@ -1,69 +0,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.
- */
-package org.apache.lucene.analysis.uima.ae;
-
-
-import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-
-import java.util.Map;
-
-/**
- * {@link AEProvider} implementation that creates an Aggregate AE from the given path, also
- * injecting runtime parameters defined in the solrconfig.xml Solr configuration file and assigning
- * them as overriding parameters in the aggregate AE
- */
-public class OverridingParamsAEProvider extends BasicAEProvider {
-
-  private final Map<String, Object> runtimeParameters;
-
-  public OverridingParamsAEProvider(String aePath, Map<String, Object> runtimeParameters) {
-    super(aePath);
-    this.runtimeParameters = runtimeParameters;
-  }
-  
-  @Override
-  protected void configureDescription(AnalysisEngineDescription description) {
-    for (String attributeName : runtimeParameters.keySet()) {
-      Object val = getRuntimeValue(description, attributeName);
-      description.getAnalysisEngineMetaData().getConfigurationParameterSettings().setParameterValue(
-          attributeName, val);
-    }
-  }
-
-  /* create the value to inject in the runtime parameter depending on its declared type */
-  private Object getRuntimeValue(AnalysisEngineDescription desc, String attributeName) {
-    String type = desc.getAnalysisEngineMetaData().getConfigurationParameterDeclarations().
-        getConfigurationParameter(null, attributeName).getType();
-    // TODO : do it via reflection ? i.e. Class paramType = Class.forName(type)...
-    Object val = null;
-    Object runtimeValue = runtimeParameters.get(attributeName);
-    if (runtimeValue != null) {
-      if ("String".equals(type)) {
-        val = String.valueOf(runtimeValue);
-      } else if ("Integer".equals(type)) {
-        val = Integer.valueOf(runtimeValue.toString());
-      } else if ("Boolean".equals(type)) {
-        val = Boolean.valueOf(runtimeValue.toString());
-      } else if ("Float".equals(type)) {
-        val = Float.valueOf(runtimeValue.toString());
-      }
-    }
-
-    return val;
-  }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java
deleted file mode 100644
index e08da29..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java
+++ /dev/null
@@ -1,21 +0,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.
- */
-
-/**
- * Integration with UIMA's AnalysisEngine.
- */
-package org.apache.lucene.analysis.uima.ae;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java
deleted file mode 100644
index 0baa0fc..0000000
--- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java
+++ /dev/null
@@ -1,21 +0,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.
- */
-
-/**
- * Classes that integrate UIMA with Lucene's analysis API.
- */
-package org.apache.lucene.analysis.uima;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/java/overview.html
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/java/overview.html b/lucene/analysis/uima/src/java/overview.html
deleted file mode 100644
index 82267ae..0000000
--- a/lucene/analysis/uima/src/java/overview.html
+++ /dev/null
@@ -1,29 +0,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.
--->
-<html>
-  <head>
-    <title>
-      analyzers-uima
-    </title>
-  </head>
-  <body>
-  Analysis integration with <a href="http://uima.apache.org/">Apache UIMA</a>.
-  <p>
-  For an introduction to Lucene's analysis API, see the {@link org.apache.lucene.analysis} package documentation.
-  </p>
-  </body>
-</html>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory b/lucene/analysis/uima/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory
deleted file mode 100644
index eeea38a..0000000
--- a/lucene/analysis/uima/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory
+++ /dev/null
@@ -1,17 +0,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.
-
-org.apache.lucene.analysis.uima.UIMAAnnotationsTokenizerFactory
-org.apache.lucene.analysis.uima.UIMATypeAwareAnnotationsTokenizerFactory

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/resources/uima/AggregateSentenceAE.xml
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/resources/uima/AggregateSentenceAE.xml b/lucene/analysis/uima/src/resources/uima/AggregateSentenceAE.xml
deleted file mode 100644
index 73d697e..0000000
--- a/lucene/analysis/uima/src/resources/uima/AggregateSentenceAE.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.
--->
-<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>false</primitive>
-  <delegateAnalysisEngineSpecifiers>
-    <delegateAnalysisEngine key="WhitespaceTokenizer">
-      <import name="WhitespaceTokenizer"/>
-    </delegateAnalysisEngine>
-    <delegateAnalysisEngine key="HmmTagger">
-      <import name="HmmTagger"/>
-    </delegateAnalysisEngine>
-  </delegateAnalysisEngineSpecifiers>
-  <analysisEngineMetaData>
-    <name>AggregateSentenceAE</name>
-    <description/>
-    <version>1.0</version>
-    <vendor/>
-    <configurationParameters>
-      <configurationParameter>
-        <name>ngramsize</name>
-        <type>Integer</type>
-        <multiValued>false</multiValued>
-        <mandatory>false</mandatory>
-        <overrides>
-          <parameter>HmmTagger/NGRAM_SIZE</parameter>
-        </overrides>
-      </configurationParameter>
-    </configurationParameters>
-    <configurationParameterSettings/>
-    <flowConstraints>
-      <fixedFlow>
-        <node>WhitespaceTokenizer</node>
-        <node>HmmTagger</node>
-      </fixedFlow>
-    </flowConstraints>
-    <fsIndexCollection/>
-    <capabilities>
-      <capability>
-        <inputs/>
-        <outputs>
-          <type allAnnotatorFeatures="true">org.apache.uima.SentenceAnnotation</type>
-          <type allAnnotatorFeatures="true">org.apache.uima.TokenAnnotation</type>
-        </outputs>
-        <languagesSupported/>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
-      <outputsNewCASes>false</outputsNewCASes>
-    </operationalProperties>
-  </analysisEngineMetaData>
-  <resourceManagerConfiguration/>
-</analysisEngineDescription>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/test-files/uima/TestAggregateSentenceAE.xml
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/test-files/uima/TestAggregateSentenceAE.xml b/lucene/analysis/uima/src/test-files/uima/TestAggregateSentenceAE.xml
deleted file mode 100644
index 51a778b..0000000
--- a/lucene/analysis/uima/src/test-files/uima/TestAggregateSentenceAE.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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.
--->
-<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>false</primitive>
-  <delegateAnalysisEngineSpecifiers>
-    <delegateAnalysisEngine key="WhitespaceTokenizer">
-      <import location="TestWSTokenizerAE.xml"/>
-    </delegateAnalysisEngine>
-    <delegateAnalysisEngine key="PoSTagger">
-      <import location="TestPoSTaggerAE.xml"/>
-    </delegateAnalysisEngine>
-  </delegateAnalysisEngineSpecifiers>
-  <analysisEngineMetaData>
-    <name>TestAggregateSentenceAE</name>
-    <description/>
-    <version>1.0</version>
-    <vendor>ASF</vendor>
-    <flowConstraints>
-      <fixedFlow>
-        <node>WhitespaceTokenizer</node>
-        <node>PoSTagger</node>
-      </fixedFlow>
-    </flowConstraints>
-    <capabilities>
-      <capability>
-        <inputs/>
-        <outputs>
-          <type allAnnotatorFeatures="true">org.apache.lucene.uima.ts.SentenceAnnotation</type>
-          <type allAnnotatorFeatures="true">org.apache.lucene.uima.ts.TokenAnnotation</type>
-        </outputs>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
-      <outputsNewCASes>false</outputsNewCASes>
-    </operationalProperties>
-  </analysisEngineMetaData>
-</analysisEngineDescription>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b7d14c50/lucene/analysis/uima/src/test-files/uima/TestEntityAnnotatorAE.xml
----------------------------------------------------------------------
diff --git a/lucene/analysis/uima/src/test-files/uima/TestEntityAnnotatorAE.xml b/lucene/analysis/uima/src/test-files/uima/TestEntityAnnotatorAE.xml
deleted file mode 100644
index e9122e6..0000000
--- a/lucene/analysis/uima/src/test-files/uima/TestEntityAnnotatorAE.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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.
--->
-<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>true</primitive>
-  <annotatorImplementationName>org.apache.lucene.analysis.uima.an.SampleEntityAnnotator</annotatorImplementationName>
-  <analysisEngineMetaData>
-    <name>EntityAnnotator</name>
-    <description/>
-    <version>1.0</version>
-    <vendor>ASF</vendor>
-    <typeSystemDescription>
-      <types>
-        <typeDescription>
-          <name>org.apache.lucene.uima.ts.EntityAnnotation</name>
-          <description/>
-          <supertypeName>uima.tcas.Annotation</supertypeName>
-          <features>
-            <featureDescription>
-              <name>name</name>
-              <description/>
-              <rangeTypeName>uima.cas.String</rangeTypeName>
-            </featureDescription>
-            <featureDescription>
-              <name>entity</name>
-              <description/>
-              <rangeTypeName>uima.cas.String</rangeTypeName>
-            </featureDescription>
-          </features>
-        </typeDescription>
-      </types>
-    </typeSystemDescription>
-    <capabilities>
-      <capability>
-        <inputs>
-          <type allAnnotatorFeatures="true">org.apache.lucene.uima.ts.TokenAnnotation</type>
-        </inputs>
-        <outputs>
-          <type allAnnotatorFeatures="true">org.apache.lucene.uima.ts.EntityAnnotation</type>
-        </outputs>
-        <languagesSupported/>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
-      <outputsNewCASes>false</outputsNewCASes>
-    </operationalProperties>
-  </analysisEngineMetaData>
-  <resourceManagerConfiguration/>
-</analysisEngineDescription>


Mime
View raw message