HADOOP-1889. Fix path in EC2 scripts for building your own AMI.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@575578 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -137,6 +137,9 @@ Trunk (unreleased changes)
     HADOOP-1885. Fix race condition in MiniDFSCluster shutdown.
     (Chris Douglas via nigel)
 
+    HADOOP-1889.  Fix path in EC2 scripts for building your own AMI.
+    (tomwhite)
+
   IMPROVEMENTS
 
     HADOOP-1266. Remove dependency of package org.apache.hadoop.net on 

src/contrib/ec2/bin/hadoop-ec2-env.sh.template

@@ -25,7 +25,7 @@ PRIVATE_KEY_PATH=`echo "$EC2_KEYDIR"/"id_rsa-$KEY_NAME"`
 SSH_OPTS=`echo -i "$PRIVATE_KEY_PATH" -o StrictHostKeyChecking=no`
 
 # The version of Hadoop to use.
-HADOOP_VERSION=0.11.2
+HADOOP_VERSION=0.14.1
 
 # The Amazon S3 bucket where the Hadoop AMI is stored.
 # The default value is for public images, so can be left if you are using running a public image.
@@ -47,8 +47,8 @@ NO_INSTANCES=2
 # The following variables are only used when creating an AMI.
 #
 
-# The download URL for the Sun JDK. Visit http://java.sun.com/javase/downloads/index_jdk5.jsp and get the URL for the "Linux self-extracting file".
+# The download URL for the Sun JDK. Visit http://java.sun.com/javase/downloads/index.jsp and get the URL for the "Linux self-extracting file".
 JAVA_BINARY_URL=''
 
 # The version number of the installed JDK.
-JAVA_VERSION=1.5.0_11
+JAVA_VERSION=1.6.0_02

src/contrib/ec2/bin/image/create-hadoop-image-remote

@@ -20,7 +20,7 @@ yum install rsync
 
 # Install Hadoop
 cd /usr/local
-wget -nv http://www.apache.org/dist/lucene/hadoop/hadoop-$HADOOP_VERSION.tar.gz
+wget -nv http://www.apache.org/dist/lucene/hadoop/hadoop-$HADOOP_VERSION/hadoop-$HADOOP_VERSION.tar.gz
 tar xzf hadoop-$HADOOP_VERSION.tar.gz
 rm -f hadoop-$HADOOP_VERSION.tar.gz