You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by sn...@apache.org on 2018/06/28 07:47:15 UTC
[nutch] branch master updated (fdee94d -> 111a3cc)
This is an automated email from the ASF dual-hosted git repository.
snagel pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git.
from fdee94d Merge pull request #350 from r0ann3l/NUTCH-2601
add b89109a Fixes for NUTCH-2412: Extensible exchange component for deciding which index writer a document should go to. It includes an exchange plugin based on JEXL expressions.
add 3252f15 Merge branch 'master' into NUTCH-2412
add 4f4558f Fixes for NUTCH-2412: Exchange is optional now and package info.
new 111a3cc Merge pull request #340 from r0ann3l/NUTCH-2412
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 5 +
.../build.xml => conf/exchanges.xml.template | 32 ++--
conf/exchanges.xsd | 54 +++++++
conf/log4j.properties | 1 +
default.properties | 6 +
.../{net/URLFilter.java => exchange/Exchange.java} | 38 +++--
.../org/apache/nutch/exchange/ExchangeConfig.java | 79 ++++++++++
src/java/org/apache/nutch/exchange/Exchanges.java | 174 +++++++++++++++++++++
.../org/apache/nutch/exchange}/package-info.java | 8 +-
.../org/apache/nutch/indexer/IndexWriters.java | 58 ++++---
.../apache/nutch/indexer/IndexerOutputFormat.java | 2 +-
src/plugin/build.xml | 2 +
.../{indexer-solr => exchange-jexl}/build-ivy.xml | 2 +-
.../{indexer-dummy => exchange-jexl}/build.xml | 2 +-
src/plugin/{urlmeta => exchange-jexl}/ivy.xml | 0
.../{indexer-rabbit => exchange-jexl}/plugin.xml | 18 +--
.../apache/nutch/exchange/jexl/JexlExchange.java | 78 +++++++++
.../apache/nutch/exchange/jexl}/package-info.java | 7 +-
src/plugin/nutch-extensionpoints/plugin.xml | 4 +
19 files changed, 506 insertions(+), 64 deletions(-)
copy src/plugin/lib-nekohtml/build.xml => conf/exchanges.xml.template (54%)
create mode 100644 conf/exchanges.xsd
copy src/java/org/apache/nutch/{net/URLFilter.java => exchange/Exchange.java} (57%)
create mode 100644 src/java/org/apache/nutch/exchange/ExchangeConfig.java
create mode 100644 src/java/org/apache/nutch/exchange/Exchanges.java
copy src/{plugin/urlfilter-ignoreexempt/src/java/org/apache/nutch/urlfilter/ignoreexempt => java/org/apache/nutch/exchange}/package-info.java (79%)
copy src/plugin/{indexer-solr => exchange-jexl}/build-ivy.xml (96%)
copy src/plugin/{indexer-dummy => exchange-jexl}/build.xml (94%)
copy src/plugin/{urlmeta => exchange-jexl}/ivy.xml (100%)
copy src/plugin/{indexer-rabbit => exchange-jexl}/plugin.xml (68%)
create mode 100644 src/plugin/exchange-jexl/src/java/org/apache/nutch/exchange/jexl/JexlExchange.java
copy src/{java/org/apache/nutch/scoring => plugin/exchange-jexl/src/java/org/apache/nutch/exchange/jexl}/package-info.java (87%)
[nutch] 01/01: Merge pull request #340 from r0ann3l/NUTCH-2412
Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
snagel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git
commit 111a3cc123aece89acdfbfd974f845446671a1e2
Merge: fdee94d 4f4558f
Author: Sebastian Nagel <sn...@apache.org>
AuthorDate: Thu Jun 28 09:47:11 2018 +0200
Merge pull request #340 from r0ann3l/NUTCH-2412
NUTCH-2412 Exchange component for indexing job, contributed by r0ann3l
build.xml | 5 +
conf/exchanges.xml.template | 38 +++++
conf/exchanges.xsd | 54 +++++++
conf/log4j.properties | 1 +
default.properties | 6 +
src/java/org/apache/nutch/exchange/Exchange.java | 46 ++++++
.../org/apache/nutch/exchange/ExchangeConfig.java | 79 ++++++++++
src/java/org/apache/nutch/exchange/Exchanges.java | 174 +++++++++++++++++++++
.../org/apache/nutch/exchange/package-info.java | 24 +++
.../org/apache/nutch/indexer/IndexWriters.java | 58 ++++---
.../apache/nutch/indexer/IndexerOutputFormat.java | 2 +-
src/plugin/build.xml | 2 +
src/plugin/exchange-jexl/build-ivy.xml | 54 +++++++
src/plugin/exchange-jexl/build.xml | 22 +++
src/plugin/exchange-jexl/ivy.xml | 41 +++++
src/plugin/exchange-jexl/plugin.xml | 38 +++++
.../apache/nutch/exchange/jexl/JexlExchange.java | 78 +++++++++
.../apache/nutch/exchange/jexl/package-info.java | 23 +++
src/plugin/nutch-extensionpoints/plugin.xml | 4 +
19 files changed, 730 insertions(+), 19 deletions(-)