svn commit: r894941 - in /hadoop/avro/trunk: .eclipse_launchers/AllTests.launch CHANGES.txt src/test/java/org/apache/avro/genavro/TestGenAvro.java

[cutting]

Author: cutting
Date: Thu Dec 31 21:29:44 2009
New Revision: 894941

URL: http://svn.apache.org/viewvc?rev=894941&view=rev
Log:
AVRO-276.  Gix GenAvro to specify file encoding as UTF-8.

Modified:
    hadoop/avro/trunk/.eclipse_launchers/AllTests.launch
    hadoop/avro/trunk/CHANGES.txt
    hadoop/avro/trunk/src/test/java/org/apache/avro/genavro/TestGenAvro.java

Modified: hadoop/avro/trunk/.eclipse_launchers/AllTests.launch
URL: 
http://svn.apache.org/viewvc/hadoop/avro/trunk/.eclipse_launchers/AllTests.launch?rev=894941&r1=894940&r2=894941&view=diff
==============================================================================
--- hadoop/avro/trunk/.eclipse_launchers/AllTests.launch (original)
+++ hadoop/avro/trunk/.eclipse_launchers/AllTests.launch Thu Dec 31 21:29:44 
2009
@@ -12,5 +12,5 @@
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" 
value="org.eclipse.jdt.junit.loader.junit4"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="avro"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" 
value="-Dtest.dir=${workspace_loc:avro}/build/test"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" 
value="-Dtest.dir=${workspace_loc:avro}/build/test 
-Dtest.genavro.dir=${workspace_loc:avro}/src/test/genavro"/>
 </launchConfiguration>

Modified: hadoop/avro/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/avro/trunk/CHANGES.txt?rev=894941&r1=894940&r2=894941&view=diff
==============================================================================
--- hadoop/avro/trunk/CHANGES.txt (original)
+++ hadoop/avro/trunk/CHANGES.txt Thu Dec 31 21:29:44 2009
@@ -230,6 +230,9 @@
 
     AVRO-262. Fix two typos in the spec.  (Jeff Hammerbacher via cutting)
 
+    AVRO-276. Fix GenAvro to specify file encoding as UTF-8.
+    (Philip Zeyliger via cutting)
+
 Avro 1.2.0 (14 October 2009)
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/avro/trunk/src/test/java/org/apache/avro/genavro/TestGenAvro.java
URL: 
http://svn.apache.org/viewvc/hadoop/avro/trunk/src/test/java/org/apache/avro/genavro/TestGenAvro.java?rev=894941&r1=894940&r2=894941&view=diff
==============================================================================
--- hadoop/avro/trunk/src/test/java/org/apache/avro/genavro/TestGenAvro.java 
(original)
+++ hadoop/avro/trunk/src/test/java/org/apache/avro/genavro/TestGenAvro.java 
Thu Dec 31 21:29:44 2009
@@ -26,10 +26,11 @@
 import java.util.List;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
+
 import org.apache.avro.Protocol;
 
 /**
@@ -136,7 +137,8 @@
     }
 
     private static String slurp(File f) throws IOException {
-      BufferedReader in = new BufferedReader(new FileReader(f));
+      BufferedReader in = new BufferedReader(
+          new InputStreamReader(new FileInputStream(f), "UTF-8"));
 
       String line = null;
       StringBuilder builder = new StringBuilder();