From 6d4425c696e48dd518acb56d094c431a1763e26e Mon Sep 17 00:00:00 2001
From: Stefano Mazzocchi <stefano@apache.org>
Date: Mon, 8 Feb 2010 19:48:28 +0000
Subject: [PATCH] - finally java6 has support for wildcards... seriously, how
 fricking long did it take for this to happen?! - so require java6 since it's
 also a lot faster and a lot more reliable for us for profiling

git-svn-id: http://google-refine.googlecode.com/svn/trunk@68 7d457c2a-affb-35e4-300a-418c747d4874
---
 gridworks | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gridworks b/gridworks
index 03b526148..eb6488406 100755
--- a/gridworks
+++ b/gridworks
@@ -74,11 +74,7 @@ run() {
         echo ""
     fi
     
-    CLASSPATH="$GRIDWORKS_BUILD_DIR/classes"
-    for i in `ls $GRIDWORKS_LIB_DIR/*.jar` ; do 
-        CLASSPATH=$CLASSPATH:$i
-    done
-
+    CLASSPATH="$GRIDWORKS_BUILD_DIR/classes:$GRIDWORKS_LIB_DIR/*"
 
     RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.metaweb.gridworks.Gridworks"
   
@@ -116,6 +112,12 @@ else
     fi
 fi
 
+JAVA_VERSION=`java -version 2>&1 | grep version | cut -d ' ' -f 3 | egrep ^\"1.6`
+if [ -z "$JAVA_VERSION" ] ; then
+    echo "Gridworks requires java version 6 or later."
+    exit 1
+fi
+
 # ----- Parse the command line args ------------------------------------------
 
 while [ $# -ne 0 ] ; do