This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_2x by this push:
new 462997d create advanced-parser-modules
462997d is described below
commit 462997ddec94081420ed1d051fc8d193e4b18425
Author: tallison <[email protected]>
AuthorDate: Thu Aug 20 05:55:06 2020 -0400
create advanced-parser-modules
---
pom.xml | 3 +--
tika-advanced-parser-modules/pom.xml | 22 +++++++++++++++++++++
.../tika-dl}/pom.xml | 0
.../tika/dl/imagerec/DL4JInceptionV3Net.java | 0
.../org/apache/tika/dl/imagerec/DL4JVGG16Net.java | 0
.../tika/dl/imagerec/DL4JInceptionV3NetTest.java | 0
.../apache/tika/dl/imagerec/DL4JVGG16NetTest.java | 0
.../resources/org/apache/tika/dl/imagerec/cat.jpg | Bin
.../tika/dl/imagerec/dl4j-inception3-config.xml | 0
.../apache/tika/dl/imagerec/dl4j-vgg16-config.xml | 0
.../resources/org/apache/tika/dl/imagerec/lion.jpg | Bin
.../tika-nlp}/pom.xml | 0
.../tika/parser/recognition/AgeRecogniser.java | 0
.../parser/recognition/AgeRecogniserConfig.java | 0
.../tika/parser/recognition/AgeRecogniserTest.java | 0
.../tika/parser/recognition/tika-config-age.xml | 0
.../tika-parser-advancedmedia-module/pom.xml | 0
.../tika/parser/captioning/CaptionObject.java | 0
.../captioning/tf/TensorflowRESTCaptioner.java | 0
.../tika/parser/pot/PooledTimeSeriesParser.java | 0
.../tika/parser/recognition/ObjectRecogniser.java | 0
.../recognition/ObjectRecognitionParser.java | 0
.../tika/parser/recognition/RecognisedObject.java | 0
.../recognition/tf/TensorflowImageRecParser.java | 0
.../recognition/tf/TensorflowRESTRecogniser.java | 0
.../tf/TensorflowRESTVideoRecogniser.java | 0
.../tika/parser/captioning/tf/caption_generator.py | 0
.../apache/tika/parser/captioning/tf/im2txtapi.py | 0
.../tika/parser/captioning/tf/model_info.xml | 0
.../tika/parser/captioning/tf/model_wrapper.py | 0
.../apache/tika/parser/captioning/tf/vocabulary.py | 0
.../tika/parser/recognition/tf/inception_v4.py | 0
.../tika/parser/recognition/tf/inceptionapi.py | 0
.../tika/parser/recognition/tf/video_util.py | 0
.../recognition/tika-config-tflow-im2txt-rest.xml | 0
.../parser/recognition/tika-config-tflow-rest.xml | 0
.../recognition/tika-config-tflow-video-rest.xml | 0
.../tika/parser/recognition/tika-config-tflow.xml | 0
.../recognition/ObjectRecognitionParserTest.java | 0
.../tf/TensorflowImageRecParserTest.java | 0
.../tf/TensorflowVideoRecParserTest.java | 0
.../tika-parser-nlp-module/pom.xml | 0
.../parser/ctakes/CTAKESAnnotationProperty.java | 0
.../apache/tika/parser/ctakes/CTAKESConfig.java | 0
.../tika/parser/ctakes/CTAKESContentHandler.java | 0
.../apache/tika/parser/ctakes/CTAKESParser.java | 0
.../tika/parser/ctakes/CTAKESSerializer.java | 0
.../org/apache/tika/parser/ctakes/CTAKESUtils.java | 0
.../java/org/apache/tika/parser/geo/GeoParser.java | 0
.../apache/tika/parser/geo/GeoParserConfig.java | 0
.../java/org/apache/tika/parser/geo/GeoTag.java | 0
.../tika/parser/geo/NameEntityExtractor.java | 0
.../parser/geo/gazetteer/GeoGazetteerClient.java | 0
.../apache/tika/parser/geo/gazetteer/Location.java | 0
.../tika/parser/journal/GrobidRESTParser.java | 0
.../apache/tika/parser/journal/JournalParser.java | 0
.../apache/tika/parser/journal/TEIDOMParser.java | 0
.../org/apache/tika/parser/ner/NERecogniser.java | 0
.../apache/tika/parser/ner/NamedEntityParser.java | 0
.../parser/ner/corenlp/CoreNLPNERecogniser.java | 0
.../tika/parser/ner/grobid/GrobidNERecogniser.java | 0
.../tika/parser/ner/mitie/MITIENERecogniser.java | 0
.../tika/parser/ner/nltk/NLTKNERecogniser.java | 0
.../parser/ner/opennlp/OpenNLPNERecogniser.java | 0
.../tika/parser/ner/opennlp/OpenNLPNameFinder.java | 0
.../tika/parser/ner/regex/RegexNERecogniser.java | 0
.../parser/sentiment/SentimentAnalysisParser.java | 0
.../tika/parser/ctakes/CTAKESConfig.properties | 0
.../tika/parser/geo/GeoTopicConfig.properties | 0
.../tika/parser/journal/GrobidExtractor.properties | 0
.../tika/parser/ner/grobid/GrobidServer.properties | 0
.../tika/parser/ner/nltk/NLTKServer.properties | 0
.../org/apache/tika/parser/ner/regex/ner-regex.txt | 0
tika-parser-modules/pom.xml | 3 +--
.../tika-parser-integration-tests}/pom.xml | 0
.../tests/apple/AppleSingleFileParserTest.java | 0
.../tika/parser/tests/apple/PListParserTest.java | 0
.../tika/parser/tests/html/HtmlParserTest.java | 0
.../tika/parser/tests/mail/MboxParserTest.java | 0
.../tika/parser/tests/mail/RFC822ParserTest.java | 0
.../tika/parser/tests/microsoft/EMFParserTest.java | 0
.../parser/tests/microsoft/ExcelParserTest.java | 0
.../microsoft/POIContainerExtractionTest.java | 0
.../tests/microsoft/PowerPointParserTest.java | 0
.../parser/tests/microsoft/XML2003ParserTest.java | 0
.../tests/microsoft/ooxml/OOXMLParserTest.java | 0
.../tests/microsoft/ooxml/TruncatedOOXMLTest.java | 0
.../parser/tests/microsoft/rtf/RTFParserTest.java | 0
.../parser/tests/ocr/TesseractOCRParserTest.java | 0
.../tika/parser/tests/odf/ODFParserTest.java | 0
.../tika/parser/tests/pdf/PDFParserTest.java | 0
.../apache/tika/parser/tests/pkg/ArParserTest.java | 0
.../tika/parser/tests/pkg/Bzip2ParserTest.java | 0
.../pkg/CompositeZipContainerDetectorTest.java | 0
.../tika/parser/tests/pkg/CompressParserTest.java | 0
.../parser/tests/pkg/CompressorParserTest.java | 0
.../tika/parser/tests/pkg/GzipParserTest.java | 0
.../tika/parser/tests/pkg/RarParserTest.java | 0
.../tika/parser/tests/pkg/Seven7ParserTest.java | 0
.../tika/parser/tests/pkg/TarParserTest.java | 0
.../tika/parser/tests/pkg/ZipParserTest.java | 0
.../tika/parser/tests/pkg/ZlibParserTest.java | 0
.../parser/tests/xml/FictionBookParserTest.java | 0
103 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index bf64e5a..6443f46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,7 @@
<module>tika-example</module>
<module>tika-java7</module>
<module>tika-eval</module>
- <module>tika-dl</module>
- <module>tika-nlp</module>
+ <module>tika-advanced-parser-modules</module>
</modules>
<profiles>
diff --git a/tika-advanced-parser-modules/pom.xml
b/tika-advanced-parser-modules/pom.xml
new file mode 100644
index 0000000..72c6511
--- /dev/null
+++ b/tika-advanced-parser-modules/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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";>
+ <parent>
+ <artifactId>tika</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-advanced-parser-modules</artifactId>
+
+
+ <modules>
+ <module>tika-dl</module>
+ <module>tika-nlp</module>
+ <module>tika-parser-advancedmedia-module</module>
+ <module>tika-parser-nlp-module</module>
+
+ </modules>
+</project>
\ No newline at end of file
diff --git a/tika-dl/pom.xml b/tika-advanced-parser-modules/tika-dl/pom.xml
similarity index 100%
rename from tika-dl/pom.xml
rename to tika-advanced-parser-modules/tika-dl/pom.xml
diff --git
a/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JInceptionV3Net.java
b/tika-advanced-parser-modules/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JInceptionV3Net.java
similarity index 100%
rename from
tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JInceptionV3Net.java
rename to
tika-advanced-parser-modules/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JInceptionV3Net.java
diff --git
a/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JVGG16Net.java
b/tika-advanced-parser-modules/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JVGG16Net.java
similarity index 100%
rename from tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JVGG16Net.java
rename to
tika-advanced-parser-modules/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JVGG16Net.java
diff --git
a/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
b/tika-advanced-parser-modules/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
similarity index 100%
rename from
tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
rename to
tika-advanced-parser-modules/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
diff --git
a/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
b/tika-advanced-parser-modules/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
similarity index 100%
rename from
tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
rename to
tika-advanced-parser-modules/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
diff --git a/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/cat.jpg
b/tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/cat.jpg
similarity index 100%
rename from tika-dl/src/test/resources/org/apache/tika/dl/imagerec/cat.jpg
rename to
tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/cat.jpg
diff --git
a/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-inception3-config.xml
b/tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-inception3-config.xml
similarity index 100%
rename from
tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-inception3-config.xml
rename to
tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-inception3-config.xml
diff --git
a/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-vgg16-config.xml
b/tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-vgg16-config.xml
similarity index 100%
rename from
tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-vgg16-config.xml
rename to
tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-vgg16-config.xml
diff --git a/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/lion.jpg
b/tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/lion.jpg
similarity index 100%
rename from tika-dl/src/test/resources/org/apache/tika/dl/imagerec/lion.jpg
rename to
tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/lion.jpg
diff --git a/tika-nlp/pom.xml b/tika-advanced-parser-modules/tika-nlp/pom.xml
similarity index 100%
rename from tika-nlp/pom.xml
rename to tika-advanced-parser-modules/tika-nlp/pom.xml
diff --git
a/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniser.java
b/tika-advanced-parser-modules/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniser.java
similarity index 100%
rename from
tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniser.java
rename to
tika-advanced-parser-modules/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniser.java
diff --git
a/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniserConfig.java
b/tika-advanced-parser-modules/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniserConfig.java
similarity index 100%
rename from
tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniserConfig.java
rename to
tika-advanced-parser-modules/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniserConfig.java
diff --git
a/tika-nlp/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
b/tika-advanced-parser-modules/tika-nlp/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
similarity index 100%
rename from
tika-nlp/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
rename to
tika-advanced-parser-modules/tika-nlp/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
diff --git
a/tika-nlp/src/test/resources/org/apache/tika/parser/recognition/tika-config-age.xml
b/tika-advanced-parser-modules/tika-nlp/src/test/resources/org/apache/tika/parser/recognition/tika-config-age.xml
similarity index 100%
rename from
tika-nlp/src/test/resources/org/apache/tika/parser/recognition/tika-config-age.xml
rename to
tika-advanced-parser-modules/tika-nlp/src/test/resources/org/apache/tika/parser/recognition/tika-config-age.xml
diff --git a/tika-parser-modules/tika-parser-advancedmedia-module/pom.xml
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-advancedmedia-module/pom.xml
rename to tika-advanced-parser-modules/tika-parser-advancedmedia-module/pom.xml
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/CaptionObject.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/CaptionObject.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/CaptionObject.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/CaptionObject.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/RecognisedObject.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/RecognisedObject.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/RecognisedObject.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/RecognisedObject.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-im2txt-rest.xml
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-im2txt-rest.xml
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-im2txt-rest.xml
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-im2txt-rest.xml
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-rest.xml
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-rest.xml
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-rest.xml
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-rest.xml
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-video-rest.xml
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-video-rest.xml
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-video-rest.xml
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-video-rest.xml
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow.xml
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow.xml
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow.xml
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow.xml
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
diff --git
a/tika-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
rename to
tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
diff --git a/tika-parser-modules/tika-parser-nlp-module/pom.xml
b/tika-advanced-parser-modules/tika-parser-nlp-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-nlp-module/pom.xml
rename to tika-advanced-parser-modules/tika-parser-nlp-module/pom.xml
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESAnnotationProperty.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESAnnotationProperty.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESAnnotationProperty.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESAnnotationProperty.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESParser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESParser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESParser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESSerializer.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESSerializer.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESSerializer.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESSerializer.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/JournalParser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/JournalParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/JournalParser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/JournalParser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/TEIDOMParser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/TEIDOMParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/TEIDOMParser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/TEIDOMParser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NERecogniser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NERecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NERecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NERecogniser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NamedEntityParser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NamedEntityParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NamedEntityParser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NamedEntityParser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/mitie/MITIENERecogniser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/mitie/MITIENERecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/mitie/MITIENERecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/mitie/MITIENERecogniser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNERecogniser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNERecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNERecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNERecogniser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/regex/RegexNERecogniser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/regex/RegexNERecogniser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/regex/RegexNERecogniser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/regex/RegexNERecogniser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/sentiment/SentimentAnalysisParser.java
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/sentiment/SentimentAnalysisParser.java
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/sentiment/SentimentAnalysisParser.java
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/sentiment/SentimentAnalysisParser.java
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ctakes/CTAKESConfig.properties
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ctakes/CTAKESConfig.properties
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ctakes/CTAKESConfig.properties
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ctakes/CTAKESConfig.properties
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/geo/GeoTopicConfig.properties
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/geo/GeoTopicConfig.properties
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/geo/GeoTopicConfig.properties
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/geo/GeoTopicConfig.properties
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/journal/GrobidExtractor.properties
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/journal/GrobidExtractor.properties
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/journal/GrobidExtractor.properties
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/journal/GrobidExtractor.properties
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/grobid/GrobidServer.properties
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/grobid/GrobidServer.properties
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/grobid/GrobidServer.properties
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/grobid/GrobidServer.properties
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/nltk/NLTKServer.properties
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/nltk/NLTKServer.properties
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/nltk/NLTKServer.properties
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/nltk/NLTKServer.properties
diff --git
a/tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
b/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
similarity index 100%
rename from
tika-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
rename to
tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
diff --git a/tika-parser-modules/pom.xml b/tika-parser-modules/pom.xml
index 3304432..fc1dda3 100644
--- a/tika-parser-modules/pom.xml
+++ b/tika-parser-modules/pom.xml
@@ -96,11 +96,10 @@
<module>tika-parser-mail-module</module>
<module>tika-parser-miscoffice-module</module>
<module>tika-parser-news-module</module>
- <module>tika-parser-advancedmedia-module</module>
- <module>tika-parser-nlp-module</module>
<module>tika-parser-scientific-module</module>
<module>tika-parser-db-module</module>
<module>tika-parser-crypto-module</module>
+ <module>tika-parser-integration-tests</module>
</modules>
</project>
\ No newline at end of file
diff --git a/tika-parser-integration-tests/pom.xml
b/tika-parser-modules/tika-parser-integration-tests/pom.xml
similarity index 100%
rename from tika-parser-integration-tests/pom.xml
rename to tika-parser-modules/tika-parser-integration-tests/pom.xml
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/AppleSingleFileParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/AppleSingleFileParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/AppleSingleFileParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/AppleSingleFileParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/PListParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/PListParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/PListParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/PListParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/html/HtmlParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/html/HtmlParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/html/HtmlParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/html/HtmlParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/MboxParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/MboxParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/MboxParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/MboxParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/RFC822ParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/RFC822ParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/RFC822ParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/RFC822ParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/EMFParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/EMFParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/EMFParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/EMFParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ExcelParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ExcelParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ExcelParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ExcelParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/POIContainerExtractionTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/POIContainerExtractionTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/POIContainerExtractionTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/POIContainerExtractionTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/PowerPointParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/PowerPointParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/PowerPointParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/PowerPointParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/XML2003ParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/XML2003ParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/XML2003ParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/XML2003ParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/OOXMLParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/OOXMLParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/OOXMLParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/OOXMLParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/TruncatedOOXMLTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/TruncatedOOXMLTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/TruncatedOOXMLTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/TruncatedOOXMLTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/rtf/RTFParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/rtf/RTFParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/rtf/RTFParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/rtf/RTFParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/ocr/TesseractOCRParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/ocr/TesseractOCRParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/ocr/TesseractOCRParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/ocr/TesseractOCRParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/odf/ODFParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/odf/ODFParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/odf/ODFParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/odf/ODFParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pdf/PDFParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pdf/PDFParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pdf/PDFParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pdf/PDFParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ArParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ArParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ArParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ArParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Bzip2ParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Bzip2ParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Bzip2ParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Bzip2ParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompositeZipContainerDetectorTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompositeZipContainerDetectorTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompositeZipContainerDetectorTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompositeZipContainerDetectorTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressorParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressorParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressorParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressorParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/GzipParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/GzipParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/GzipParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/GzipParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/RarParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/RarParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/RarParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/RarParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Seven7ParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Seven7ParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Seven7ParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Seven7ParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/TarParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/TarParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/TarParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/TarParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZipParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZipParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZipParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZipParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZlibParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZlibParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZlibParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZlibParserTest.java
diff --git
a/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/xml/FictionBookParserTest.java
b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/xml/FictionBookParserTest.java
similarity index 100%
rename from
tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/xml/FictionBookParserTest.java
rename to
tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/xml/FictionBookParserTest.java
