HBASE-2103 [EC2] pull version from build

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

CHANGES.txt

@@ -298,6 +298,7 @@ Release 0.21.0 - Unreleased
    HBASE-2107  Upgrading Lucene 2.2 to Lucene 3.0.0 (Kay Kay via Stack)
    HBASE-2111  Move to ivy broke our being able to run in-place; i.e.
                ./bin/start-hbase.sh in a checkout
+   HBASE-2103  [EC2] pull version from build
 
   NEW FEATURES
    HBASE-1901  "General" partitioner for "hbase-48" bulk (behind the api, write

src/contrib/build-contrib.xml

@@ -21,7 +21,7 @@
 
 <project name="hbasebuildcontrib">
 
-  <property name="version" value="0.20.0"/>
+  <property name="version" value="0.20.3"/>
   <property name="name" value="${ant.project.name}"/>
 
   <!-- Load all the default properties, and any the user wants    -->

src/contrib/ec2/bin/hbase-ec2-env.sh

@@ -34,7 +34,7 @@ EC2_CERT=
 EC2_ROOT_SSH_KEY=
 
 # The version of HBase to use.
-HBASE_VERSION=0.20.3-dev
+HBASE_VERSION=@HBASE_VERSION@
 
 # The version of Hadoop to use.
 HADOOP_VERSION=0.20.1
@@ -42,8 +42,7 @@ HADOOP_VERSION=0.20.1
 # The Amazon S3 bucket where the HBase AMI is stored.
 # Change this value only if you are creating your own (private) AMI
 # so you can store it in a bucket you own.
-#S3_BUCKET=hbase-images
+S3_BUCKET=apache-hbase-images
-S3_BUCKET=iridiant-bundles
 
 # Enable public access web interfaces
 ENABLE_WEB_PORTS=false

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

@@ -37,7 +37,7 @@ rm -f "$bin"/credentials.sh
 # Install Java
 echo "Downloading and installing java binary."
 cd /usr/local
-wget -nv -O java.bin http://iridiant.s3.amazonaws.com/jdk/jdk-${JAVA_VERSION}-linux-${arch}.bin
+wget -nv -O java.bin http://hbase.s3.amazonaws.com/jdk/jdk-${JAVA_VERSION}-linux-${arch}.bin
 sh java.bin
 rm -f java.bin
 
@@ -66,7 +66,7 @@ sed -i \
 # Install HBase
 echo "Installing HBase $HBASE_VERSION."
 cd /usr/local
-wget -nv http://iridiant.s3.amazonaws.com/hbase/hbase-$HBASE_VERSION.tar.gz
+wget -nv http://hbase.s3.amazonaws.com/hbase/hbase-$HBASE_VERSION.tar.gz
 tar xzf hbase-$HBASE_VERSION.tar.gz
 rm -f hbase-$HBASE_VERSION.tar.gz
 
@@ -97,7 +97,7 @@ echo '    StrictHostKeyChecking no' >> /etc/ssh/ssh_config
 
 # Install LZO
 echo "Installing LZO codec support"
-wget -nv -O /tmp/lzo-linux-${HADOOP_VERSION}.tar.gz http://iridiant.s3.amazonaws.com/hbase/lzo-linux-${HADOOP_VERSION}.tar.gz
+wget -nv -O /tmp/lzo-linux-${HADOOP_VERSION}.tar.gz http://hbase.s3.amazonaws.com/hbase/lzo-linux-${HADOOP_VERSION}.tar.gz
 cd /usr/local/hadoop-${HADOOP_VERSION} && tar xzf /tmp/lzo-linux-${HADOOP_VERSION}.tar.gz
 cd /usr/local/hbase-${HBASE_VERSION} && tar xzf /tmp/lzo-linux-${HADOOP_VERSION}.tar.gz
 rm -f /tmp/lzo-linux-${HADOOP_VERSION}.tar.gz

src/contrib/ec2/build.xml

@@ -0,0 +1,40 @@
+<project name="ec2" default="package" basedir=".">
+  <import file="../build-contrib.xml"/>
+
+  <target name="compile">
+    <copy todir="${build.dir}">
+      <fileset dir="${root}">
+	<exclude name="build.xml"/>
+      </fileset>
+    </copy>
+    <exec executable="sed">
+      <arg value="-i"/>
+      <arg value="-e"/> <arg value="s/@HBASE_VERSION@/${version}/g"/>
+      <arg value="${build.dir}/bin/hbase-ec2-env.sh"/>
+    </exec>
+  </target>
+
+  <target name="package" depends="compile">
+    <mkdir dir="${dist.dir}/contrib/${name}"/>
+    <copy todir="${dist.dir}/contrib/${name}">
+      <fileset dir="${build.dir}"/>
+    </copy>
+    <exec executable="chmod">
+      <arg value="755"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/hbase-ec2"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/cmd-hbase-cluster"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/create-hbase-image"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/delete-hbase-cluster"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/init-hbase-cluster-secgroups"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/launch-hbase-cluster"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/launch-hbase-master"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/launch-hbase-slaves"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/launch-hbase-zookeeper"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/list-hbase-clusters"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/revoke-hbase-cluster-secgroups"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/terminate-hbase-cluster"/>
+      <arg value="${dist.dir}/contrib/${name}/bin/image/create-hbase-image-remote"/>
+    </exec>
+  </target>
+
+</project>