You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2017/04/06 02:26:42 UTC

[nutch] branch master updated (724a240 -> 25d0cf7)

This is an automated email from the ASF dual-hosted git repository.

lewismc pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git.

      from  724a240   Prepare for new development
      adds  6f9a8f3   working elasticsearch rest
      adds  767764e   log parameterization, code formatting
       new  25d0cf7   Merge pull request #139 from bmzhao/NUTCH-2296-elasticsearch-rest-indexing

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.xml                                          |   3 +
 conf/log4j.properties                              |   4 +
 conf/nutch-default.xml                             |  72 +++++
 ivy/ivy.xml                                        |   7 +
 src/plugin/build.xml                               |   2 +
 .../build-ivy.xml                                  |  30 +-
 .../build.xml                                      |   2 +-
 .../indexer-elastic-rest/howto_upgrade_es.txt}     |  10 +-
 .../{parse-html => indexer-elastic-rest}/ivy.xml   |  41 +--
 src/plugin/indexer-elastic-rest/plugin.xml         |  52 ++++
 .../elasticrest/ElasticRestConstants.java}         |  18 +-
 .../elasticrest/ElasticRestIndexWriter.java        | 329 +++++++++++++++++++++
 .../indexwriter/elasticrest}/package-info.java     |   4 +-
 13 files changed, 523 insertions(+), 51 deletions(-)
 copy src/plugin/{index-geoip => indexer-elastic-rest}/build-ivy.xml (64%)
 copy src/plugin/{index-links => indexer-elastic-rest}/build.xml (93%)
 copy src/{java/org/apache/nutch/protocol/package-info.java => plugin/indexer-elastic-rest/howto_upgrade_es.txt} (74%)
 copy src/plugin/{parse-html => indexer-elastic-rest}/ivy.xml (55%)
 create mode 100644 src/plugin/indexer-elastic-rest/plugin.xml
 copy src/plugin/{indexer-elastic/src/java/org/apache/nutch/indexwriter/elastic/ElasticConstants.java => indexer-elastic-rest/src/java/org/apache/nutch/indexwriter/elasticrest/ElasticRestConstants.java} (65%)
 create mode 100644 src/plugin/indexer-elastic-rest/src/java/org/apache/nutch/indexwriter/elasticrest/ElasticRestIndexWriter.java
 copy src/{java/org/apache/nutch/tools => plugin/indexer-elastic-rest/src/java/org/apache/nutch/indexwriter/elasticrest}/package-info.java (84%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@nutch.apache.org" <co...@nutch.apache.org>'].

[nutch] 01/01: Merge pull request #139 from bmzhao/NUTCH-2296-elasticsearch-rest-indexing

Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

lewismc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git

commit 25d0cf73436146d44122f992eca6fa04e444de39
Merge: 724a240 767764e
Author: Lewis John McGibbney <le...@gmail.com>
AuthorDate: Wed Apr 5 19:26:39 2017 -0700

    Merge pull request #139 from bmzhao/NUTCH-2296-elasticsearch-rest-indexing
    
    Fix for NUTCH-2296: Elasticsearch Indexing Over Rest thank you @bmzhao

 build.xml                                          |   3 +
 conf/log4j.properties                              |   4 +
 conf/nutch-default.xml                             |  72 +++++
 ivy/ivy.xml                                        |   7 +
 src/plugin/build.xml                               |   2 +
 src/plugin/indexer-elastic-rest/build-ivy.xml      |  54 ++++
 src/plugin/indexer-elastic-rest/build.xml          |  22 ++
 .../indexer-elastic-rest/howto_upgrade_es.txt      |  23 ++
 src/plugin/indexer-elastic-rest/ivy.xml            |  43 +++
 src/plugin/indexer-elastic-rest/plugin.xml         |  52 ++++
 .../elasticrest/ElasticRestConstants.java          |  33 +++
 .../elasticrest/ElasticRestIndexWriter.java        | 329 +++++++++++++++++++++
 .../indexwriter/elasticrest/package-info.java      |  22 ++
 13 files changed, 666 insertions(+)

diff --cc ivy/ivy.xml
index 853a639,8e048fa..cc7f8d3
--- a/ivy/ivy.xml
+++ b/ivy/ivy.xml
@@@ -127,10 -127,14 +127,17 @@@
      	<dependency org="org.apache.wicket" name="wicket-spring" rev="6.16.0" conf="*->default" />
      	<dependency org="de.agilecoders.wicket" name="wicket-bootstrap-core" rev="0.9.2" conf="*->default" />
      	<dependency org="de.agilecoders.wicket" name="wicket-bootstrap-extensions" rev="0.9.2" conf="*->default" />
 +		
 +		<!-- RabbitMQ dependencies -->
 +		<dependency org="com.rabbitmq" name="amqp-client" rev="3.6.5" conf="*->default" />
  
+ 
+ 		<!--Added Because of Elasticsearch JEST client-->
+ 		<!--TODO refactor these to indexer-elastic-rest plugin somehow, currently doesn't resolve correctly-->
+ 		<dependency org="org.apache.httpcomponents" name="httpcore-nio" rev="4.4.4"/>
+ 		<dependency org="org.apache.httpcomponents" name="httpcore" rev="4.4.4"/>
+ 		<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.2"/>
+ 
  		<!--global exclusion -->
  		<exclude module="jmxtools" />
  		<exclude module="jms" />

-- 
To stop receiving notification emails like this one, please contact
"commits@nutch.apache.org" <co...@nutch.apache.org>.