You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2015/01/09 04:53:39 UTC

svn commit: r1650437 [1/3] - in /nutch/branches/2.x: ./ ivy/ src/gora/ src/java/org/apache/nutch/storage/

Author: lewismc
Date: Fri Jan  9 03:53:39 2015
New Revision: 1650437

URL: http://svn.apache.org/r1650437
Log:
NUTCH-1856 Document webpage.avsc and host.avsc

Modified:
    nutch/branches/2.x/CHANGES.txt
    nutch/branches/2.x/build.xml
    nutch/branches/2.x/ivy/ivy.xml
    nutch/branches/2.x/src/gora/host.avsc
    nutch/branches/2.x/src/gora/webpage.avsc
    nutch/branches/2.x/src/java/org/apache/nutch/storage/Host.java
    nutch/branches/2.x/src/java/org/apache/nutch/storage/ParseStatus.java
    nutch/branches/2.x/src/java/org/apache/nutch/storage/ProtocolStatus.java
    nutch/branches/2.x/src/java/org/apache/nutch/storage/WebPage.java

Modified: nutch/branches/2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1650437&r1=1650436&r2=1650437&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Fri Jan  9 03:53:39 2015
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Current Development 2.3-SNAPSHOT
 
+* NUTCH-1856 Document webpage.avsc and host.avsc (lewismc)
+
 * NUTCH-1834 GeneratorMapper behavior depends on log level (Gerhard Gossen via snagel)
 
 * NUTCH-1899 upgrade restlet lib to prevent build failure (talat)

Modified: nutch/branches/2.x/build.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/build.xml?rev=1650437&r1=1650436&r2=1650437&view=diff
==============================================================================
--- nutch/branches/2.x/build.xml (original)
+++ nutch/branches/2.x/build.xml Fri Jan  9 03:53:39 2015
@@ -559,9 +559,10 @@
   <!-- Will call this automatically later                     -->
   <!-- ====================================================== -->
   <target name="generate-gora-src" depends="init" description="--> compile the avro schema(s) in src/gora/*.avsc">
-    <java classname="org.apache.gora.compiler.GoraCompiler">
+    <java classname="org.apache.gora.compiler.cli.GoraCompilerCLI">
      <classpath refid="classpath"/>
-     <arg value="src/gora/"/>
+     <arg value="src/gora/webpage.avsc"/>
+     <!--arg value="src/gora/host.avsc"/-->
      <arg value="${src.dir}"/>
     </java>
  </target>

Modified: nutch/branches/2.x/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/ivy/ivy.xml?rev=1650437&r1=1650436&r2=1650437&view=diff
==============================================================================
--- nutch/branches/2.x/ivy/ivy.xml (original)
+++ nutch/branches/2.x/ivy/ivy.xml Fri Jan  9 03:53:39 2015
@@ -135,6 +135,11 @@
     <!--
     <dependency org="org.apache.gora" name="gora-solr" rev="0.5" conf="*->default" />
     -->
+    <!-- The gora-compiler is used within the 'ant generate-gora-src' target to compile
+    the Gora .avsc files within ./src/gora 
+    -->
+    <dependency org="org.apache.gora" name="gora-compiler-cli" rev="0.5" conf="*->default"/>
+    <dependency org="org.apache.gora" name="gora-compiler" rev="0.5" conf="*->default"/>
 
     <!-- web app dependencies -->
 

