svn commit: r1339274 - in /gora/trunk: CHANGES.txt bin/compile-examples.sh bin/gora gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java

[le...@apache.org]

Author: lewismc
Date: Wed May 16 17:30:47 2012
New Revision: 1339274

URL: http://svn.apache.org/viewvc?rev=1339274&view=rev
Log:
commit to address GORA-63 & 133 respectively and update to CHANGES.txt

Modified:
    gora/trunk/CHANGES.txt
    gora/trunk/bin/compile-examples.sh
    gora/trunk/bin/gora
    gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java

Modified: gora/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/gora/trunk/CHANGES.txt?rev=1339274&r1=1339273&r2=1339274&view=diff
==============================================================================
--- gora/trunk/CHANGES.txt (original)
+++ gora/trunk/CHANGES.txt Wed May 16 17:30:47 2012
@@ -6,6 +6,8 @@ Gora Change Log
 
 0.3 (trunk) Current Development:
 
+* GORA-133 & 63 GoraCompiler cannot compile array type & bin/compile-examples.sh does not work respectively (enis, Kazuomi Kashii via lewismc)
+
 * GORA-129 redundant conf field in HBaseStore (ferdy)
 
 * GORA-123 Append correct submodule directories to SCM paths in submodule pom's (lewismc)

Modified: gora/trunk/bin/compile-examples.sh
URL: http://svn.apache.org/viewvc/gora/trunk/bin/compile-examples.sh?rev=1339274&r1=1339273&r2=1339274&view=diff
==============================================================================
--- gora/trunk/bin/compile-examples.sh (original)
+++ gora/trunk/bin/compile-examples.sh Wed May 16 17:30:47 2012
@@ -32,8 +32,8 @@ THIS_DIR=`dirname "$THIS"`
 GORA_HOME=`cd "$THIS_DIR/.." ; pwd`
 
 MODULE=gora-core
-DIR=$MODULE/src/examples/avro/
-OUTDIR=$MODULE/src/examples/java
+DIR=$GORA_HOME/$MODULE/src/examples/avro/
+OUTDIR=$GORA_HOME/$MODULE/src/examples/java
 GORA_BIN=$GORA_HOME/bin/gora
 
 for f in `ls $DIR` ; do

Modified: gora/trunk/bin/gora
URL: http://svn.apache.org/viewvc/gora/trunk/bin/gora?rev=1339274&r1=1339273&r2=1339274&view=diff
==============================================================================
--- gora/trunk/bin/gora (original)
+++ gora/trunk/bin/gora Wed May 16 17:30:47 2012
@@ -137,8 +137,8 @@ for f in $GORA_HOME/$MODULE/build/*.job;
   CLASSPATH=${CLASSPATH}:$f;
 done
 
-CLASSPATH=$CLASSPATH:$GORA_HOME/$MODULE/build/classes
-CLASSPATH=${CLASSPATH}:$GORA_HOME/$MODULE/build/test/classes
+CLASSPATH=$CLASSPATH:$GORA_HOME/$MODULE/target/classes
+CLASSPATH=${CLASSPATH}:$GORA_HOME/$MODULE/target/test/classes
 
 CLASSPATH=$CLASSPATH:$GORA_HOME/conf
 CLASSPATH=$CLASSPATH:$GORA_HOME/$MODULE/conf

Modified: gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java?rev=1339274&r1=1339273&r2=1339274&view=diff
==============================================================================
--- gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java (original)
+++ gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/GoraCompiler.java Wed May 16 17:30:47 2012
@@ -324,7 +324,7 @@ public class GoraCompiler {
             break;
           case ARRAY:
             unboxed = unbox(fieldSchema.getElementType());
-            fieldType = type(fieldSchema.getValueType());
+            fieldType = type(fieldSchema.getElementType());
             line(1, "public GenericArray<"+fieldType+"> get"+camelKey+"() {");
             line(2, "return (GenericArray<"+fieldType+">) get("+i+");");
             line(1, "}");