svn commit: r1177269 - in /nutch/branches/nutchgora: CHANGES.txt build.xml src/bin/nutch

[le...@apache.org]

Author: lewismc
Date: Thu Sep 29 11:38:30 2011
New Revision: 1177269

URL: http://svn.apache.org/viewvc?rev=1177269&view=rev
Log:
commit to address NUTCH-672 to update to changes.txt

Modified:
    nutch/branches/nutchgora/CHANGES.txt
    nutch/branches/nutchgora/build.xml
    nutch/branches/nutchgora/src/bin/nutch

Modified: nutch/branches/nutchgora/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/CHANGES.txt?rev=1177269&r1=1177268&r2=1177269&view=diff
==============================================================================
--- nutch/branches/nutchgora/CHANGES.txt (original)
+++ nutch/branches/nutchgora/CHANGES.txt Thu Sep 29 11:38:30 2011
@@ -1,12 +1,14 @@
 Nutch Change Log
 
-Release 2.0 - Current Development
+Release nutchgora - Current Development
+
+* NUTCH-672 allow unit tests to be run from bin/nutch (Todd Lipton via lewismc)
 
 * NUTCH-937 Put plugins in classes/plugins in job file (Claudio Martella, Ferdy Galema, jnioche)
 
 * NUTCH-1131 Rely on published artefacts for GORA (jnioche)
 
-* NUTCH-1099 Adds HBase and Cassandra storage properties to nutch-default.xml
+* NUTCH-1099 Adds HBase and Cassandra storage properties to nutch-default.xml (lewismc)
 
 * NUTCH-1096 Empty (not null) ContentLength results in failure of fetch (Ferdy Galema via jnioche)
 

Modified: nutch/branches/nutchgora/build.xml
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/build.xml?rev=1177269&r1=1177268&r2=1177269&view=diff
==============================================================================
--- nutch/branches/nutchgora/build.xml (original)
+++ nutch/branches/nutchgora/build.xml Thu Sep 29 11:38:30 2011
@@ -304,6 +304,9 @@
     <copy todir="${runtime.local}/plugins">
       <fileset dir="${build.dir}/plugins"/>
     </copy>
+    <copy todir="${runtime.local}/test">
+      <fileset dir="${build.dir}/test"/>
+    </copy>
   </target>
 
   <!-- ================================================================== -->

Modified: nutch/branches/nutchgora/src/bin/nutch
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/bin/nutch?rev=1177269&r1=1177268&r2=1177269&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/bin/nutch (original)
+++ nutch/branches/nutchgora/src/bin/nutch Thu Sep 29 11:38:30 2011
@@ -48,17 +48,18 @@ if [ $# = 0 ]; then
   echo "Usage: nutch [-core] COMMAND"
   echo "where COMMAND is one of:"
 # echo " crawl one-step crawler for intranets"
-  echo " inject inject new urls into the database"
-  echo " generate generate new segments to fetch from crawl db"
-  echo " fetch fetch URLs marked during generate"
-  echo " parse parse URLs marked during fetch"
-  echo " updatedb update web table after parsing"
-  echo " readdb read/dump records from page database"
-  echo " solrindex run the solr indexer on parsed segments and linkdb"
-  echo " solrdedup remove duplicates from solr"
-  echo " plugin load a plugin and run one of its classes main()"
+  echo " inject		inject new urls into the database"
+  echo " generate 	generate new segments to fetch from crawl db"
+  echo " fetch 		fetch URLs marked during generate"
+  echo " parse 		parse URLs marked during fetch"
+  echo " updatedb 	update web table after parsing"
+  echo " readdb 	read/dump records from page database"
+  echo " solrindex 	run the solr indexer on parsed segments and linkdb"
+  echo " solrdedup 	remove duplicates from solr"
+  echo " plugin 	load a plugin and run one of its classes main()"
+  echo " junit         	runs the given JUnit test"
   echo " or"
-  echo " CLASSNAME run the class named CLASSNAME"
+  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, "
@@ -199,6 +200,9 @@ elif [ "$COMMAND" = "solrdedup" ] ; then
 CLASS=org.apache.nutch.indexer.solr.SolrDeleteDuplicates
 elif [ "$COMMAND" = "plugin" ] ; then
 CLASS=org.apache.nutch.plugin.PluginRepository
+elif [ "$COMMAND" = "junit" ] ; then
+  CLASSPATH=$CLASSPATH:test/classes/
+  CLASS=junit.textui.TestRunner
 else
 CLASS=$COMMAND
 fi