svn commit: r896972 - in /hadoop/avro/trunk: CHANGES.txt build.xml src/doc/content/xdocs/spec.xml

[cutting]

Author: cutting
Date: Thu Jan  7 19:21:17 2010
New Revision: 896972

URL: http://svn.apache.org/viewvc?rev=896972&view=rev
Log:
AVRO-280.  Fix file header schema in specfication.  Also fix forrestdoc build 
target to work on clean checkout.  Contributed by Jeff Hammerbacher.

Modified:
    hadoop/avro/trunk/CHANGES.txt
    hadoop/avro/trunk/build.xml
    hadoop/avro/trunk/src/doc/content/xdocs/spec.xml

Modified: hadoop/avro/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/avro/trunk/CHANGES.txt?rev=896972&r1=896971&r2=896972&view=diff
==============================================================================
--- hadoop/avro/trunk/CHANGES.txt (original)
+++ hadoop/avro/trunk/CHANGES.txt Thu Jan  7 19:21:17 2010
@@ -245,6 +245,9 @@
     AVRO-276. Fix GenAvro to specify file encoding as UTF-8.
     (Philip Zeyliger via cutting)
 
+    AVRO-280. Fix file header schema in specification.  Also fix
+    "forrestdoc" build target to work on clean checkout.
+
 Avro 1.2.0 (14 October 2009)
 
   INCOMPATIBLE CHANGES

Modified: hadoop/avro/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/avro/trunk/build.xml?rev=896972&r1=896971&r2=896972&view=diff
==============================================================================
--- hadoop/avro/trunk/build.xml (original)
+++ hadoop/avro/trunk/build.xml Thu Jan  7 19:21:17 2010
@@ -493,7 +493,7 @@
   <target name="doc" depends="forrestdoc,javadoc,pydoc,cdoc,cppdoc" 
description="Generate docs">
   </target>
 
-  <target name="forrestdoc" depends="forrest.check" description="Generate 
forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache 
Forrest installation&gt; on the command line." if="forrest.home">
+  <target name="forrestdoc" depends="init,forrest.check" description="Generate 
forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache 
Forrest installation&gt; on the command line." if="forrest.home">
     <echo  file="${build.dir}/avro.ent" append="false">
       &lt;!ENTITY AvroVersion "${version}"&gt;
     </echo>

Modified: hadoop/avro/trunk/src/doc/content/xdocs/spec.xml
URL: 
http://svn.apache.org/viewvc/hadoop/avro/trunk/src/doc/content/xdocs/spec.xml?rev=896972&r1=896971&r2=896972&view=diff
==============================================================================
--- hadoop/avro/trunk/src/doc/content/xdocs/spec.xml (original)
+++ hadoop/avro/trunk/src/doc/content/xdocs/spec.xml Thu Jan  7 19:21:17 2010
@@ -624,9 +624,9 @@
       <source>
 {"type": "record", "name": "org.apache.avro.file.Header",
  "fields" : [
-   {"name": "magic", "type": {"type": "fixed", "size": 4}}
-   {"name": "meta", "type": {"type": "map", "values": "bytes"}}
-   {"name": "sync", "type": {"type": "fixed", "size": 16}}
+   {"name": "magic", "type": {"type": "fixed", "name": "Magic", "size": 4}},
+   {"name": "meta", "type": {"type": "map", "values": "bytes"}},
+   {"name": "sync", "type": {"type": "fixed", "name": "Sync", "size": 16}},
   ]
 }
       </source>