Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/IdentityReducer.java URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/IdentityReducer.java?rev=374733&r1=374710&r2=374733&view=diff ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/IdentityReducer.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/IdentityReducer.java Fri Feb 3 11:45:32 2006 @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.apache.nutch.mapred.lib; +package org.apache.hadoop.mapred.lib; import java.io.IOException; import java.util.Iterator; -import org.apache.nutch.mapred.Reducer; -import org.apache.nutch.mapred.OutputCollector; -import org.apache.nutch.mapred.JobConf; -import org.apache.nutch.mapred.Reporter; +import org.apache.hadoop.mapred.Reducer; +import org.apache.hadoop.mapred.OutputCollector; +import org.apache.hadoop.mapred.JobConf; +import org.apache.hadoop.mapred.Reporter; -import org.apache.nutch.io.Writable; -import org.apache.nutch.io.WritableComparable; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.io.WritableComparable; /** Performs no reduction, writing all input values directly to the output. */ public class IdentityReducer implements Reducer { Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/InverseMapper.java URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/InverseMapper.java?rev=374733&r1=374710&r2=374733&view=diff ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/InverseMapper.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/InverseMapper.java Fri Feb 3 11:45:32 2006 @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.apache.nutch.mapred.lib; +package org.apache.hadoop.mapred.lib; import java.io.IOException; -import org.apache.nutch.mapred.Mapper; -import org.apache.nutch.mapred.OutputCollector; -import org.apache.nutch.mapred.JobConf; -import org.apache.nutch.mapred.Reporter; +import org.apache.hadoop.mapred.Mapper; +import org.apache.hadoop.mapred.OutputCollector; +import org.apache.hadoop.mapred.JobConf; +import org.apache.hadoop.mapred.Reporter; -import org.apache.nutch.io.WritableComparable; -import org.apache.nutch.io.Writable; +import org.apache.hadoop.io.WritableComparable; +import org.apache.hadoop.io.Writable; /** A {@link Mapper} that swaps keys and values. */ Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/LongSumReducer.java URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/LongSumReducer.java?rev=374733&r1=374710&r2=374733&view=diff ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/LongSumReducer.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/LongSumReducer.java Fri Feb 3 11:45:32 2006 @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.apache.nutch.mapred.lib; +package org.apache.hadoop.mapred.lib; import java.io.IOException; import java.util.Iterator; -import org.apache.nutch.mapred.Reducer; -import org.apache.nutch.mapred.OutputCollector; -import org.apache.nutch.mapred.JobConf; -import org.apache.nutch.mapred.Reporter; +import org.apache.hadoop.mapred.Reducer; +import org.apache.hadoop.mapred.OutputCollector; +import org.apache.hadoop.mapred.JobConf; +import org.apache.hadoop.mapred.Reporter; -import org.apache.nutch.io.Writable; -import org.apache.nutch.io.WritableComparable; -import org.apache.nutch.io.LongWritable; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.io.WritableComparable; +import org.apache.hadoop.io.LongWritable; /** A {@link Reducer} that sums long values. */ public class LongSumReducer implements Reducer { Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/RegexMapper.java URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/RegexMapper.java?rev=374733&r1=374710&r2=374733&view=diff ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/RegexMapper.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/RegexMapper.java Fri Feb 3 11:45:32 2006 @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.apache.nutch.mapred.lib; +package org.apache.hadoop.mapred.lib; import java.io.IOException; -import org.apache.nutch.mapred.Mapper; -import org.apache.nutch.mapred.OutputCollector; -import org.apache.nutch.mapred.JobConf; -import org.apache.nutch.mapred.Reporter; +import org.apache.hadoop.mapred.Mapper; +import org.apache.hadoop.mapred.OutputCollector; +import org.apache.hadoop.mapred.JobConf; +import org.apache.hadoop.mapred.Reporter; -import org.apache.nutch.io.WritableComparable; -import org.apache.nutch.io.Writable; -import org.apache.nutch.io.LongWritable; -import org.apache.nutch.io.UTF8; +import org.apache.hadoop.io.WritableComparable; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.io.LongWritable; +import org.apache.hadoop.io.UTF8; import java.util.regex.Pattern; Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/TokenCountMapper.java URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/TokenCountMapper.java?rev=374733&r1=374710&r2=374733&view=diff ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/TokenCountMapper.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/lib/TokenCountMapper.java Fri Feb 3 11:45:32 2006 @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.apache.nutch.mapred.lib; +package org.apache.hadoop.mapred.lib; import java.io.IOException; import java.util.StringTokenizer; -import org.apache.nutch.mapred.Mapper; -import org.apache.nutch.mapred.OutputCollector; -import org.apache.nutch.mapred.JobConf; -import org.apache.nutch.mapred.Reporter; +import org.apache.hadoop.mapred.Mapper; +import org.apache.hadoop.mapred.OutputCollector; +import org.apache.hadoop.mapred.JobConf; +import org.apache.hadoop.mapred.Reporter; -import org.apache.nutch.io.WritableComparable; -import org.apache.nutch.io.Writable; -import org.apache.nutch.io.LongWritable; -import org.apache.nutch.io.UTF8; +import org.apache.hadoop.io.WritableComparable; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.io.LongWritable; +import org.apache.hadoop.io.UTF8; /** A {@link Mapper} that maps text values into pairs. Uses Copied: lucene/hadoop/trunk/src/java/org/apache/hadoop/util/Daemon.java (from r374710, lucene/nutch/trunk/src/java/org/apache/nutch/util/Daemon.java) URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/util/Daemon.java?p2=lucene/hadoop/trunk/src/java/org/apache/hadoop/util/Daemon.java&p1=lucene/nutch/trunk/src/java/org/apache/nutch/util/Daemon.java&r1=374710&r2=374733&rev=374733&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/util/Daemon.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/util/Daemon.java Fri Feb 3 11:45:32 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.nutch.util; +package org.apache.hadoop.util; /** A thread that has called {@link Thread#setDaemon(boolean) } with true.*/ public class Daemon extends Thread { Copied: lucene/hadoop/trunk/src/java/org/apache/hadoop/util/LogFormatter.java (from r374710, lucene/nutch/trunk/src/java/org/apache/nutch/util/LogFormatter.java) URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/util/LogFormatter.java?p2=lucene/hadoop/trunk/src/java/org/apache/hadoop/util/LogFormatter.java&p1=lucene/nutch/trunk/src/java/org/apache/nutch/util/LogFormatter.java&r1=374710&r2=374733&rev=374733&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/util/LogFormatter.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/util/LogFormatter.java Fri Feb 3 11:45:32 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.nutch.util; +package org.apache.hadoop.util; import java.util.logging.*; import java.io.*; Copied: lucene/hadoop/trunk/src/java/org/apache/hadoop/util/Progress.java (from r374710, lucene/nutch/trunk/src/java/org/apache/nutch/util/Progress.java) URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/util/Progress.java?p2=lucene/hadoop/trunk/src/java/org/apache/hadoop/util/Progress.java&p1=lucene/nutch/trunk/src/java/org/apache/nutch/util/Progress.java&r1=374710&r2=374733&rev=374733&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/util/Progress.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/util/Progress.java Fri Feb 3 11:45:32 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.nutch.util; +package org.apache.hadoop.util; import java.util.ArrayList;