Author: cutting
Date: Mon Feb 6 09:52:30 2006
New Revision: 375321
URL: http://svn.apache.org/viewcvs?rev=375321&view=rev
Log:
Add aliases for some Writable classes for back-compatibility.
Modified:
lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/FetcherOutput.java
lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseData.java
lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseText.java
lucene/nutch/trunk/src/java/org/apache/nutch/protocol/Content.java
lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java
Modified:
lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/FetcherOutput.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/FetcherOutput.java?rev=375321&r1=375320&r2=375321&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/FetcherOutput.java
(original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/FetcherOutput.java Mon
Feb 6 09:52:30 2006
@@ -32,8 +32,6 @@
private ParseImpl parse;
private Configuration conf;
- static { WritableName.setName(FetcherOutput.class, "FetcherOutput"); }
-
public FetcherOutput() {}
public FetcherOutput(CrawlDatum crawlDatum, Content content,
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseData.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseData.java?rev=375321&r1=375320&r2=375321&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseData.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseData.java Mon Feb
6 09:52:30 2006
@@ -41,9 +41,6 @@
private ParseStatus status;
private Configuration conf;
- static { WritableName.setName(ParseData.class, "ParseData"); }
-
-
// TODO [EMAIL PROTECTED]: should we really implement Configurable or should
we add the
// parameter Configuration to the default-constructor. NOTE: The test
// TestWriteable instantiates ParseData with Class.newInstance() -> the
default
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseText.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseText.java?rev=375321&r1=375320&r2=375321&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseText.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/parse/ParseText.java Mon Feb
6 09:52:30 2006
@@ -37,8 +37,6 @@
this.text = text;
}
- static { WritableName.setName(ParseText.class, "ParseText"); }
-
public byte getVersion() { return VERSION; }
public void readFields(DataInput in) throws IOException {
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/protocol/Content.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/protocol/Content.java?rev=375321&r1=375320&r2=375321&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/protocol/Content.java
(original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/protocol/Content.java Mon Feb
6 09:52:30 2006
@@ -42,8 +42,6 @@
private boolean mimeTypeMagic;
private MimeTypes mimeTypes;
- static { WritableName.setName(Content.class, "Content"); }
-
public Content() {}
public Content(String url, String base, byte[] content, String contentType,
Modified:
lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java?rev=375321&r1=375320&r2=375321&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java
(original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java
Mon Feb 6 09:52:30 2006
@@ -17,10 +17,21 @@
package org.apache.nutch.util;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.WritableName;
/** Utility to create Hadoop [EMAIL PROTECTED] Configuration}s that include
Nutch-specific
* resources. */
public class NutchConfiguration {
+
+ // for back-compatibility, add old aliases for these Writable classes
+ // this may be removed after the 0.8 release
+ static {
+ WritableName.addName(org.apache.nutch.fetcher.FetcherOutput.class,
+ "FetcherOutput");
+ WritableName.addName(org.apache.nutch.parse.ParseData.class, "ParseData");
+ WritableName.addName(org.apache.nutch.parse.ParseText.class, "ParseText");
+ WritableName.addName(org.apache.nutch.protocol.Content.class, "Content");
+ }
/** Create a [EMAIL PROTECTED] Configuration} for Nutch. */
public static Configuration create() {
