svn commit: r1352008 - in /nutch/trunk: CHANGES.txt default.properties src/bin/nutch
Author: jnioche Date: Wed Jun 20 09:28:16 2012 New Revision: 1352008 URL: http://svn.apache.org/viewvc?rev=1352008&view=rev Log: NUTCH-1400 + changed version to 1.5.1-SNAPSHOT Modified: nutch/trunk/CHANGES.txt nutch/trunk/default.properties nutch/trunk/src/bin/nutch Modified: nutch/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1352008&r1=1352007&r2=1352008&view=diff == --- nutch/trunk/CHANGES.txt (original) +++ nutch/trunk/CHANGES.txt Wed Jun 20 09:28:16 2012 @@ -2,6 +2,8 @@ Nutch Change Log (trunk) Current Development: +* NUTCH-1400 Remove developer -core option for bin/nutch (jnioche) + * NUTCH-1404 Nutch script fails to find job file in deploy mode (sidabatra, jnioche) * NUTCH-1398 Upgrade to Hadoop 1.0.3 (jnioche) Modified: nutch/trunk/default.properties URL: http://svn.apache.org/viewvc/nutch/trunk/default.properties?rev=1352008&r1=1352007&r2=1352008&view=diff == --- nutch/trunk/default.properties (original) +++ nutch/trunk/default.properties Wed Jun 20 09:28:16 2012 @@ -14,7 +14,7 @@ # limitations under the License. name=apache-nutch -version=1.6-SNAPSHOT +version=1.5.1-SNAPSHOT final.name=${name}-${version} year=2012 Modified: nutch/trunk/src/bin/nutch URL: http://svn.apache.org/viewvc/nutch/trunk/src/bin/nutch?rev=1352008&r1=1352007&r2=1352008&view=diff == --- nutch/trunk/src/bin/nutch (original) +++ nutch/trunk/src/bin/nutch Wed Jun 20 09:28:16 2012 @@ -45,7 +45,7 @@ done # if no args specified, show usage if [ $# = 0 ]; then - echo "Usage: nutch [-core] COMMAND" + echo "Usage: nutch COMMAND" echo "where COMMAND is one of:" echo " crawl one-step crawler for intranets" echo " readdbread / dump crawl db" @@ -76,10 +76,6 @@ if [ $# = 0 ]; then echo " or" echo " CLASSNAME run the class named CLASSNAME" echo "Most commands print help when invoked w/o parameters." - echo "" - echo "Expert: -core option is for developers only. It avoids building the job jar, " - echo "instead it simply includes classes compiled with ant compile-core. " - echo "NOTE: this works only for jobs executed in 'local' mode" exit 1 fi
svn commit: r1352009 - in /nutch/branches/nutchgora: CHANGES.txt src/bin/nutch
Author: jnioche Date: Wed Jun 20 09:29:50 2012 New Revision: 1352009 URL: http://svn.apache.org/viewvc?rev=1352009&view=rev Log: NUTCH-1400 -core option removed Modified: nutch/branches/nutchgora/CHANGES.txt nutch/branches/nutchgora/src/bin/nutch Modified: nutch/branches/nutchgora/CHANGES.txt URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/CHANGES.txt?rev=1352009&r1=1352008&r2=1352009&view=diff == --- nutch/branches/nutchgora/CHANGES.txt (original) +++ nutch/branches/nutchgora/CHANGES.txt Wed Jun 20 09:29:50 2012 @@ -3,6 +3,8 @@ Nutch Change Log Release 2.0 (08/06/2012) ddmmyyy Full Jira report - https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10680&version=12314893 +* NUTCH-1400 Remove developer -core option for bin/nutch (jnioche) + * NUTCH-1399 TestProtocolHttpClient fails (jnioche) * NUTCH-1404 Nutch script fails to find job file in deploy mode (sidabatra, jnioche) Modified: nutch/branches/nutchgora/src/bin/nutch URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/bin/nutch?rev=1352009&r1=1352008&r2=1352009&view=diff == --- nutch/branches/nutchgora/src/bin/nutch (original) +++ nutch/branches/nutchgora/src/bin/nutch Wed Jun 20 09:29:50 2012 @@ -45,7 +45,7 @@ done # if no args specified, show usage if [ $# = 0 ]; then - echo "Usage: nutch [-core] COMMAND" + echo "Usage: nutch COMMAND" echo "where COMMAND is one of:" # echo " crawl one-step crawler for intranets" echo " injectinject new urls into the database" @@ -65,10 +65,6 @@ if [ $# = 0 ]; then echo " or" echo " CLASSNAME run the class named CLASSNAME" echo "Most commands print help when invoked w/o parameters." - echo "" - echo "Expert: -core option is for developers only. It avoids building the job jar, " - echo " instead it simply includes classes compiled with ant compile-core. " - echo " NOTE: this works only for jobs executed in 'local' mode" exit 1 fi
svn commit: r1352037 - in /nutch/branches/nutchgora: CHANGES.txt src/java/org/apache/nutch/crawl/WebTableReader.java
Author: jnioche Date: Wed Jun 20 10:34:29 2012 New Revision: 1352037 URL: http://svn.apache.org/viewvc?rev=1352037&view=rev Log: NUTCH-1391 readdb -stats fires java.io.EOFException Modified: nutch/branches/nutchgora/CHANGES.txt nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/WebTableReader.java Modified: nutch/branches/nutchgora/CHANGES.txt URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/CHANGES.txt?rev=1352037&r1=1352036&r2=1352037&view=diff == --- nutch/branches/nutchgora/CHANGES.txt (original) +++ nutch/branches/nutchgora/CHANGES.txt Wed Jun 20 10:34:29 2012 @@ -3,6 +3,8 @@ Nutch Change Log Release 2.0 (08/06/2012) ddmmyyy Full Jira report - https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10680&version=12314893 +* NUTCH-1391 readdb -stats fires java.io.EOFException (jnioche) + * NUTCH-1400 Remove developer -core option for bin/nutch (jnioche) * NUTCH-1399 TestProtocolHttpClient fails (jnioche) Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/WebTableReader.java URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/WebTableReader.java?rev=1352037&r1=1352036&r2=1352037&view=diff == --- nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/WebTableReader.java (original) +++ nutch/branches/nutchgora/src/java/org/apache/nutch/crawl/WebTableReader.java Wed Jun 20 10:34:29 2012 @@ -498,6 +498,8 @@ public class WebTableReader extends Nutc numJobs = 1; currentJob = new NutchJob(getConf(), "db_stats"); + currentJob.getConfiguration().setBoolean("mapreduce.fileoutputcommitter.marksuccessfuljobs", false); + Boolean sort = (Boolean)args.get(Nutch.ARG_SORT); if (sort == null) sort = Boolean.FALSE; currentJob.getConfiguration().setBoolean("db.reader.stats.sort", sort);