svn commit: r1717537 - in /nutch/branches/2.x: CHANGES.txt src/plugin/subcollection/plugin.xml src/plugin/urlnormalizer-regex/plugin.xml

2015-12-01 Thread snagel 
Author: snagel
Date: Tue Dec  1 21:17:14 2015
New Revision: 1717537

URL: http://svn.apache.org/viewvc?rev=1717537=rev
Log:
NUTCH-2107 plugin.xml to validate against plugin.dtd

Modified:
nutch/branches/2.x/CHANGES.txt
nutch/branches/2.x/src/plugin/subcollection/plugin.xml
nutch/branches/2.x/src/plugin/urlnormalizer-regex/plugin.xml

Modified: nutch/branches/2.x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1717537=1717536=1717537=diff
==
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Tue Dec  1 21:17:14 2015
@@ -3,6 +3,8 @@ Nutch Change Log
 Nutch 2.3.1 Release 22092015 (ddmm)
 Release Report - http://s.apache.org/nutch_2.3.1
 
+* NUTCH-2107 plugin.xml to validate against plugin.dtd (snagel)
+
 * NUTCH-2130 copyField rawcontent creates error within schema.xml (Sherban 
Drulea, lewismc, snagel)
 
 * NUTCH-2018 Ensure that the Docker containers for Nutch 2.X are part of the 
Release Management Documentation (lewismc)

Modified: nutch/branches/2.x/src/plugin/subcollection/plugin.xml
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/src/plugin/subcollection/plugin.xml?rev=1717537=1717536=1717537=diff
==
--- nutch/branches/2.x/src/plugin/subcollection/plugin.xml (original)
+++ nutch/branches/2.x/src/plugin/subcollection/plugin.xml Tue Dec  1 21:17:14 
2015
@@ -21,16 +21,16 @@
version="1.0.0"
provider-name="apache.org">
 
-   
-  
-   
-

   
  
   


+   
+  
+   
+


Modified: nutch/branches/2.x/src/plugin/urlnormalizer-regex/plugin.xml
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/src/plugin/urlnormalizer-regex/plugin.xml?rev=1717537=1717536=1717537=diff
==
--- nutch/branches/2.x/src/plugin/urlnormalizer-regex/plugin.xml (original)
+++ nutch/branches/2.x/src/plugin/urlnormalizer-regex/plugin.xml Tue Dec  1 
21:17:14 2015
@@ -28,7 +28,7 @@

 

-
+

svn commit: r1717536 - in /nutch/trunk: CHANGES.txt src/plugin/subcollection/plugin.xml src/plugin/urlnormalizer-regex/plugin.xml

2015-12-01 Thread snagel 
Author: snagel
Date: Tue Dec  1 21:15:21 2015
New Revision: 1717536

URL: http://svn.apache.org/viewvc?rev=1717536=rev
Log:
NUTCH-2107 plugin.xml to validate against plugin.dtd

Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/src/plugin/subcollection/plugin.xml
nutch/trunk/src/plugin/urlnormalizer-regex/plugin.xml

Modified: nutch/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1717536=1717535=1717536=diff
==
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Tue Dec  1 21:15:21 2015
@@ -3,6 +3,8 @@ Nutch Change Log
 Nutch 1.11 Release 25/10/2015 (dd/mm/)
 Release Report: http://s.apache.org/nutch11
 
+* NUTCH-2107 plugin.xml to validate against plugin.dtd (snagel)
+
 * NUTCH-2177 Generator produces only one partition even in distributed mode 
(jnioche, snagel)
 
 * NUTCH-2158 Upgrade to Tika 1.11 (jnioche, snagel)

Modified: nutch/trunk/src/plugin/subcollection/plugin.xml
URL: 
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/subcollection/plugin.xml?rev=1717536=1717535=1717536=diff
==
--- nutch/trunk/src/plugin/subcollection/plugin.xml (original)
+++ nutch/trunk/src/plugin/subcollection/plugin.xml Tue Dec  1 21:15:21 2015
@@ -21,16 +21,16 @@
version="1.0.0"
provider-name="apache.org">
 
-   
-  
-   
-

   
  
   


+   
+  
+   
+


Modified: nutch/trunk/src/plugin/urlnormalizer-regex/plugin.xml
URL: 
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlnormalizer-regex/plugin.xml?rev=1717536=1717535=1717536=diff
==
--- nutch/trunk/src/plugin/urlnormalizer-regex/plugin.xml (original)
+++ nutch/trunk/src/plugin/urlnormalizer-regex/plugin.xml Tue Dec  1 21:15:21 
2015
@@ -28,7 +28,7 @@

 

-
+

svn commit: r1717412 - in /nutch/trunk: CHANGES.txt src/java/org/apache/nutch/crawl/Generator.java

2015-12-01 Thread jnioche 
Author: jnioche
Date: Tue Dec  1 12:47:42 2015
New Revision: 1717412

URL: http://svn.apache.org/viewvc?rev=1717412=rev
Log:
NUTCH-2177 Generator produces only one partition even in distributed mode

Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java

Modified: nutch/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1717412=1717411=1717412=diff
==
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Tue Dec  1 12:47:42 2015
@@ -3,6 +3,8 @@ Nutch Change Log
 Nutch 1.11 Release 25/10/2015 (dd/mm/)
 Release Report: http://s.apache.org/nutch11
 
+* NUTCH-2177 Generator produces only one partition even in distributed mode 
(jnioche, snagel)
+
 * NUTCH-2158 Upgrade to Tika 1.11 (jnioche, snagel)
 
 * NUTCH-2175 Typos in property descriptions in nutch-default.xml (Roannel 
Fernández Hernández via snagel)

Modified: nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java
URL: 
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java?rev=1717412=1717411=1717412=diff
==
--- nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java Tue Dec  1 
12:47:42 2015
@@ -539,9 +539,9 @@ public class Generator extends NutchTool
 if (numLists == -1) { // for politeness make
   numLists = job.getNumMapTasks(); // a partition per fetch task
 }
-if ("local".equals(job.get("mapred.job.tracker")) && numLists != 1) {
+if ("local".equals(job.get("mapreduce.framework.name")) && numLists != 1) {
   // override
-  LOG.info("Generator: jobtracker is 'local', generating exactly one 
partition.");
+  LOG.info("Generator: running in local mode, generating exactly one 
partition.");
   numLists = 1;
 }
 job.setLong(GENERATOR_CUR_TIME, curTime);