From f5c04ae17bf59933e2dd33578b9423a6259bb84c Mon Sep 17 00:00:00 2001 From: Shalin Shekhar Mangar Date: Tue, 15 Dec 2009 07:49:07 +0000 Subject: [PATCH] Reverting SOLR-1643 and moving TikaEntityProcessor and test to extras git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@890679 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 12 + contrib/dataimporthandler/CHANGES.txt | 2 +- contrib/dataimporthandler/build.xml | 69 ++- ...-dataimporthandler-extras-pom.xml.template | 52 +++ .../dataimport/MailEntityProcessor.java | 0 .../dataimport/TikaEntityProcessor.java | 0 .../dataimport/TestMailEntityProcessor.java | 0 .../dataimport/TestTikaEntityProcessor.java | 2 +- .../conf/dataimport-schema-no-unique-key.xml | 0 .../solr/conf/dataimport-solrconfig.xml | 409 ++++++++++++++++++ 10 files changed, 540 insertions(+), 6 deletions(-) create mode 100644 contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template rename contrib/dataimporthandler/src/{ => extras}/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java (100%) rename contrib/dataimporthandler/src/{ => extras}/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java (100%) rename contrib/dataimporthandler/src/{ => extras}/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java (100%) rename contrib/dataimporthandler/src/{ => extras}/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java (93%) rename contrib/dataimporthandler/src/{ => extras}/test/resources/solr/conf/dataimport-schema-no-unique-key.xml (100%) create mode 100644 contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml diff --git a/build.xml b/build.xml index 5a372a93c7d..c81ade1a4c2 100644 --- a/build.xml +++ b/build.xml @@ -529,6 +529,8 @@ + @@ -731,6 +733,7 @@ + @@ -794,6 +797,15 @@ + + + + + + + + diff --git a/contrib/dataimporthandler/CHANGES.txt b/contrib/dataimporthandler/CHANGES.txt index d45f9da59ca..102fdf0dc5d 100644 --- a/contrib/dataimporthandler/CHANGES.txt +++ b/contrib/dataimporthandler/CHANGES.txt @@ -50,7 +50,7 @@ Other Changes Build ---------------------- -* SOLR-1643: Moved dataimporthandler extras into dataimporthandler core (shalin) + Documentation ---------------------- diff --git a/contrib/dataimporthandler/build.xml b/contrib/dataimporthandler/build.xml index aea55c0c5c7..b2832a79acb 100644 --- a/contrib/dataimporthandler/build.xml +++ b/contrib/dataimporthandler/build.xml @@ -37,10 +37,17 @@ - - + + + + + + + + + @@ -49,6 +56,16 @@ + + + + + + + + + + @@ -77,9 +94,18 @@ - + + + + + + + + @@ -89,7 +115,16 @@ - + + + + + + + + + Tests failed! + + + + + + + + + + + + + + + + Tests failed! + + @@ -119,6 +177,7 @@ + @@ -127,6 +186,7 @@ + + diff --git a/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template b/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template new file mode 100644 index 00000000000..491dd8902e3 --- /dev/null +++ b/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template @@ -0,0 +1,52 @@ + + + + + 4.0.0 + + + org.apache.solr + solr-parent + @maven_version@ + + + org.apache.solr + solr-dataimporthandler-extras + Apache Solr DataImportHandler Extras + @maven_version@ + Apache Solr DataImportHandler Extras + jar + + + + javax.activation + activation + 1.1 + + + javax.mail + mail + 1.4.1 + + + + diff --git a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java b/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java similarity index 100% rename from contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java rename to contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java diff --git a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java b/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java similarity index 100% rename from contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java rename to contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java diff --git a/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java b/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java similarity index 100% rename from contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java rename to contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java diff --git a/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java b/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java similarity index 93% rename from contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java rename to contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java index 059a2a44a1e..17e245df1ee 100644 --- a/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java +++ b/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java @@ -48,7 +48,7 @@ public class TestTikaEntityProcessor extends AbstractDataImportHandlerTest { "" + " " + " " + - " " + + " " + " " + " " + " " + diff --git a/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-schema-no-unique-key.xml b/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-schema-no-unique-key.xml similarity index 100% rename from contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-schema-no-unique-key.xml rename to contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-schema-no-unique-key.xml diff --git a/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml b/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml new file mode 100644 index 00000000000..ff7f3b808c9 --- /dev/null +++ b/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml @@ -0,0 +1,409 @@ + + + + + + ${solr.abortOnConfigurationError:true} + + + ${solr.data.dir:./solr/data} + + + + + false + + 10 + + + + 32 + 2147483647 + 10000 + 1000 + 10000 + + + + + + + + + + + single + + + + + false + 32 + 10 + + + 2147483647 + 10000 + + + false + + + + + + + + + 100000 + + + + + + + 1024 + + + + + + + + + + + + + true + + + + + + + + 50 + + + 200 + + + + + + + + + solr 0 10 + rocks 0 10 + static newSearcher warming query from solrconfig.xml + + + + + + + + + + + false + + + 4 + + + + + + + + + + + + + + + + + + + + + + + explicit + + + + + + + + MockDataSource + + + + + + + + + explicit + + + + + + + + + + + + *:* + + + + + +