You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2010/01/12 19:11:12 UTC
svn commit: r898448 - in /hadoop/hbase/branches/0.20: CHANGES.txt
src/contrib/build-contrib.xml src/contrib/ec2/bin/hbase-ec2-env.sh
src/contrib/ec2/bin/image/create-hbase-image-remote src/contrib/ec2/build.xml
Author: apurtell
Date: Tue Jan 12 18:11:11 2010
New Revision: 898448
URL: http://svn.apache.org/viewvc?rev=898448&view=rev
Log:
HBASE-2103 [EC2] pull version from build
Added:
hadoop/hbase/branches/0.20/src/contrib/ec2/build.xml
Modified:
hadoop/hbase/branches/0.20/CHANGES.txt
hadoop/hbase/branches/0.20/src/contrib/build-contrib.xml
hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-env.sh
hadoop/hbase/branches/0.20/src/contrib/ec2/bin/image/create-hbase-image-remote
Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=898448&r1=898447&r2=898448&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Tue Jan 12 18:11:11 2010
@@ -92,6 +92,7 @@
(Lars George via Stack)
HBASE-2095 TIF should support more confs for the scanner (Bassam Tabbara
via Andrew Purtell)
+ HBASE-2103 [EC2] pull version from build
NEW FEATURES
HBASE-1961 HBase EC2 scripts
Modified: hadoop/hbase/branches/0.20/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/build-contrib.xml?rev=898448&r1=898447&r2=898448&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/contrib/build-contrib.xml (original)
+++ hadoop/hbase/branches/0.20/src/contrib/build-contrib.xml Tue Jan 12 18:11:11 2010
@@ -21,7 +21,7 @@
<project name="hbasebuildcontrib">
- <property name="version" value="0.20.0"/>
+ <property name="version" value="0.20.3-dev"/>
<property name="name" value="${ant.project.name}"/>
<property name="root" value="${basedir}"/>
Modified: hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-env.sh
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-env.sh?rev=898448&r1=898447&r2=898448&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-env.sh (original)
+++ hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-env.sh Tue Jan 12 18:11:11 2010
@@ -34,7 +34,7 @@
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,7 +42,7 @@
# 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=iridiant-bundles
+S3_BUCKET=apache-hbase-images
# Enable public access web interfaces
ENABLE_WEB_PORTS=false
Modified: hadoop/hbase/branches/0.20/src/contrib/ec2/bin/image/create-hbase-image-remote
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/ec2/bin/image/create-hbase-image-remote?rev=898448&r1=898447&r2=898448&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/contrib/ec2/bin/image/create-hbase-image-remote (original)
+++ hadoop/hbase/branches/0.20/src/contrib/ec2/bin/image/create-hbase-image-remote Tue Jan 12 18:11:11 2010
@@ -37,7 +37,7 @@
# 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 @@
# 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 @@
# 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
Added: hadoop/hbase/branches/0.20/src/contrib/ec2/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/ec2/build.xml?rev=898448&view=auto
==============================================================================
--- hadoop/hbase/branches/0.20/src/contrib/ec2/build.xml (added)
+++ hadoop/hbase/branches/0.20/src/contrib/ec2/build.xml Tue Jan 12 18:11:11 2010
@@ -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>