Modified: nutch/branches/2.x/src/gora/host.avsc
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/src/gora/host.avsc?rev=1650437&r1=1650436&r2=1650437&view=diff
==============================================================================
--- nutch/branches/2.x/src/gora/host.avsc (original)
+++ nutch/branches/2.x/src/gora/host.avsc Fri Jan  9 03:53:39 2015
@@ -1,9 +1,41 @@
-{"name": "Host",
- "type": "record",
- "namespace": "org.apache.nutch.storage",
- "fields": [
-        {"name": "metadata", "type": {"type": "map", "values": "bytes"}, "default":{}},
-        {"name": "outlinks", "type": {"type": "map", "values": "string"}, "default":{}},
-        {"name": "inlinks", "type": {"type": "map", "values": "string"}, "default":{}}
-   ]
+{
+  "name": "Host",
+  "type": "record",
+  "namespace": "org.apache.nutch.storage",
+  "doc": "Host represents a store of webpages or other data which resides on a server or other computer so that it can be accessed over the Internet",
+  "fields": [
+    {
+      "name": "metadata",
+      "type": {
+        "type": "map",
+        "values": ["null","bytes"]
+      },
+      "doc": "A multivalued metadata container used for storing a wide variety of host metadata such as structured web server characterists etc",
+      "default": {
+        
+      }
+    },
+    {
+      "name": "outlinks",
+      "type": {
+        "type": "map",
+        "values": ["null","string"]
+      },
+      "doc": "Hyperlinks which direct outside of the current host domain these can used in a histogram style manner to generate host statistics",
+      "default": {
+        
+      }
+    },
+    {
+      "name": "inlinks",
+      "type": {
+        "type": "map",
+        "values": ["null","string"]
+      },
+      "doc": "Hyperlinks which link to pages within the current host domain these can used in a histogram style manner to generate host statistics",
+      "default": {
+        
+      }
+    }
+  ]
 }

Modified: nutch/branches/2.x/src/gora/webpage.avsc
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/src/gora/webpage.avsc?rev=1650437&r1=1650436&r2=1650437&view=diff
==============================================================================
--- nutch/branches/2.x/src/gora/webpage.avsc (original)
+++ nutch/branches/2.x/src/gora/webpage.avsc Fri Jan  9 03:53:39 2015
@@ -1,48 +1,285 @@
-{"name": "WebPage",
- "type": "record",
- "namespace": "org.apache.nutch.storage",
- "fields": [
-        {"name": "baseUrl", "type": ["null","string"], "default":null},
-        {"name": "status", "type": "int", "default":0},
-        {"name": "fetchTime", "type": "long", "default":0},
-        {"name": "prevFetchTime", "type": "long", "default":0},
-        {"name": "fetchInterval", "type": "int", "default":0},
-        {"name": "retriesSinceFetch", "type": "int", "default":0},
-        {"name": "modifiedTime", "type": "long", "default":0},
-        {"name": "prevModifiedTime", "type": "long", "default":0},
-        {"name": "protocolStatus", "type": ["null", {
-            "name": "ProtocolStatus",
-            "type": "record",
-            "namespace": "org.apache.nutch.storage",
-            "fields": [
-                {"name": "code", "type": "int", "default":0},
-                {"name": "args", "type": {"type": "array", "items": "string"}, "default":[]},
-                {"name": "lastModified", "type": "long", "default":0}
-            ]
-            }], "default":null},
-        {"name": "content", "type": ["null","bytes"], "default":null},
-        {"name": "contentType", "type": ["null","string"], "default":null},
-        {"name": "prevSignature", "type": ["null","bytes"], "default":null},
-        {"name": "signature", "type": ["null","bytes"], "default":null},
-        {"name": "title", "type": ["null","string"], "default":null},
-        {"name": "text", "type": ["null","string"], "default":null},
-        {"name": "parseStatus", "type": ["null", {
-            "name": "ParseStatus",
-            "type": "record",
-            "namespace": "org.apache.nutch.storage",
-            "fields": [
-                {"name": "majorCode", "type": "int", "default":0},
-                {"name": "minorCode", "type": "int", "default":0},
-                {"name": "args", "type": {"type": "array", "items": "string"}, "default":[]}
-            ]
-            }], "default":null},
-        {"name": "score", "type": "float", "default":0},
-        {"name": "reprUrl", "type": ["null","string"], "default":null},
-        {"name": "headers", "type": {"type":"map", "values": ["null","string"]}, "default":{}},
-        {"name": "outlinks", "type": {"type": "map", "values": ["null","string"]}, "default":{}},
-        {"name": "inlinks", "type": {"type": "map", "values": ["null","string"]}, "default":{}},
-        {"name": "markers", "type": {"type": "map", "values": ["null","string"]}, "default":{}},
-        {"name": "metadata", "type": {"type": "map", "values": ["null","bytes"]}, "default":{}},
-        {"name": "batchId", "type": ["null","string"], "default":null}
-   ]
+{ 
+  "name": "WebPage",
+  "type": "record",
+  "namespace": "org.apache.nutch.storage",
+  "doc": "WebPage is the primary data structure in Nutch representing crawl data for a given WebPage at some point in time",
+  "fields": [
+    {
+      "name": "baseUrl",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "The original associated with this WebPage.",
+      "default": null
+    },
+    {
+      "name": "status",
+      "type": "int",
+      "doc": "A crawl status associated with the WebPage, can be of value STATUS_UNFETCHED - WebPage was not fetched yet, STATUS_FETCHED - WebPage was successfully fetched, STATUS_GONE - WebPage no longer exists, STATUS_REDIR_TEMP - WebPage temporarily redirects to other page, STATUS_REDIR_PERM - WebPage permanently redirects to other page, STATUS_RETRY - Fetching unsuccessful, needs to be retried e.g. transient errors and STATUS_NOTMODIFIED - fetching successful - page is not modified",
+      "default": 0
+    },
+    {
+      "name": "fetchTime",
+      "type": "long",
+      "doc": "The system time in milliseconds for when the page was fetched.",
+      "default": 0
+    },
+    {
+      "name": "prevFetchTime",
+      "type": "long",
+      "doc": "The system time in milliseconds for when the page was last fetched if it was previously fetched which can be used to calculate time delta within a fetching schedule implementation",
+      "default": 0
+    },
+    {
+      "name": "fetchInterval",
+      "type": "int",
+      "doc": "The default number of seconds between re-fetches of a page. The default is considered as 30 days unless a custom fetch schedle is implemented.",
+      "default": 0
+    },
+    {
+      "name": "retriesSinceFetch",
+      "type": "int",
+      "doc": "The number of retried attempts at fetching the WebPage since it was last successfully fetched.",
+      "default": 0
+    },
+    {
+      "name": "modifiedTime",
+      "type": "long",
+      "doc": "The system time in milliseconds for when this WebPage was modified by the WebPage author, if this is not available we default to the server for this information. This is important to understand the changing nature of the WebPage.",
+      "default": 0
+    },
+    {
+      "name": "prevModifiedTime",
+      "type": "long",
+      "doc": "The system time in milliseconds for when this WebPage was previously modified by the author, if this is not available then we default to the server for this information. This is important to understand the changing nature of a WebPage.",
+      "default": 0
+    },
+    {
+      "name": "protocolStatus",
+      "type": [
+        "null",
+        {
+          "name": "ProtocolStatus",
+          "type": "record",
+          "namespace": "org.apache.nutch.storage",
+          "doc": "A nested container representing data captured from web server responses.",
+          "fields": [
+            {
+              "name": "code",
+              "type": "int",
+              "doc": "A protocol response code which can be one of SUCCESS - content was retrieved without errors, FAILED - Content was not retrieved. Any further errors may be indicated in args, PROTO_NOT_FOUND - This protocol was not found. Application may attempt to retry later, GONE - Resource is gone, MOVED - Resource has moved permanently. New url should be found in args, TEMP_MOVED - Resource has moved temporarily. New url should be found in args., NOTFOUND - Resource was not found, RETRY - Temporary failure. Application may retry immediately., EXCEPTION - Unspecified exception occured. Further information may be provided in args., ACCESS_DENIED - Access denied - authorization required, but missing\/incorrect., ROBOTS_DENIED - Access denied by robots.txt rules., REDIR_EXCEEDED - Too many redirects., NOTFETCHING - Not fetching., NOTMODIFIED - Unchanged since the last fetch., WOULDBLOCK - Request was refused by protocol plugins, because it would block. The expected number of mi
 lliseconds to wait before retry may be provided in args., BLOCKED - Thread was blocked http.max.delays times during fetching.",
+              "default": 0
+            },
+            {
+              "name": "args",
+              "type": {
+                "type": "array",
+                "items": "string"
+              },
+              "doc": "Optional arguments supplied to compliment and\/or justify the response code.",
+              "default": [
+                
+              ]
+            },
+            {
+              "name": "lastModified",
+              "type": "long",
+              "doc": "A server reponse indicating when this page was last modified, this can be unreliable at times hence this is used as a default fall back value for the preferred 'modifiedTime' and 'preModifiedTime' obtained from the WebPage itself.",
+              "default": 0
+            }
+          ]
+        }
+      ],
+      "default": null
+    },
+    {
+      "name": "content",
+      "type": [
+        "null",
+        "bytes"
+      ],
+      "doc": "The entire raw document content e.g. raw XHTML",
+      "default": null
+    },
+    {
+      "name": "contentType",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "The type of the content contained within the document itself. ContentType is an alias for MimeType. Historically, this parameter was only called MimeType, but since this is actually the value included in the HTTP Content-Type header, it can also include the character set encoding, which makes it more than just a MimeType specification. If MimeType is specified e.g. not None, that value is used. Otherwise, ContentType is used. If neither is given, the DEFAULT_CONTENT_TYPE setting is used.",
+      "default": null
+    },
+    {
+      "name": "prevSignature",
+      "type": [
+        "null",
+        "bytes"
+      ],
+      "doc": "An implementation of a WebPage's previous signature from which it can be identified and referenced at any point in time. This can be used to uniquely identify WebPage deltas based on page fingerprints.",
+      "default": null
+    },
+    {
+      "name": "signature",
+      "type": [
+        "null",
+        "bytes"
+      ],
+      "doc": "An implementation of a WebPage's signature from which it can be identified and referenced at any point in time. This is essentially the WebPage's fingerprint represnting its state for any point in time.",
+      "default": null
+    },
+    {
+      "name": "title",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "The title of the WebPage.",
+      "default": null
+    },
+    {
+      "name": "text",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "The textual content of the WebPage devoid from native markup.",
+      "default": null
+    },
+    {
+      "name": "parseStatus",
+      "type": [
+        "null",
+        {
+          "name": "ParseStatus",
+          "type": "record",
+          "namespace": "org.apache.nutch.storage",
+          "doc": "A nested container representing parse status data captured from invocation of parsers on fetch of a WebPage",
+          "fields": [
+            {
+              "name": "majorCode",
+              "type": "int",
+              "doc": "Major parsing status' including NOTPARSED (Parsing was not performed), SUCCESS (Parsing succeeded), FAILED (General failure. There may be a more specific error message in arguments.)",
+              "default": 0
+            },
+            {
+              "name": "minorCode",
+              "type": "int",
+              "doc": "Minor parsing status' including SUCCESS_OK - Successful parse devoid of anomalies or issues, SUCCESS_REDIRECT - Parsed content contains a directive to redirect to another URL. The target URL can be retrieved from the arguments., FAILED_EXCEPTION - Parsing failed. An Exception occured which may be retrieved from the arguments., FAILED_TRUNCATED - Parsing failed. Content was truncated, but the parser cannot handle incomplete content., FAILED_INVALID_FORMAT - Parsing failed. Invalid format e.g. the content may be corrupted or of wrong type., FAILED_MISSING_PARTS - Parsing failed. Other related parts of the content are needed to complete parsing. The list of URLs to missing parts may be provided in arguments. The Fetcher may decide to fetch these parts at once, then put them into Content.metadata, and supply them for re-parsing., FAILED_MISING_CONTENT - Parsing failed. There was no content to be parsed - probably caused by errors at protocol stage.",
+              "default": 0
+            },
+            {
+              "name": "args",
+              "type": {
+                "type": "array",
+                "items": "string"
+              },
+              "doc": "Optional arguments supplied to compliment and\/or justify the parse status code.",
+              "default": [
+                
+              ]
+            }
+          ]
+        }
+      ],
+      "default": null
+    },
+    {
+      "name": "score",
+      "type": "float",
+      "doc": "A score used to determine a WebPage's relevance within the web graph it is part of. This score may change over time based on graph characteristics.",
+      "default": 0
+    },
+    {
+      "name": "reprUrl",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "In the case where we are given two urls, a source and a destination of a redirect, we should determine and persist the representative url. The logic used to determine this is based largely on Yahoo!'s Slurp Crawler",
+      "default": null
+    },
+    {
+      "name": "headers",
+      "type": {
+        "type": "map",
+        "values": [
+          "null",
+          "string"
+        ]
+      },
+      "doc": "Header information returned from the web server used to server the content which is subsequently fetched from. This includes keys such as TRANSFER_ENCODING, CONTENT_ENCODING, CONTENT_LANGUAGE, CONTENT_LENGTH, CONTENT_LOCATION, CONTENT_DISPOSITION, CONTENT_MD5, CONTENT_TYPE, LAST_MODIFIED and LOCATION.",
+      "default": {
+        
+      }
+    },
+    {
+      "name": "outlinks",
+      "type": {
+        "type": "map",
+        "values": [
+          "null",
+          "string"
+        ]
+      },
+      "doc": "Embedded hyperlinks which direct outside of the current domain.",
+      "default": {
+        
+      }
+    },
+    {
+      "name": "inlinks",
+      "type": {
+        "type": "map",
+        "values": [
+          "null",
+          "string"
+        ]
+      },
+      "doc": "Embedded hyperlinks which link to pages within the current domain.",
+      "default": {
+        
+      }
+    },
+    {
+      "name": "markers",
+      "type": {
+        "type": "map",
+        "values": [
+          "null",
+          "string"
+        ]
+      },
+      "doc": "Markers flags which represent user and machine decisions which have affected influenced a WebPage's current state. Markers can be system specific and user machine driven in nature. They are assigned to a WebPage on a job-by-job basis and thier values indicative of what actions should be associated with a WebPage.",
+      "default": {
+        
+      }
+    },
+    {
+      "name": "metadata",
+      "type": {
+        "type": "map",
+        "values": [
+          "null",
+          "bytes"
+        ]
+      },
+      "doc": "A multi-valued metadata container used for storing everything from structured WebPage characterists, to ad-hoc extraction and metadata augmentation for any given WebPage.",
+      "default": {
+        
+      }
+    },
+    {
+      "name": "batchId",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "A batchId that this WebPage is assigned to. WebPage's are fetched in batches, called fetchlists. Pages are partitioned but can always be associated and fetched alongside pages of similar value (within a crawl cycle) based on batchId.",
+      "default": null
+    }
+  ]
 }
+
+

Modified: nutch/branches/2.x/src/java/org/apache/nutch/storage/Host.java
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/storage/Host.java?rev=1650437&r1=1650436&r2=1650437&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/storage/Host.java (original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/storage/Host.java Fri Jan  9 03:53:39 2015
@@ -1,39 +1,39 @@
 /*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+******************************************************************************/
 /**
  * Autogenerated by Avro
  * 
  * DO NOT EDIT DIRECTLY
  */
-package org.apache.nutch.storage;
+package org.apache.nutch.storage; 
 
 import org.apache.avro.util.Utf8;
 import org.apache.nutch.util.Bytes;
 
 @SuppressWarnings("all")
+/** Host represents a store of webpages or other data which resides on a server or other computer so that it can be accessed over the Internet */
 public class Host extends org.apache.gora.persistency.impl.PersistentBase implements org.apache.avro.specific.SpecificRecord, org.apache.gora.persistency.Persistent {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Host\",\"namespace\":\"org.apache.nutch.storage\",\"fields\":[{\"name\":\"__g__dirty\",\"type\":\"bytes\",\"doc\":\"Bytes used to represent weather or not a field is dirty.\",\"default\":\"AA==\"},{\"name\":\"metadata\",\"type\":{\"type\":\"map\",\"values\":\"bytes\"},\"default\":{}},{\"name\":\"outlinks\",\"type\":{\"type\":\"map\",\"values\":\"string\"},\"default\":{}},{\"name\":\"inlinks\",\"type\":{\"type\":\"map\",\"values\":\"string\"},\"default\":{}}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Host\",\"namespace\":\"org.apache.nutch.storage\",\"doc\":\"Host represents a store of webpages or other data which resides on a server or other computer so that it can be accessed over the Internet\",\"fields\":[{\"name\":\"metadata\",\"type\":{\"type\":\"map\",\"values\":[\"null\",\"bytes\"]},\"doc\":\"A multivalued metadata container used for storing a wide variety of host metadata such as structured web server characterists etc\",\"default\":{}},{\"name\":\"outlinks\",\"type\":{\"type\":\"map\",\"values\":[\"null\",\"string\"]},\"doc\":\"Hyperlinks which direct outside of the current host domain these can used in a histogram style manner to generate host statistics\",\"default\":{}},{\"name\":\"inlinks\",\"type\":{\"type\":\"map\",\"values\":[\"null\",\"string\"]},\"doc\":\"Hyperlinks which link to pages within the current host domain these can used i
 n a histogram style manner to generate host statistics\",\"default\":{}}]}");
 
   /** Enum containing all data bean's fields. */
   public static enum Field {
-    __G__DIRTY(0, "__g__dirty"),
-    METADATA(1, "metadata"),
-    OUTLINKS(2, "outlinks"),
-    INLINKS(3, "inlinks"),
+    METADATA(0, "metadata"),
+    OUTLINKS(1, "outlinks"),
+    INLINKS(2, "inlinks"),
     ;
     /**
      * Field's index.
@@ -72,159 +72,135 @@ public class Host extends org.apache.gor
   };
 
   public static final String[] _ALL_FIELDS = {
-  "__g__dirty",
   "metadata",
   "outlinks",
   "inlinks",
   };
-  
+
   /**
    * Gets the total field count.
    * @return int field count
    */
   public int getFieldsCount() {
     return Host._ALL_FIELDS.length;
-  }  
+  }
 
-  /** Bytes used to represent weather or not a field is dirty. */
-  private java.nio.ByteBuffer __g__dirty = java.nio.ByteBuffer.wrap(new byte[1]);
-  private java.util.Map<CharSequence,java.nio.ByteBuffer> metadata;
-  private java.util.Map<CharSequence,CharSequence> outlinks;
-  private java.util.Map<CharSequence,CharSequence> inlinks;
+  /** A multivalued metadata container used for storing a wide variety of host metadata such as structured web server characterists etc */
+  private java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> metadata;
+  /** Hyperlinks which direct outside of the current host domain these can used in a histogram style manner to generate host statistics */
+  private java.util.Map<java.lang.CharSequence,java.lang.CharSequence> outlinks;
+  /** Hyperlinks which link to pages within the current host domain these can used in a histogram style manner to generate host statistics */
+  private java.util.Map<java.lang.CharSequence,java.lang.CharSequence> inlinks;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
-  public Object get(int field$) {
+  public java.lang.Object get(int field$) {
     switch (field$) {
-    case 0: return __g__dirty;
-    case 1: return metadata;
-    case 2: return outlinks;
-    case 3: return inlinks;
+    case 0: return metadata;
+    case 1: return outlinks;
+    case 2: return inlinks;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
   
   // Used by DatumReader.  Applications should not call. 
   @SuppressWarnings(value="unchecked")
-  public void put(int field$, Object value) {
+  public void put(int field$, java.lang.Object value) {
     switch (field$) {
-    case 0: __g__dirty = (java.nio.ByteBuffer)(value); break;
-    case 1: metadata = (java.util.Map<CharSequence,java.nio.ByteBuffer>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
-    case 2: outlinks = (java.util.Map<CharSequence,CharSequence>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
-    case 3: inlinks = (java.util.Map<CharSequence,CharSequence>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
+    case 0: metadata = (java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
+    case 1: outlinks = (java.util.Map<java.lang.CharSequence,java.lang.CharSequence>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
+    case 2: inlinks = (java.util.Map<java.lang.CharSequence,java.lang.CharSequence>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
 
   /**
    * Gets the value of the 'metadata' field.
-   */
-  public java.util.Map<CharSequence,java.nio.ByteBuffer> getMetadata() {
+   * A multivalued metadata container used for storing a wide variety of host metadata such as structured web server characterists etc   */
+  public java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> getMetadata() {
     return metadata;
   }
 
   /**
    * Sets the value of the 'metadata' field.
-   * @param value the value to set.
+   * A multivalued metadata container used for storing a wide variety of host metadata such as structured web server characterists etc   * @param value the value to set.
    */
-  public void setMetadata(java.util.Map<CharSequence,java.nio.ByteBuffer> value) {
+  public void setMetadata(java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> value) {
     this.metadata = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper(value);
-    setDirty(1);
+    setDirty(0);
   }
   
   /**
    * Checks the dirty status of the 'metadata' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
+   * A multivalued metadata container used for storing a wide variety of host metadata such as structured web server characterists etc   * @param value the value to set.
    */
-  public boolean isMetadataDirty(java.util.Map<CharSequence,java.nio.ByteBuffer> value) {
-    return isDirty(1);
+  public boolean isMetadataDirty(java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> value) {
+    return isDirty(0);
   }
 
   /**
    * Gets the value of the 'outlinks' field.
-   */
-  public java.util.Map<CharSequence,CharSequence> getOutlinks() {
+   * Hyperlinks which direct outside of the current host domain these can used in a histogram style manner to generate host statistics   */
+  public java.util.Map<java.lang.CharSequence,java.lang.CharSequence> getOutlinks() {
     return outlinks;
   }
 
   /**
    * Sets the value of the 'outlinks' field.
-   * @param value the value to set.
+   * Hyperlinks which direct outside of the current host domain these can used in a histogram style manner to generate host statistics   * @param value the value to set.
    */
-  public void setOutlinks(java.util.Map<CharSequence,CharSequence> value) {
+  public void setOutlinks(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
     this.outlinks = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper(value);
-    setDirty(2);
+    setDirty(1);
   }
   
   /**
    * Checks the dirty status of the 'outlinks' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
+   * Hyperlinks which direct outside of the current host domain these can used in a histogram style manner to generate host statistics   * @param value the value to set.
    */
-  public boolean isOutlinksDirty(java.util.Map<CharSequence,CharSequence> value) {
-    return isDirty(2);
+  public boolean isOutlinksDirty(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
+    return isDirty(1);
   }
 
   /**
    * Gets the value of the 'inlinks' field.
-   */
-  public java.util.Map<CharSequence,CharSequence> getInlinks() {
+   * Hyperlinks which link to pages within the current host domain these can used in a histogram style manner to generate host statistics   */
+  public java.util.Map<java.lang.CharSequence,java.lang.CharSequence> getInlinks() {
     return inlinks;
   }
 
   /**
    * Sets the value of the 'inlinks' field.
-   * @param value the value to set.
+   * Hyperlinks which link to pages within the current host domain these can used in a histogram style manner to generate host statistics   * @param value the value to set.
    */
-  public void setInlinks(java.util.Map<CharSequence,CharSequence> value) {
+  public void setInlinks(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
     this.inlinks = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper(value);
-    setDirty(3);
+    setDirty(2);
   }
   
   /**
    * Checks the dirty status of the 'inlinks' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
+   * Hyperlinks which link to pages within the current host domain these can used in a histogram style manner to generate host statistics   * @param value the value to set.
    */
-  public boolean isInlinksDirty(java.util.Map<CharSequence,CharSequence> value) {
-    return isDirty(3);
-  }
-
-  public boolean contains(String key) {
-    return metadata.containsKey(new Utf8(key));
-  }
-
-  public String getValue(String key, String defaultValue) {
-    if (!contains(key))
-      return defaultValue;
-    return Bytes.toString(metadata.get(new Utf8(key)));
-  }
-
-  public int getInt(String key, int defaultValue) {
-    if (!contains(key))
-      return defaultValue;
-    return Integer.parseInt(getValue(key, null));
-  }
-
-  public long getLong(String key, long defaultValue) {
-    if (!contains(key))
-      return defaultValue;
-    return Long.parseLong(getValue(key, null));
+  public boolean isInlinksDirty(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
+    return isDirty(2);
   }
 
   /** Creates a new Host RecordBuilder */
-  public static Builder newBuilder() {
-    return new Builder();
+  public static org.apache.nutch.storage.Host.Builder newBuilder() {
+    return new org.apache.nutch.storage.Host.Builder();
   }
   
   /** Creates a new Host RecordBuilder by copying an existing Builder */
-  public static Builder newBuilder(Builder other) {
-    return new Builder(other);
+  public static org.apache.nutch.storage.Host.Builder newBuilder(org.apache.nutch.storage.Host.Builder other) {
+    return new org.apache.nutch.storage.Host.Builder(other);
   }
   
   /** Creates a new Host RecordBuilder by copying an existing Host instance */
-  public static Builder newBuilder(Host other) {
-    return new Builder(other);
+  public static org.apache.nutch.storage.Host.Builder newBuilder(org.apache.nutch.storage.Host other) {
+    return new org.apache.nutch.storage.Host.Builder(other);
   }
   
-  private static java.nio.ByteBuffer deepCopyToWriteOnlyBuffer(
+  private static java.nio.ByteBuffer deepCopyToReadOnlyBuffer(
       java.nio.ByteBuffer input) {
     java.nio.ByteBuffer copy = java.nio.ByteBuffer.allocate(input.capacity());
     int position = input.position();
@@ -253,114 +229,109 @@ public class Host extends org.apache.gor
   public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Host>
     implements org.apache.avro.data.RecordBuilder<Host> {
 
-    private java.nio.ByteBuffer __g__dirty;
-    private java.util.Map<CharSequence,java.nio.ByteBuffer> metadata;
-    private java.util.Map<CharSequence,CharSequence> outlinks;
-    private java.util.Map<CharSequence,CharSequence> inlinks;
+    private java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> metadata;
+    private java.util.Map<java.lang.CharSequence,java.lang.CharSequence> outlinks;
+    private java.util.Map<java.lang.CharSequence,java.lang.CharSequence> inlinks;
 
     /** Creates a new Builder */
     private Builder() {
-      super(Host.SCHEMA$);
+      super(org.apache.nutch.storage.Host.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(Builder other) {
+    private Builder(org.apache.nutch.storage.Host.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing Host instance */
-    private Builder(Host other) {
-            super(Host.SCHEMA$);
-      if (isValidValue(fields()[0], other.__g__dirty)) {
-        this.__g__dirty = (java.nio.ByteBuffer) data().deepCopy(fields()[0].schema(), other.__g__dirty);
+    private Builder(org.apache.nutch.storage.Host other) {
+            super(org.apache.nutch.storage.Host.SCHEMA$);
+      if (isValidValue(fields()[0], other.metadata)) {
+        this.metadata = (java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer>) data().deepCopy(fields()[0].schema(), other.metadata);
         fieldSetFlags()[0] = true;
       }
-      if (isValidValue(fields()[1], other.metadata)) {
-        this.metadata = (java.util.Map<CharSequence,java.nio.ByteBuffer>) data().deepCopy(fields()[1].schema(), other.metadata);
+      if (isValidValue(fields()[1], other.outlinks)) {
+        this.outlinks = (java.util.Map<java.lang.CharSequence,java.lang.CharSequence>) data().deepCopy(fields()[1].schema(), other.outlinks);
         fieldSetFlags()[1] = true;
       }
-      if (isValidValue(fields()[2], other.outlinks)) {
-        this.outlinks = (java.util.Map<CharSequence,CharSequence>) data().deepCopy(fields()[2].schema(), other.outlinks);
+      if (isValidValue(fields()[2], other.inlinks)) {
+        this.inlinks = (java.util.Map<java.lang.CharSequence,java.lang.CharSequence>) data().deepCopy(fields()[2].schema(), other.inlinks);
         fieldSetFlags()[2] = true;
       }
-      if (isValidValue(fields()[3], other.inlinks)) {
-        this.inlinks = (java.util.Map<CharSequence,CharSequence>) data().deepCopy(fields()[3].schema(), other.inlinks);
-        fieldSetFlags()[3] = true;
-      }
     }
 
     /** Gets the value of the 'metadata' field */
-    public java.util.Map<CharSequence,java.nio.ByteBuffer> getMetadata() {
+    public java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> getMetadata() {
       return metadata;
     }
     
     /** Sets the value of the 'metadata' field */
-    public Builder setMetadata(java.util.Map<CharSequence,java.nio.ByteBuffer> value) {
-      validate(fields()[1], value);
+    public org.apache.nutch.storage.Host.Builder setMetadata(java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> value) {
+      validate(fields()[0], value);
       this.metadata = value;
-      fieldSetFlags()[1] = true;
+      fieldSetFlags()[0] = true;
       return this; 
     }
     
     /** Checks whether the 'metadata' field has been set */
     public boolean hasMetadata() {
-      return fieldSetFlags()[1];
+      return fieldSetFlags()[0];
     }
     
     /** Clears the value of the 'metadata' field */
-    public Builder clearMetadata() {
+    public org.apache.nutch.storage.Host.Builder clearMetadata() {
       metadata = null;
-      fieldSetFlags()[1] = false;
+      fieldSetFlags()[0] = false;
       return this;
     }
     
     /** Gets the value of the 'outlinks' field */
-    public java.util.Map<CharSequence,CharSequence> getOutlinks() {
+    public java.util.Map<java.lang.CharSequence,java.lang.CharSequence> getOutlinks() {
       return outlinks;
     }
     
     /** Sets the value of the 'outlinks' field */
-    public Builder setOutlinks(java.util.Map<CharSequence,CharSequence> value) {
-      validate(fields()[2], value);
+    public org.apache.nutch.storage.Host.Builder setOutlinks(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
+      validate(fields()[1], value);
       this.outlinks = value;
-      fieldSetFlags()[2] = true;
+      fieldSetFlags()[1] = true;
       return this; 
     }
     
     /** Checks whether the 'outlinks' field has been set */
     public boolean hasOutlinks() {
-      return fieldSetFlags()[2];
+      return fieldSetFlags()[1];
     }
     
     /** Clears the value of the 'outlinks' field */
-    public Builder clearOutlinks() {
+    public org.apache.nutch.storage.Host.Builder clearOutlinks() {
       outlinks = null;
-      fieldSetFlags()[2] = false;
+      fieldSetFlags()[1] = false;
       return this;
     }
     
     /** Gets the value of the 'inlinks' field */
-    public java.util.Map<CharSequence,CharSequence> getInlinks() {
+    public java.util.Map<java.lang.CharSequence,java.lang.CharSequence> getInlinks() {
       return inlinks;
     }
     
     /** Sets the value of the 'inlinks' field */
-    public Builder setInlinks(java.util.Map<CharSequence,CharSequence> value) {
-      validate(fields()[3], value);
+    public org.apache.nutch.storage.Host.Builder setInlinks(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
+      validate(fields()[2], value);
       this.inlinks = value;
-      fieldSetFlags()[3] = true;
+      fieldSetFlags()[2] = true;
       return this; 
     }
     
     /** Checks whether the 'inlinks' field has been set */
     public boolean hasInlinks() {
-      return fieldSetFlags()[3];
+      return fieldSetFlags()[2];
     }
     
     /** Clears the value of the 'inlinks' field */
-    public Builder clearInlinks() {
+    public org.apache.nutch.storage.Host.Builder clearInlinks() {
       inlinks = null;
-      fieldSetFlags()[3] = false;
+      fieldSetFlags()[2] = false;
       return this;
     }
     
@@ -368,10 +339,9 @@ public class Host extends org.apache.gor
     public Host build() {
       try {
         Host record = new Host();
-        record.__g__dirty = fieldSetFlags()[0] ? this.__g__dirty : (java.nio.ByteBuffer) java.nio.ByteBuffer.wrap(new byte[1]);
-        record.metadata = fieldSetFlags()[1] ? this.metadata : (java.util.Map<CharSequence,java.nio.ByteBuffer>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[1]));
-        record.outlinks = fieldSetFlags()[2] ? this.outlinks : (java.util.Map<CharSequence,CharSequence>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[2]));
-        record.inlinks = fieldSetFlags()[3] ? this.inlinks : (java.util.Map<CharSequence,CharSequence>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[3]));
+        record.metadata = fieldSetFlags()[0] ? this.metadata : (java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[0]));
+        record.outlinks = fieldSetFlags()[1] ? this.outlinks : (java.util.Map<java.lang.CharSequence,java.lang.CharSequence>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[1]));
+        record.inlinks = fieldSetFlags()[2] ? this.inlinks : (java.util.Map<java.lang.CharSequence,java.lang.CharSequence>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[2]));
         return record;
       } catch (Exception e) {
         throw new org.apache.avro.AvroRuntimeException(e);
@@ -379,7 +349,7 @@ public class Host extends org.apache.gor
     }
   }
   
-  public Tombstone getTombstone(){
+  public Host.Tombstone getTombstone(){
   	return TOMBSTONE;
   }
 
@@ -387,82 +357,106 @@ public class Host extends org.apache.gor
     return newBuilder().build();
   }
 
+  // TODO NUTCH-1709 Generated classes o.a.n.storage.Host and o.a.n.storage.ProtocolStatus contain methods not defined in source .avsc
+  public boolean contains(String key) {
+    return metadata.containsKey(new Utf8(key));
+  }
+  
+  // TODO NUTCH-1709 Generated classes o.a.n.storage.Host and o.a.n.storage.ProtocolStatus contain methods not defined in source .avsc
+  public String getValue(String key, String defaultValue) {
+    if (!contains(key)) return defaultValue;
+    return Bytes.toString(metadata.get(new Utf8(key)));
+  }
+  
+  // TODO NUTCH-1709 Generated classes o.a.n.storage.Host and o.a.n.storage.ProtocolStatus contain methods not defined in source .avsc
+  public int getInt(String key, int defaultValue) {
+    if (!contains(key)) return defaultValue;
+    return Integer.parseInt(getValue(key,null));
+  }
+
+  // TODO NUTCH-1709 Generated classes o.a.n.storage.Host and o.a.n.storage.ProtocolStatus contain methods not defined in source .avsc
+  public long getLong(String key, long defaultValue) {
+    if (!contains(key)) return defaultValue;
+    return Long.parseLong(getValue(key,null));
+  }
+
   private static final Tombstone TOMBSTONE = new Tombstone();
   
   public static final class Tombstone extends Host implements org.apache.gora.persistency.Tombstone {
   
       private Tombstone() { }
   
-	  				  /**
+	  		  /**
 	   * Gets the value of the 'metadata' field.
-		   */
-	  public java.util.Map<CharSequence,java.nio.ByteBuffer> getMetadata() {
-	    throw new UnsupportedOperationException("Get is not supported on tombstones");
+	   * A multivalued metadata container used for storing a wide variety of host metadata such as structured web server characterists etc	   */
+	  public java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> getMetadata() {
+	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
 	  }
 	
 	  /**
 	   * Sets the value of the 'metadata' field.
-		   * @param value the value to set.
+	   * A multivalued metadata container used for storing a wide variety of host metadata such as structured web server characterists etc	   * @param value the value to set.
 	   */
-	  public void setMetadata(java.util.Map<CharSequence,java.nio.ByteBuffer> value) {
-	    throw new UnsupportedOperationException("Set is not supported on tombstones");
+	  public void setMetadata(java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> value) {
+	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
 	  }
 	  
 	  /**
 	   * Checks the dirty status of the 'metadata' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
+	   * A multivalued metadata container used for storing a wide variety of host metadata such as structured web server characterists etc	   * @param value the value to set.
 	   */
-	  public boolean isMetadataDirty(java.util.Map<CharSequence,java.nio.ByteBuffer> value) {
-	    throw new UnsupportedOperationException("IsDirty is not supported on tombstones");
+	  public boolean isMetadataDirty(java.util.Map<java.lang.CharSequence,java.nio.ByteBuffer> value) {
+	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
 	  }
 	
 				  /**
 	   * Gets the value of the 'outlinks' field.
-		   */
-	  public java.util.Map<CharSequence,CharSequence> getOutlinks() {
-	    throw new UnsupportedOperationException("Get is not supported on tombstones");
+	   * Hyperlinks which direct outside of the current host domain these can used in a histogram style manner to generate host statistics	   */
+	  public java.util.Map<java.lang.CharSequence,java.lang.CharSequence> getOutlinks() {
+	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
 	  }
 	
 	  /**
 	   * Sets the value of the 'outlinks' field.
-		   * @param value the value to set.
+	   * Hyperlinks which direct outside of the current host domain these can used in a histogram style manner to generate host statistics	   * @param value the value to set.
 	   */
-	  public void setOutlinks(java.util.Map<CharSequence,CharSequence> value) {
-	    throw new UnsupportedOperationException("Set is not supported on tombstones");
+	  public void setOutlinks(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
+	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
 	  }
 	  
 	  /**
 	   * Checks the dirty status of the 'outlinks' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
+	   * Hyperlinks which direct outside of the current host domain these can used in a histogram style manner to generate host statistics	   * @param value the value to set.
 	   */
-	  public boolean isOutlinksDirty(java.util.Map<CharSequence,CharSequence> value) {
-	    throw new UnsupportedOperationException("IsDirty is not supported on tombstones");
+	  public boolean isOutlinksDirty(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
+	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
 	  }
 	
 				  /**
 	   * Gets the value of the 'inlinks' field.
-		   */
-	  public java.util.Map<CharSequence,CharSequence> getInlinks() {
-	    throw new UnsupportedOperationException("Get is not supported on tombstones");
+	   * Hyperlinks which link to pages within the current host domain these can used in a histogram style manner to generate host statistics	   */
+	  public java.util.Map<java.lang.CharSequence,java.lang.CharSequence> getInlinks() {
+	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
 	  }
 	
 	  /**
 	   * Sets the value of the 'inlinks' field.
-		   * @param value the value to set.
+	   * Hyperlinks which link to pages within the current host domain these can used in a histogram style manner to generate host statistics	   * @param value the value to set.
 	   */
-	  public void setInlinks(java.util.Map<CharSequence,CharSequence> value) {
-	    throw new UnsupportedOperationException("Set is not supported on tombstones");
+	  public void setInlinks(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
+	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
 	  }
 	  
 	  /**
 	   * Checks the dirty status of the 'inlinks' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
+	   * Hyperlinks which link to pages within the current host domain these can used in a histogram style manner to generate host statistics	   * @param value the value to set.
 	   */
-	  public boolean isInlinksDirty(java.util.Map<CharSequence,CharSequence> value) {
-	    throw new UnsupportedOperationException("IsDirty is not supported on tombstones");
+	  public boolean isInlinksDirty(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
+	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
 	  }
 	
 		  
   }
   
-}
\ No newline at end of file
+}
+

Modified: nutch/branches/2.x/src/java/org/apache/nutch/storage/ParseStatus.java
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/storage/ParseStatus.java?rev=1650437&r1=1650436&r2=1650437&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/storage/ParseStatus.java (original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/storage/ParseStatus.java Fri Jan  9 03:53:39 2015
@@ -1,19 +1,19 @@
 /*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+******************************************************************************/
 /**
  * Autogenerated by Avro
  * 
@@ -21,15 +21,15 @@
  */
 package org.apache.nutch.storage;  
 @SuppressWarnings("all")
+/** A nested container representing parse status data captured from invocation of parsers on fetch of a WebPage */
 public class ParseStatus extends org.apache.gora.persistency.impl.PersistentBase implements org.apache.avro.specific.SpecificRecord, org.apache.gora.persistency.Persistent {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"ParseStatus\",\"namespace\":\"org.apache.nutch.storage\",\"fields\":[{\"name\":\"__g__dirty\",\"type\":\"bytes\",\"doc\":\"Bytes used to represent weather or not a field is dirty.\",\"default\":\"AA==\"},{\"name\":\"majorCode\",\"type\":\"int\",\"default\":0},{\"name\":\"minorCode\",\"type\":\"int\",\"default\":0},{\"name\":\"args\",\"type\":{\"type\":\"array\",\"items\":\"string\"},\"default\":[]}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"ParseStatus\",\"namespace\":\"org.apache.nutch.storage\",\"doc\":\"A nested container representing parse status data captured from invocation of parsers on fetch of a WebPage\",\"fields\":[{\"name\":\"majorCode\",\"type\":\"int\",\"doc\":\"Major parsing status' including NOTPARSED (Parsing was not performed), SUCCESS (Parsing succeeded), FAILED (General failure. There may be a more specific error message in arguments.)\",\"default\":0},{\"name\":\"minorCode\",\"type\":\"int\",\"doc\":\"Minor parsing status' including SUCCESS_OK - Successful parse devoid of anomalies or issues, SUCCESS_REDIRECT - Parsed content contains a directive to redirect to another URL. The target URL can be retrieved from the arguments., FAILED_EXCEPTION - Parsing failed. An Exception occured which may be retrieved from the arguments., FAILED_TRUNCATED - Parsing failed. Content was 
 truncated, but the parser cannot handle incomplete content., FAILED_INVALID_FORMAT - Parsing failed. Invalid format e.g. the content may be corrupted or of wrong type., FAILED_MISSING_PARTS - Parsing failed. Other related parts of the content are needed to complete parsing. The list of URLs to missing parts may be provided in arguments. The Fetcher may decide to fetch these parts at once, then put them into Content.metadata, and supply them for re-parsing., FAILED_MISING_CONTENT - Parsing failed. There was no content to be parsed - probably caused by errors at protocol stage.\",\"default\":0},{\"name\":\"args\",\"type\":{\"type\":\"array\",\"items\":\"string\"},\"doc\":\"Optional arguments supplied to compliment and/or justify the parse status code.\",\"default\":[]}]}");
 
   /** Enum containing all data bean's fields. */
   public static enum Field {
-    __G__DIRTY(0, "__g__dirty"),
-    MAJOR_CODE(1, "majorCode"),
-    MINOR_CODE(2, "minorCode"),
-    ARGS(3, "args"),
+    MAJOR_CODE(0, "majorCode"),
+    MINOR_CODE(1, "minorCode"),
+    ARGS(2, "args"),
     ;
     /**
      * Field's index.
@@ -68,12 +68,11 @@ public class ParseStatus extends org.apa
   };
 
   public static final String[] _ALL_FIELDS = {
-  "__g__dirty",
   "majorCode",
   "minorCode",
   "args",
   };
-  
+
   /**
    * Gets the total field count.
    * @return int field count
@@ -82,123 +81,122 @@ public class ParseStatus extends org.apa
     return ParseStatus._ALL_FIELDS.length;
   }
 
-  /** Bytes used to represent weather or not a field is dirty. */
-  private java.nio.ByteBuffer __g__dirty = java.nio.ByteBuffer.wrap(new byte[1]);
+  /** Major parsing status' including NOTPARSED (Parsing was not performed), SUCCESS (Parsing succeeded), FAILED (General failure. There may be a more specific error message in arguments.) */
   private int majorCode;
+  /** Minor parsing status' including SUCCESS_OK - Successful parse devoid of anomalies or issues, SUCCESS_REDIRECT - Parsed content contains a directive to redirect to another URL. The target URL can be retrieved from the arguments., FAILED_EXCEPTION - Parsing failed. An Exception occured which may be retrieved from the arguments., FAILED_TRUNCATED - Parsing failed. Content was truncated, but the parser cannot handle incomplete content., FAILED_INVALID_FORMAT - Parsing failed. Invalid format e.g. the content may be corrupted or of wrong type., FAILED_MISSING_PARTS - Parsing failed. Other related parts of the content are needed to complete parsing. The list of URLs to missing parts may be provided in arguments. The Fetcher may decide to fetch these parts at once, then put them into Content.metadata, and supply them for re-parsing., FAILED_MISING_CONTENT - Parsing failed. There was no content to be parsed - probably caused by errors at protocol stage. */
   private int minorCode;
-  private java.util.List<CharSequence> args;
+  /** Optional arguments supplied to compliment and/or justify the parse status code. */
+  private java.util.List<java.lang.CharSequence> args;
   public org.apache.avro.Schema getSchema() { return SCHEMA$; }
   // Used by DatumWriter.  Applications should not call. 
-  public Object get(int field$) {
+  public java.lang.Object get(int field$) {
     switch (field$) {
-    case 0: return __g__dirty;
-    case 1: return majorCode;
-    case 2: return minorCode;
-    case 3: return args;
+    case 0: return majorCode;
+    case 1: return minorCode;
+    case 2: return args;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
   
   // Used by DatumReader.  Applications should not call. 
   @SuppressWarnings(value="unchecked")
-  public void put(int field$, Object value) {
+  public void put(int field$, java.lang.Object value) {
     switch (field$) {
-    case 0: __g__dirty = (java.nio.ByteBuffer)(value); break;
-    case 1: majorCode = (Integer)(value); break;
-    case 2: minorCode = (Integer)(value); break;
-    case 3: args = (java.util.List<CharSequence>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)value)); break;
+    case 0: majorCode = (java.lang.Integer)(value); break;
+    case 1: minorCode = (java.lang.Integer)(value); break;
+    case 2: args = (java.util.List<java.lang.CharSequence>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)value)); break;
     default: throw new org.apache.avro.AvroRuntimeException("Bad index");
     }
   }
 
   /**
    * Gets the value of the 'majorCode' field.
-   */
-  public Integer getMajorCode() {
+   * Major parsing status' including NOTPARSED (Parsing was not performed), SUCCESS (Parsing succeeded), FAILED (General failure. There may be a more specific error message in arguments.)   */
+  public java.lang.Integer getMajorCode() {
     return majorCode;
   }
 
   /**
    * Sets the value of the 'majorCode' field.
-   * @param value the value to set.
+   * Major parsing status' including NOTPARSED (Parsing was not performed), SUCCESS (Parsing succeeded), FAILED (General failure. There may be a more specific error message in arguments.)   * @param value the value to set.
    */
-  public void setMajorCode(Integer value) {
+  public void setMajorCode(java.lang.Integer value) {
     this.majorCode = value;
-    setDirty(1);
+    setDirty(0);
   }
   
   /**
    * Checks the dirty status of the 'majorCode' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
+   * Major parsing status' including NOTPARSED (Parsing was not performed), SUCCESS (Parsing succeeded), FAILED (General failure. There may be a more specific error message in arguments.)   * @param value the value to set.
    */
-  public boolean isMajorCodeDirty(Integer value) {
-    return isDirty(1);
+  public boolean isMajorCodeDirty(java.lang.Integer value) {
+    return isDirty(0);
   }
 
   /**
    * Gets the value of the 'minorCode' field.
-   */
-  public Integer getMinorCode() {
+   * Minor parsing status' including SUCCESS_OK - Successful parse devoid of anomalies or issues, SUCCESS_REDIRECT - Parsed content contains a directive to redirect to another URL. The target URL can be retrieved from the arguments., FAILED_EXCEPTION - Parsing failed. An Exception occured which may be retrieved from the arguments., FAILED_TRUNCATED - Parsing failed. Content was truncated, but the parser cannot handle incomplete content., FAILED_INVALID_FORMAT - Parsing failed. Invalid format e.g. the content may be corrupted or of wrong type., FAILED_MISSING_PARTS - Parsing failed. Other related parts of the content are needed to complete parsing. The list of URLs to missing parts may be provided in arguments. The Fetcher may decide to fetch these parts at once, then put them into Content.metadata, and supply them for re-parsing., FAILED_MISING_CONTENT - Parsing failed. There was no content to be parsed - probably caused by errors at protocol stage.   */
+  public java.lang.Integer getMinorCode() {
     return minorCode;
   }
 
   /**
    * Sets the value of the 'minorCode' field.
-   * @param value the value to set.
+   * Minor parsing status' including SUCCESS_OK - Successful parse devoid of anomalies or issues, SUCCESS_REDIRECT - Parsed content contains a directive to redirect to another URL. The target URL can be retrieved from the arguments., FAILED_EXCEPTION - Parsing failed. An Exception occured which may be retrieved from the arguments., FAILED_TRUNCATED - Parsing failed. Content was truncated, but the parser cannot handle incomplete content., FAILED_INVALID_FORMAT - Parsing failed. Invalid format e.g. the content may be corrupted or of wrong type., FAILED_MISSING_PARTS - Parsing failed. Other related parts of the content are needed to complete parsing. The list of URLs to missing parts may be provided in arguments. The Fetcher may decide to fetch these parts at once, then put them into Content.metadata, and supply them for re-parsing., FAILED_MISING_CONTENT - Parsing failed. There was no content to be parsed - probably caused by errors at protocol stage.   * @param value the value to set
 .
    */
-  public void setMinorCode(Integer value) {
+  public void setMinorCode(java.lang.Integer value) {
     this.minorCode = value;
-    setDirty(2);
+    setDirty(1);
   }
   
   /**
    * Checks the dirty status of the 'minorCode' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
+   * Minor parsing status' including SUCCESS_OK - Successful parse devoid of anomalies or issues, SUCCESS_REDIRECT - Parsed content contains a directive to redirect to another URL. The target URL can be retrieved from the arguments., FAILED_EXCEPTION - Parsing failed. An Exception occured which may be retrieved from the arguments., FAILED_TRUNCATED - Parsing failed. Content was truncated, but the parser cannot handle incomplete content., FAILED_INVALID_FORMAT - Parsing failed. Invalid format e.g. the content may be corrupted or of wrong type., FAILED_MISSING_PARTS - Parsing failed. Other related parts of the content are needed to complete parsing. The list of URLs to missing parts may be provided in arguments. The Fetcher may decide to fetch these parts at once, then put them into Content.metadata, and supply them for re-parsing., FAILED_MISING_CONTENT - Parsing failed. There was no content to be parsed - probably caused by errors at protocol stage.   * @param value the value to set
 .
    */
-  public boolean isMinorCodeDirty(Integer value) {
-    return isDirty(2);
+  public boolean isMinorCodeDirty(java.lang.Integer value) {
+    return isDirty(1);
   }
 
   /**
    * Gets the value of the 'args' field.
-   */
-  public java.util.List<CharSequence> getArgs() {
+   * Optional arguments supplied to compliment and/or justify the parse status code.   */
+  public java.util.List<java.lang.CharSequence> getArgs() {
     return args;
   }
 
   /**
    * Sets the value of the 'args' field.
-   * @param value the value to set.
+   * Optional arguments supplied to compliment and/or justify the parse status code.   * @param value the value to set.
    */
-  public void setArgs(java.util.List<CharSequence> value) {
+  public void setArgs(java.util.List<java.lang.CharSequence> value) {
     this.args = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper(value);
-    setDirty(3);
+    setDirty(2);
   }
   
   /**
    * Checks the dirty status of the 'args' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
+   * Optional arguments supplied to compliment and/or justify the parse status code.   * @param value the value to set.
    */
-  public boolean isArgsDirty(java.util.List<CharSequence> value) {
-    return isDirty(3);
+  public boolean isArgsDirty(java.util.List<java.lang.CharSequence> value) {
+    return isDirty(2);
   }
 
   /** Creates a new ParseStatus RecordBuilder */
-  public static Builder newBuilder() {
-    return new Builder();
+  public static org.apache.nutch.storage.ParseStatus.Builder newBuilder() {
+    return new org.apache.nutch.storage.ParseStatus.Builder();
   }
   
   /** Creates a new ParseStatus RecordBuilder by copying an existing Builder */
-  public static Builder newBuilder(Builder other) {
-    return new Builder(other);
+  public static org.apache.nutch.storage.ParseStatus.Builder newBuilder(org.apache.nutch.storage.ParseStatus.Builder other) {
+    return new org.apache.nutch.storage.ParseStatus.Builder(other);
   }
   
   /** Creates a new ParseStatus RecordBuilder by copying an existing ParseStatus instance */
-  public static Builder newBuilder(ParseStatus other) {
-    return new Builder(other);
+  public static org.apache.nutch.storage.ParseStatus.Builder newBuilder(org.apache.nutch.storage.ParseStatus other) {
+    return new org.apache.nutch.storage.ParseStatus.Builder(other);
   }
   
-  private static java.nio.ByteBuffer deepCopyToWriteOnlyBuffer(
+  private static java.nio.ByteBuffer deepCopyToReadOnlyBuffer(
       java.nio.ByteBuffer input) {
     java.nio.ByteBuffer copy = java.nio.ByteBuffer.allocate(input.capacity());
     int position = input.position();
@@ -227,112 +225,107 @@ public class ParseStatus extends org.apa
   public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<ParseStatus>
     implements org.apache.avro.data.RecordBuilder<ParseStatus> {
 
-    private java.nio.ByteBuffer __g__dirty;
     private int majorCode;
     private int minorCode;
-    private java.util.List<CharSequence> args;
+    private java.util.List<java.lang.CharSequence> args;
 
     /** Creates a new Builder */
     private Builder() {
-      super(ParseStatus.SCHEMA$);
+      super(org.apache.nutch.storage.ParseStatus.SCHEMA$);
     }
     
     /** Creates a Builder by copying an existing Builder */
-    private Builder(Builder other) {
+    private Builder(org.apache.nutch.storage.ParseStatus.Builder other) {
       super(other);
     }
     
     /** Creates a Builder by copying an existing ParseStatus instance */
-    private Builder(ParseStatus other) {
-            super(ParseStatus.SCHEMA$);
-      if (isValidValue(fields()[0], other.__g__dirty)) {
-        this.__g__dirty = (java.nio.ByteBuffer) data().deepCopy(fields()[0].schema(), other.__g__dirty);
+    private Builder(org.apache.nutch.storage.ParseStatus other) {
+            super(org.apache.nutch.storage.ParseStatus.SCHEMA$);
+      if (isValidValue(fields()[0], other.majorCode)) {
+        this.majorCode = (java.lang.Integer) data().deepCopy(fields()[0].schema(), other.majorCode);
         fieldSetFlags()[0] = true;
       }
-      if (isValidValue(fields()[1], other.majorCode)) {
-        this.majorCode = (Integer) data().deepCopy(fields()[1].schema(), other.majorCode);
+      if (isValidValue(fields()[1], other.minorCode)) {
+        this.minorCode = (java.lang.Integer) data().deepCopy(fields()[1].schema(), other.minorCode);
         fieldSetFlags()[1] = true;
       }
-      if (isValidValue(fields()[2], other.minorCode)) {
-        this.minorCode = (Integer) data().deepCopy(fields()[2].schema(), other.minorCode);
+      if (isValidValue(fields()[2], other.args)) {
+        this.args = (java.util.List<java.lang.CharSequence>) data().deepCopy(fields()[2].schema(), other.args);
         fieldSetFlags()[2] = true;
       }
-      if (isValidValue(fields()[3], other.args)) {
-        this.args = (java.util.List<CharSequence>) data().deepCopy(fields()[3].schema(), other.args);
-        fieldSetFlags()[3] = true;
-      }
     }
 
     /** Gets the value of the 'majorCode' field */
-    public Integer getMajorCode() {
+    public java.lang.Integer getMajorCode() {
       return majorCode;
     }
     
     /** Sets the value of the 'majorCode' field */
-    public Builder setMajorCode(int value) {
-      validate(fields()[1], value);
+    public org.apache.nutch.storage.ParseStatus.Builder setMajorCode(int value) {
+      validate(fields()[0], value);
       this.majorCode = value;
-      fieldSetFlags()[1] = true;
+      fieldSetFlags()[0] = true;
       return this; 
     }
     
     /** Checks whether the 'majorCode' field has been set */
     public boolean hasMajorCode() {
-      return fieldSetFlags()[1];
+      return fieldSetFlags()[0];
     }
     
     /** Clears the value of the 'majorCode' field */
-    public Builder clearMajorCode() {
-      fieldSetFlags()[1] = false;
+    public org.apache.nutch.storage.ParseStatus.Builder clearMajorCode() {
+      fieldSetFlags()[0] = false;
       return this;
     }
     
     /** Gets the value of the 'minorCode' field */
-    public Integer getMinorCode() {
+    public java.lang.Integer getMinorCode() {
       return minorCode;
     }
     
     /** Sets the value of the 'minorCode' field */
-    public Builder setMinorCode(int value) {
-      validate(fields()[2], value);
+    public org.apache.nutch.storage.ParseStatus.Builder setMinorCode(int value) {
+      validate(fields()[1], value);
       this.minorCode = value;
-      fieldSetFlags()[2] = true;
+      fieldSetFlags()[1] = true;
       return this; 
     }
     
     /** Checks whether the 'minorCode' field has been set */
     public boolean hasMinorCode() {
-      return fieldSetFlags()[2];
+      return fieldSetFlags()[1];
     }
     
     /** Clears the value of the 'minorCode' field */
-    public Builder clearMinorCode() {
-      fieldSetFlags()[2] = false;
+    public org.apache.nutch.storage.ParseStatus.Builder clearMinorCode() {
+      fieldSetFlags()[1] = false;
       return this;
     }
     
     /** Gets the value of the 'args' field */
-    public java.util.List<CharSequence> getArgs() {
+    public java.util.List<java.lang.CharSequence> getArgs() {
       return args;
     }
     
     /** Sets the value of the 'args' field */
-    public Builder setArgs(java.util.List<CharSequence> value) {
-      validate(fields()[3], value);
+    public org.apache.nutch.storage.ParseStatus.Builder setArgs(java.util.List<java.lang.CharSequence> value) {
+      validate(fields()[2], value);
       this.args = value;
-      fieldSetFlags()[3] = true;
+      fieldSetFlags()[2] = true;
       return this; 
     }
     
     /** Checks whether the 'args' field has been set */
     public boolean hasArgs() {
-      return fieldSetFlags()[3];
+      return fieldSetFlags()[2];
     }
     
     /** Clears the value of the 'args' field */
-    public Builder clearArgs() {
+    public org.apache.nutch.storage.ParseStatus.Builder clearArgs() {
       args = null;
-      fieldSetFlags()[3] = false;
+      fieldSetFlags()[2] = false;
       return this;
     }
     
@@ -340,10 +333,9 @@ public class ParseStatus extends org.apa
     public ParseStatus build() {
       try {
         ParseStatus record = new ParseStatus();
-        record.__g__dirty = fieldSetFlags()[0] ? this.__g__dirty : (java.nio.ByteBuffer) java.nio.ByteBuffer.wrap(new byte[1]);
-        record.majorCode = fieldSetFlags()[1] ? this.majorCode : (Integer) defaultValue(fields()[1]);
-        record.minorCode = fieldSetFlags()[2] ? this.minorCode : (Integer) defaultValue(fields()[2]);
-        record.args = fieldSetFlags()[3] ? this.args : (java.util.List<CharSequence>) new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)defaultValue(fields()[3]));
+        record.majorCode = fieldSetFlags()[0] ? this.majorCode : (java.lang.Integer) defaultValue(fields()[0]);
+        record.minorCode = fieldSetFlags()[1] ? this.minorCode : (java.lang.Integer) defaultValue(fields()[1]);
+        record.args = fieldSetFlags()[2] ? this.args : (java.util.List<java.lang.CharSequence>) new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)defaultValue(fields()[2]));
         return record;
       } catch (Exception e) {
         throw new org.apache.avro.AvroRuntimeException(e);
@@ -351,7 +343,7 @@ public class ParseStatus extends org.apa
     }
   }
   
-  public Tombstone getTombstone(){
+  public ParseStatus.Tombstone getTombstone(){
   	return TOMBSTONE;
   }
 
@@ -365,76 +357,77 @@ public class ParseStatus extends org.apa
   
       private Tombstone() { }
   
-	  				  /**
+	  		  /**
 	   * Gets the value of the 'majorCode' field.
-		   */
-	  public Integer getMajorCode() {
-	    throw new UnsupportedOperationException("Get is not supported on tombstones");
+	   * Major parsing status' including NOTPARSED (Parsing was not performed), SUCCESS (Parsing succeeded), FAILED (General failure. There may be a more specific error message in arguments.)	   */
+	  public java.lang.Integer getMajorCode() {
+	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
 	  }
 	
 	  /**
 	   * Sets the value of the 'majorCode' field.
-		   * @param value the value to set.
+	   * Major parsing status' including NOTPARSED (Parsing was not performed), SUCCESS (Parsing succeeded), FAILED (General failure. There may be a more specific error message in arguments.)	   * @param value the value to set.
 	   */
-	  public void setMajorCode(Integer value) {
-	    throw new UnsupportedOperationException("Set is not supported on tombstones");
+	  public void setMajorCode(java.lang.Integer value) {
+	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
 	  }
 	  
 	  /**
 	   * Checks the dirty status of the 'majorCode' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
+	   * Major parsing status' including NOTPARSED (Parsing was not performed), SUCCESS (Parsing succeeded), FAILED (General failure. There may be a more specific error message in arguments.)	   * @param value the value to set.
 	   */
-	  public boolean isMajorCodeDirty(Integer value) {
-	    throw new UnsupportedOperationException("IsDirty is not supported on tombstones");
+	  public boolean isMajorCodeDirty(java.lang.Integer value) {
+	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
 	  }
 	
 				  /**
 	   * Gets the value of the 'minorCode' field.
-		   */
-	  public Integer getMinorCode() {
-	    throw new UnsupportedOperationException("Get is not supported on tombstones");
+	   * Minor parsing status' including SUCCESS_OK - Successful parse devoid of anomalies or issues, SUCCESS_REDIRECT - Parsed content contains a directive to redirect to another URL. The target URL can be retrieved from the arguments., FAILED_EXCEPTION - Parsing failed. An Exception occured which may be retrieved from the arguments., FAILED_TRUNCATED - Parsing failed. Content was truncated, but the parser cannot handle incomplete content., FAILED_INVALID_FORMAT - Parsing failed. Invalid format e.g. the content may be corrupted or of wrong type., FAILED_MISSING_PARTS - Parsing failed. Other related parts of the content are needed to complete parsing. The list of URLs to missing parts may be provided in arguments. The Fetcher may decide to fetch these parts at once, then put them into Content.metadata, and supply them for re-parsing., FAILED_MISING_CONTENT - Parsing failed. There was no content to be parsed - probably caused by errors at protocol stage.	   */
+	  public java.lang.Integer getMinorCode() {
+	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
 	  }
 	
 	  /**
 	   * Sets the value of the 'minorCode' field.
-		   * @param value the value to set.
+	   * Minor parsing status' including SUCCESS_OK - Successful parse devoid of anomalies or issues, SUCCESS_REDIRECT - Parsed content contains a directive to redirect to another URL. The target URL can be retrieved from the arguments., FAILED_EXCEPTION - Parsing failed. An Exception occured which may be retrieved from the arguments., FAILED_TRUNCATED - Parsing failed. Content was truncated, but the parser cannot handle incomplete content., FAILED_INVALID_FORMAT - Parsing failed. Invalid format e.g. the content may be corrupted or of wrong type., FAILED_MISSING_PARTS - Parsing failed. Other related parts of the content are needed to complete parsing. The list of URLs to missing parts may be provided in arguments. The Fetcher may decide to fetch these parts at once, then put them into Content.metadata, and supply them for re-parsing., FAILED_MISING_CONTENT - Parsing failed. There was no content to be parsed - probably caused by errors at protocol stage.	   * @param value the value to s
 et.
 	   */
-	  public void setMinorCode(Integer value) {
-	    throw new UnsupportedOperationException("Set is not supported on tombstones");
+	  public void setMinorCode(java.lang.Integer value) {
+	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
 	  }
 	  
 	  /**
 	   * Checks the dirty status of the 'minorCode' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
+	   * Minor parsing status' including SUCCESS_OK - Successful parse devoid of anomalies or issues, SUCCESS_REDIRECT - Parsed content contains a directive to redirect to another URL. The target URL can be retrieved from the arguments., FAILED_EXCEPTION - Parsing failed. An Exception occured which may be retrieved from the arguments., FAILED_TRUNCATED - Parsing failed. Content was truncated, but the parser cannot handle incomplete content., FAILED_INVALID_FORMAT - Parsing failed. Invalid format e.g. the content may be corrupted or of wrong type., FAILED_MISSING_PARTS - Parsing failed. Other related parts of the content are needed to complete parsing. The list of URLs to missing parts may be provided in arguments. The Fetcher may decide to fetch these parts at once, then put them into Content.metadata, and supply them for re-parsing., FAILED_MISING_CONTENT - Parsing failed. There was no content to be parsed - probably caused by errors at protocol stage.	   * @param value the value to s
 et.
 	   */
-	  public boolean isMinorCodeDirty(Integer value) {
-	    throw new UnsupportedOperationException("IsDirty is not supported on tombstones");
+	  public boolean isMinorCodeDirty(java.lang.Integer value) {
+	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
 	  }
 	
 				  /**
 	   * Gets the value of the 'args' field.
-		   */
-	  public java.util.List<CharSequence> getArgs() {
-	    throw new UnsupportedOperationException("Get is not supported on tombstones");
+	   * Optional arguments supplied to compliment and/or justify the parse status code.	   */
+	  public java.util.List<java.lang.CharSequence> getArgs() {
+	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
 	  }
 	
 	  /**
 	   * Sets the value of the 'args' field.
-		   * @param value the value to set.
+	   * Optional arguments supplied to compliment and/or justify the parse status code.	   * @param value the value to set.
 	   */
-	  public void setArgs(java.util.List<CharSequence> value) {
-	    throw new UnsupportedOperationException("Set is not supported on tombstones");
+	  public void setArgs(java.util.List<java.lang.CharSequence> value) {
+	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
 	  }
 	  
 	  /**
 	   * Checks the dirty status of the 'args' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
+	   * Optional arguments supplied to compliment and/or justify the parse status code.	   * @param value the value to set.
 	   */
-	  public boolean isArgsDirty(java.util.List<CharSequence> value) {
-	    throw new UnsupportedOperationException("IsDirty is not supported on tombstones");
+	  public boolean isArgsDirty(java.util.List<java.lang.CharSequence> value) {
+	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
 	  }
 	
 		  
   }
   
-}
\ No newline at end of file
+}
+