Author: macyang
Date: Thu Jun 9 20:51:49 2011
New Revision: 1134073
URL: http://svn.apache.org/viewvc?rev=1134073&view=rev
Log:
HCAT-40 Remove dependencies from the HCatalog client jar (macyang)
Modified:
incubator/hcatalog/branches/branch-0.1/CHANGES.txt
incubator/hcatalog/branches/branch-0.1/build.xml
incubator/hcatalog/branches/branch-0.1/conf/proto-hive-site.xml
incubator/hcatalog/branches/branch-0.1/scripts/hcat_server_install.sh
Modified: incubator/hcatalog/branches/branch-0.1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.1/CHANGES.txt?rev=1134073&r1=1134072&r2=1134073&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.1/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.1/CHANGES.txt Thu Jun 9 20:51:49 2011
@@ -43,6 +43,8 @@ Release 0.1 - Unreleased
HCAT-9. Get a beginning HCatalog website up. (gates)
IMPROVEMENTS
+ HCAT-40. Remove dependencies from the HCatalog client jar (macyang)
+
HCAT-27. Start and stop scripts for the server (gates)
HCAT-21. Install documenation and script (gates)
Modified: incubator/hcatalog/branches/branch-0.1/build.xml
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.1/build.xml?rev=1134073&r1=1134072&r2=1134073&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.1/build.xml (original)
+++ incubator/hcatalog/branches/branch-0.1/build.xml Thu Jun 9 20:51:49 2011
@@ -18,7 +18,7 @@
-->
-<project name="hcatalog" default="fatjar"
xmlns:ivy="antlib:org.apache.ivy.ant" >
+<project name="hcatalog" default="clientjar"
xmlns:ivy="antlib:org.apache.ivy.ant" >
<!--
================================================================================
@@ -32,7 +32,6 @@
<!-- hive properties -->
<property name="hive.root" value="${basedir}/hive/external"/>
- <property name="hive.version" value="0.7.0"/>
<!-- build properties -->
<property name="lib.dir" value="${basedir}/lib/" />
@@ -107,7 +106,7 @@
<path id="test.classpath">
<pathelement location="${test.build.classes}" />
- <pathelement location="" />
+ <pathelement location="${build.classes}" />
<pathelement location="conf"/>
<pathelement location="${hive.conf.dir}"/>
<!-- jars Hive depends on -->
@@ -221,15 +220,10 @@
</javac>
</target>
- <!-- Build the jar, this is the default -->
- <target name="fatjar" depends="compile-src">
- <jar jarfile="${hcatalog.jar}" basedir="${build.classes}">
- <zipgroupfileset dir="${hive.root}/lib"
includes="thrift-fb303-${thrift-fb303.version}.jar,thrift-${thrift.version}.jar,commons-lang-2.4.jar,derby.jar"/>
- <zipgroupfileset dir="${hive.root}/metastore"
includes="hive-metastore-${version}.jar"/>
- <zipgroupfileset dir="${hive.root}/ql"
includes="hive-exec-${version}.jar"/>
- <zipgroupfileset dir="${hive.root}/common"
includes="hive-common-${version}.jar"/>
- <zipgroupfileset dir="${hive.root}/serde"
includes="hive-serde-${version}.jar"/>
- </jar>
+ <!-- Build the hcatalog client jar -->
+ <target name="clientjar" depends="compile-src">
+ <jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.jar}"
basedir="${build.classes}">
+ </jar>
</target>
<!--
@@ -238,7 +232,7 @@
================================================================================
-->
<!-- Build HCatalog test files -->
- <target name="compile-test" depends="fatjar">
+ <target name="compile-test" depends="clientjar">
<javac encoding="${build.encoding}" srcdir="${test.src.dir}"
excludes="${excludes}"
includes="**/*.java" destdir="${test.build.classes}"
debug="${javac.debug}"
optimize="${javac.optimize}" target="${javac.version}"
@@ -255,6 +249,7 @@
<!-- If anyone knows how to set umask inside ant please do so -->
<exec executable="bin/umaskcheck.sh" failonerror="true"/>
<delete dir="${test.log.dir}"/>
+ <delete dir="${test.warehouse.dir}"/>
<mkdir dir="${test.log.dir}"/>
<mkdir dir="${test.warehouse.dir}"/>
<junit showoutput="${test.output}" printsummary="yes" haltonfailure="no"
@@ -330,7 +325,7 @@
Distribution Section
===============================================================================
-->
- <target name="package" depends="fatjar, docs" description="Create an
HCatalog release">
+ <target name="package" depends="clientjar, docs" description="Create an
HCatalog release">
<mkdir dir="${dist.dir}" />
<mkdir dir="${dist.dir}/lib" />
<mkdir dir="${dist.dir}/conf" />
@@ -346,7 +341,9 @@
<copy todir="${dist.dir}/lib" includeEmptyDirs="false">
<fileset dir="${lib.dir}"/>
- <fileset file="hcatalog-*.jar"/>
+ <fileset dir="${build.dir}/${ant.project.name}/">
+ <include name="hcatalog-*.jar"/>
+ </fileset>
<fileset dir="hive/external/build/ivy/lib/default">
<include name="jdo2-api-*.jar"/>
Modified: incubator/hcatalog/branches/branch-0.1/conf/proto-hive-site.xml
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.1/conf/proto-hive-site.xml?rev=1134073&r1=1134072&r2=1134073&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.1/conf/proto-hive-site.xml (original)
+++ incubator/hcatalog/branches/branch-0.1/conf/proto-hive-site.xml Thu Jun 9
20:51:49 2011
@@ -81,7 +81,7 @@
<property>
<name>hive.metastore.uris</name>
- <value>thrift://SVRHOST:3306</value>
+ <value>thrift://SVRHOST:9080</value>
<description>URI for client to contact metastore server</description>
</property>
Modified: incubator/hcatalog/branches/branch-0.1/scripts/hcat_server_install.sh
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.1/scripts/hcat_server_install.sh?rev=1134073&r1=1134072&r2=1134073&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.1/scripts/hcat_server_install.sh
(original)
+++ incubator/hcatalog/branches/branch-0.1/scripts/hcat_server_install.sh Thu
Jun 9 20:51:49 2011
@@ -20,11 +20,12 @@
# HCatalog distribution tarball
function usage() {
- echo "Usage: $0 -r root -d dbroot -h hadoop_home"
+ echo "Usage: $0 -r root -d dbroot -h hadoop_home -p server_port"
echo " root is the directory where you like to install the HCatalog
server"
echo " /usr/local/hcat is suggested."
echo " dbroot is the directory where your mysql connector jar is
located."
echo " hadoop_home is the directory of your Hadoop installation."
+ echo " server_port is the listening port of the HCatalog server"
echo " All paths must be absolute"
}
@@ -38,6 +39,7 @@ fi
root="unknown"
dbroot="unknown"
hadoop_home="unknown"
+server_port="9080"
while [ "${1}x" != "x" ] ; do
if [ $1 == "-r" ] || [ $1 == "--root" ] ; then
@@ -52,6 +54,10 @@ while [ "${1}x" != "x" ] ; do
shift
hadoop_home=$1
shift
+ elif [ $1 == "-p" ] || [ $1 == "--port" ] ; then
+ shift
+ server_port=$1
+ shift
else
echo "Unknown option $1"
shift
@@ -130,6 +136,7 @@ ROOT=$root
DBROOT=$dbroot
USER=`whoami`
HADOOP_HOME=$hadoop_home
+export METASTORE_PORT=$server_port
!!
echo "Installation successful"
