You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by cu...@apache.org on 2005/05/17 20:11:06 UTC
svn commit: r170631 - in /incubator/nutch/branches/mapred/src:
java/org/apache/nutch/mapReduce/ java/org/apache/nutch/mapred/
java/org/apache/nutch/mapred/demo/ java/org/apache/nutch/mapred/lib/ mapred/
Author: cutting
Date: Tue May 17 11:11:04 2005
New Revision: 170631
URL: http://svn.apache.org/viewcvs?rev=170631&view=rev
Log:
Rename mapReduce package to mapred, for consistency.
Added:
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/
- copied from r170616, incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapReduce/
Removed:
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapReduce/
incubator/nutch/branches/mapred/src/mapred/
Modified:
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/CombiningCollector.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Configurable.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/FileSplit.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormat.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormatBase.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormats.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InterTrackerProtocol.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobClient.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobProfile.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobStatus.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobSubmissionProtocol.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTrackerInfoServer.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MRConstants.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputFile.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputLocation.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputProtocol.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTaskRunner.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Mapper.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputCollector.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormat.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormats.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Partitioner.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordReader.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordWriter.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTaskRunner.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Reducer.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RunningJob.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileInputFormat.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileOutputFormat.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskRunner.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskStatus.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTracker.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTrackerStatus.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskUmbilicalProtocol.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextInputFormat.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextOutputFormat.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/demo/Grep.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/HashPartitioner.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityMapper.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityReducer.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/InverseMapper.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/LongSumReducer.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/RegexMapper.java
incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/TokenCountMapper.java
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/CombiningCollector.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/CombiningCollector.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/CombiningCollector.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/CombiningCollector.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.*;
import java.net.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Configurable.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Configurable.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Configurable.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Configurable.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/FileSplit.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/FileSplit.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/FileSplit.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/FileSplit.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.File;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormat.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormat.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormat.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormat.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.File;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormatBase.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormatBase.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormatBase.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormatBase.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.File;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormats.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormats.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormats.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InputFormats.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.util.HashMap;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InterTrackerProtocol.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InterTrackerProtocol.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InterTrackerProtocol.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/InterTrackerProtocol.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.*;
import org.apache.nutch.io.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobClient.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobClient.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobClient.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobClient.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
import org.apache.nutch.fs.*;
@@ -34,7 +34,7 @@
* @author Mike Cafarella
*******************************************************/
public class JobClient implements MRConstants {
- private static final Logger LOG = LogFormatter.getLogger("org.apache.nutch.mapReduce.JobClient");
+ private static final Logger LOG = LogFormatter.getLogger("org.apache.nutch.mapred.JobClient");
static long MAX_JOBPROFILE_AGE = 1000 * 2;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.File;
@@ -36,9 +36,9 @@
import org.apache.nutch.io.LongWritable;
import org.apache.nutch.io.UTF8;
-import org.apache.nutch.mapReduce.lib.IdentityMapper;
-import org.apache.nutch.mapReduce.lib.IdentityReducer;
-import org.apache.nutch.mapReduce.lib.HashPartitioner;
+import org.apache.nutch.mapred.lib.IdentityMapper;
+import org.apache.nutch.mapred.lib.IdentityReducer;
+import org.apache.nutch.mapred.lib.HashPartitioner;
/** A map/reduce job configuration. This names the {@link Mapper}, combiner
* (if any), {@link Partitioner}, {@link Reducer}, {@link InputFormat}, and
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobProfile.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobProfile.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobProfile.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobProfile.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobStatus.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobStatus.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobStatus.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobStatus.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobSubmissionProtocol.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobSubmissionProtocol.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobSubmissionProtocol.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobSubmissionProtocol.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.*;
import org.apache.nutch.io.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTracker.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
import org.apache.nutch.fs.*;
@@ -34,7 +34,7 @@
public class JobTracker implements MRConstants, InterTrackerProtocol, JobSubmissionProtocol {
static final int TRACKERINFO_PORT = 7845;
- public static final Logger LOG = LogFormatter.getLogger("org.apache.nutch.mapReduce.JobTracker");
+ public static final Logger LOG = LogFormatter.getLogger("org.apache.nutch.mapred.JobTracker");
public static JobTracker tracker = null;
public static void createTracker() throws IOException {
createTracker(getDefaultAddress());
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTrackerInfoServer.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTrackerInfoServer.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTrackerInfoServer.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobTrackerInfoServer.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
import org.apache.nutch.ipc.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MRConstants.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MRConstants.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MRConstants.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MRConstants.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
/*******************************
* Some handy constants
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputFile.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputFile.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputFile.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputFile.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputLocation.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputLocation.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputLocation.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputLocation.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputProtocol.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputProtocol.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputProtocol.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapOutputProtocol.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTask.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.*;
import java.net.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTaskRunner.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTaskRunner.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTaskRunner.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/MapTaskRunner.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
import org.apache.nutch.ipc.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Mapper.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Mapper.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Mapper.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Mapper.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputCollector.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputCollector.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputCollector.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputCollector.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.DataInput;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormat.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormat.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormat.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormat.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.File;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormats.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormats.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormats.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/OutputFormats.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.util.HashMap;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Partitioner.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Partitioner.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Partitioner.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Partitioner.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.Writable;
import org.apache.nutch.io.WritableComparable;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordReader.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordReader.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordReader.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordReader.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.DataInput;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordWriter.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordWriter.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordWriter.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RecordWriter.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.DataOutput;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTask.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
import org.apache.nutch.util.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTaskRunner.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTaskRunner.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTaskRunner.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/ReduceTaskRunner.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
import org.apache.nutch.ipc.*;
@@ -27,7 +27,7 @@
/** Runs a reduce task. */
class ReduceTaskRunner extends TaskRunner {
private static final Logger LOG =
- LogFormatter.getLogger("org.apache.nutch.mapReduce.ReduceTaskRunner");
+ LogFormatter.getLogger("org.apache.nutch.mapred.ReduceTaskRunner");
public ReduceTaskRunner(Task task, TaskTracker tracker) {
super(task, tracker);
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Reducer.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Reducer.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Reducer.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Reducer.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RunningJob.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RunningJob.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RunningJob.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/RunningJob.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileInputFormat.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileInputFormat.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileInputFormat.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileInputFormat.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.File;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileOutputFormat.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileOutputFormat.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileOutputFormat.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/SequenceFileOutputFormat.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.File;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/Task.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskRunner.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskRunner.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskRunner.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskRunner.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
import org.apache.nutch.ipc.*;
@@ -30,7 +30,7 @@
*/
abstract class TaskRunner extends Thread {
public static final Logger LOG =
- LogFormatter.getLogger("org.apache.nutch.mapReduce.TaskRunner");
+ LogFormatter.getLogger("org.apache.nutch.mapred.TaskRunner");
private Process process;
private Task t;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskStatus.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskStatus.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskStatus.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskStatus.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTracker.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTracker.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTracker.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTracker.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.fs.*;
import org.apache.nutch.io.*;
@@ -39,7 +39,7 @@
static final int STALE_STATE = 1;
public static final Logger LOG =
- LogFormatter.getLogger("org.apache.nutch.mapReduce.TaskTracker");
+ LogFormatter.getLogger("org.apache.nutch.mapred.TaskTracker");
String taskTrackerName;
String localHostname;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTrackerStatus.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTrackerStatus.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTrackerStatus.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskTrackerStatus.java Tue May 17 11:11:04 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import org.apache.nutch.io.*;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskUmbilicalProtocol.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskUmbilicalProtocol.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskUmbilicalProtocol.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TaskUmbilicalProtocol.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextInputFormat.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextInputFormat.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextInputFormat.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextInputFormat.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.File;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextOutputFormat.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextOutputFormat.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextOutputFormat.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/TextOutputFormat.java Tue May 17 11:11:04 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce;
+package org.apache.nutch.mapred;
import java.io.IOException;
import java.io.File;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/demo/Grep.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/demo/Grep.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/demo/Grep.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/demo/Grep.java Tue May 17 11:11:04 2005
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nutch.mapReduce.demo;
+package org.apache.nutch.mapred.demo;
-import org.apache.nutch.mapReduce.JobConf;
-import org.apache.nutch.mapReduce.JobClient;
-import org.apache.nutch.mapReduce.RunningJob;
-import org.apache.nutch.mapReduce.InputFormats;
-import org.apache.nutch.mapReduce.OutputFormats;
+import org.apache.nutch.mapred.JobConf;
+import org.apache.nutch.mapred.JobClient;
+import org.apache.nutch.mapred.RunningJob;
+import org.apache.nutch.mapred.InputFormats;
+import org.apache.nutch.mapred.OutputFormats;
-import org.apache.nutch.mapReduce.lib.RegexMapper;
-import org.apache.nutch.mapReduce.lib.InverseMapper;
-import org.apache.nutch.mapReduce.lib.LongSumReducer;
-import org.apache.nutch.mapReduce.lib.IdentityReducer;
+import org.apache.nutch.mapred.lib.RegexMapper;
+import org.apache.nutch.mapred.lib.InverseMapper;
+import org.apache.nutch.mapred.lib.LongSumReducer;
+import org.apache.nutch.mapred.lib.IdentityReducer;
import org.apache.nutch.io.UTF8;
import org.apache.nutch.io.LongWritable;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/HashPartitioner.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/HashPartitioner.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/HashPartitioner.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/HashPartitioner.java Tue May 17 11:11:04 2005
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce.lib;
+package org.apache.nutch.mapred.lib;
-import org.apache.nutch.mapReduce.Partitioner;
-import org.apache.nutch.mapReduce.JobConf;
+import org.apache.nutch.mapred.Partitioner;
+import org.apache.nutch.mapred.JobConf;
import org.apache.nutch.io.WritableComparable;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityMapper.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityMapper.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityMapper.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityMapper.java Tue May 17 11:11:04 2005
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce.lib;
+package org.apache.nutch.mapred.lib;
import java.io.IOException;
-import org.apache.nutch.mapReduce.Mapper;
-import org.apache.nutch.mapReduce.OutputCollector;
-import org.apache.nutch.mapReduce.JobConf;
+import org.apache.nutch.mapred.Mapper;
+import org.apache.nutch.mapred.OutputCollector;
+import org.apache.nutch.mapred.JobConf;
import org.apache.nutch.io.Writable;
import org.apache.nutch.io.WritableComparable;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityReducer.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityReducer.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityReducer.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/IdentityReducer.java Tue May 17 11:11:04 2005
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce.lib;
+package org.apache.nutch.mapred.lib;
import java.io.IOException;
import java.util.Iterator;
-import org.apache.nutch.mapReduce.Reducer;
-import org.apache.nutch.mapReduce.OutputCollector;
-import org.apache.nutch.mapReduce.JobConf;
+import org.apache.nutch.mapred.Reducer;
+import org.apache.nutch.mapred.OutputCollector;
+import org.apache.nutch.mapred.JobConf;
import org.apache.nutch.io.Writable;
import org.apache.nutch.io.WritableComparable;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/InverseMapper.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/InverseMapper.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/InverseMapper.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/InverseMapper.java Tue May 17 11:11:04 2005
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce.lib;
+package org.apache.nutch.mapred.lib;
import java.io.IOException;
-import org.apache.nutch.mapReduce.Mapper;
-import org.apache.nutch.mapReduce.OutputCollector;
-import org.apache.nutch.mapReduce.JobConf;
+import org.apache.nutch.mapred.Mapper;
+import org.apache.nutch.mapred.OutputCollector;
+import org.apache.nutch.mapred.JobConf;
import org.apache.nutch.io.WritableComparable;
import org.apache.nutch.io.Writable;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/LongSumReducer.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/LongSumReducer.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/LongSumReducer.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/LongSumReducer.java Tue May 17 11:11:04 2005
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce.lib;
+package org.apache.nutch.mapred.lib;
import java.io.IOException;
import java.util.Iterator;
-import org.apache.nutch.mapReduce.Reducer;
-import org.apache.nutch.mapReduce.OutputCollector;
-import org.apache.nutch.mapReduce.JobConf;
+import org.apache.nutch.mapred.Reducer;
+import org.apache.nutch.mapred.OutputCollector;
+import org.apache.nutch.mapred.JobConf;
import org.apache.nutch.io.Writable;
import org.apache.nutch.io.WritableComparable;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/RegexMapper.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/RegexMapper.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/RegexMapper.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/RegexMapper.java Tue May 17 11:11:04 2005
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce.lib;
+package org.apache.nutch.mapred.lib;
import java.io.IOException;
-import org.apache.nutch.mapReduce.Mapper;
-import org.apache.nutch.mapReduce.OutputCollector;
-import org.apache.nutch.mapReduce.JobConf;
+import org.apache.nutch.mapred.Mapper;
+import org.apache.nutch.mapred.OutputCollector;
+import org.apache.nutch.mapred.JobConf;
import org.apache.nutch.io.WritableComparable;
import org.apache.nutch.io.Writable;
Modified: incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/TokenCountMapper.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/TokenCountMapper.java?rev=170631&r1=170616&r2=170631&view=diff
==============================================================================
--- incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/TokenCountMapper.java (original)
+++ incubator/nutch/branches/mapred/src/java/org/apache/nutch/mapred/lib/TokenCountMapper.java Tue May 17 11:11:04 2005
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.apache.nutch.mapReduce.lib;
+package org.apache.nutch.mapred.lib;
import java.io.IOException;
import java.util.StringTokenizer;
-import org.apache.nutch.mapReduce.Mapper;
-import org.apache.nutch.mapReduce.OutputCollector;
-import org.apache.nutch.mapReduce.JobConf;
+import org.apache.nutch.mapred.Mapper;
+import org.apache.nutch.mapred.OutputCollector;
+import org.apache.nutch.mapred.JobConf;
import org.apache.nutch.io.WritableComparable;
import org.apache.nutch.io.Writable;