incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1172956 - in /incubator/hcatalog/trunk: CHANGES.txt build.xml conf/proto-hive-site.xml scripts/hcat_server_install.sh
Date Tue, 20 Sep 2011 03:02:23 GMT
Author: hashutosh
Date: Tue Sep 20 03:02:23 2011
New Revision: 1172956

URL: http://svn.apache.org/viewvc?rev=1172956&view=rev
Log:
HCATALOG-110: Fix source target (khorgath via hashutosh)

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/build.xml
    incubator/hcatalog/trunk/conf/proto-hive-site.xml
    incubator/hcatalog/trunk/scripts/hcat_server_install.sh

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1172956&r1=1172955&r2=1172956&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Tue Sep 20 03:02:23 2011
@@ -94,6 +94,8 @@ Release 0.2.0 - Unreleased
   OPTIMIZATIONS
 
   BUG FIXES
+    HCAT-110. Fix source target (khorgath via hashutosh)
+
     HCAT-53. HCatLoader, HCatStorer, HCatInputFormat, and HCatOutputFormat assume Hadoop

              running in secure mode (hashutosh)
  

Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1172956&r1=1172955&r2=1172956&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Tue Sep 20 03:02:23 2011
@@ -42,6 +42,7 @@
   <property name="package.dir"  location="${basedir}/src/packages"/>
   <property name="docs.src" value="${basedir}/src/docs"/>
   <property name="build.dir" value="${basedir}/build"/>
+  <property name="artifacts.dir" value="${basedir}/artifacts"/>
   <property name="build.classes" value="${build.dir}/classes" />
   <property name="build.docs" value="${build.dir}/docs" />
   <property name="build.javadoc" value="${build.docs}/api" />
@@ -353,11 +354,16 @@
   </target>
 
   <!-- Clean up children -->
-  <target name="clean" depends="hive.clean" description="Cleanup build artifacts">
+  <target name="clean-builds" depends="hive.clean" description="Cleanup build">
     <delete dir="${build.dir}" />
     <delete dir="${test.warehouse.dir}"/>
   </target>
  
+  <!-- Clean up children -->
+  <target name="clean" depends="clean-builds" description="Cleanup all build artifacts">
+    <delete dir="${artifacts.dir}" />
+  </target>
+ 
   <!--
   ================================================================================
   Docs Section
@@ -586,28 +592,47 @@
       </java>
     </target>
 
+    <target name="build-artifacts" depends="jar,docs" description="Build hcatalog artifacts
and copy them">
+        <mkdir dir="${artifacts.dir}"/>
+        <copy todir="${artifacts.dir}">
+          <fileset dir="build/hcatalog">
+            <include name="*.jar"/>
+          </fileset>
+        </copy>
+        <mkdir dir="${artifacts.dir}/docs"/>
+        <copy todir="${artifacts.dir}/docs">
+          <fileset dir="build/docs" />
+        </copy>
+    </target>
+
+    <target name="build-artifacts-and-clean" depends="build-artifacts,clean-builds" description="First
build artifacts, then clean up"/>
+
+
     <!-- ================================================================== -->
     <!-- Make release tarball                                               -->
     <!-- ================================================================== -->
-    <target name="source" description="Source distribution">
+    <target name="src-release" depends="build-artifacts-and-clean" description="Source
distribution">
         <mkdir dir="${build.dir}"/>
-        <tar compression="gzip" longfile="gnu" destfile="${build.dir}/${ant.project.name}-source-${hcatalog.version}.tar.gz">
-            <tarfileset dir="${basedir}" mode="644">
-                <exclude name="bin"/>
-                <exclude name="bin/*"/>
-                <exclude name="build"/>
-                <exclude name="build/*"/>
+        <tar compression="gzip" longfile="gnu" destfile="${build.dir}/${ant.project.name}-src-${hcatalog.version}.tar.gz">
+            <tarfileset dir="${basedir}" mode="644" prefix="${ant.project.name}-src-${hcatalog.version}">
                 <include name="conf/**"/>
+                <include name="hive/**"/>
                 <include name="ivy/**"/>
-                <include name="lib/*i*"/>
+                <exclude name="ivy/*.jar"/>
+                <include name="lib/**"/>
+                <include name="license/**"/>
                 <include name="src/**"/>
                 <include name="*.txt"/>
                 <include name="*.xml"/>
-                <include name="**"/>
+                <include name="KEYS"/>
             </tarfileset>
-            <tarfileset dir="" mode="755">
+            <tarfileset dir="" mode="755" prefix="${ant.project.name}-src-${hcatalog.version}">
+                <include name="scripts/**"/>
                 <include name="bin/**"/>
             </tarfileset>
+            <tarfileset dir="" mode="644" prefix="${ant.project.name}-src-${hcatalog.version}">
+                <include name="artifacts/**"/>
+            </tarfileset>
         </tar>
     </target> 
 
@@ -617,12 +642,15 @@
     <target name="tar" depends="package" description="Create release tarball">
         <tar compression="gzip" longfile="gnu" destfile="${build.dir}/${final.name}.tar.gz">
             <tarfileset dir="${build.dir}" mode="664">
-                <exclude name="${final.name}/bin/*" />
                 <include name="${final.name}/**" />
+                <exclude name="${final.name}/bin/*" />
+                <exclude name="${final.name}/sbin/*" />
+                <exclude name="${final.name}/share/hcatalog/scripts/*" />
             </tarfileset>
             <tarfileset dir="${build.dir}" mode="755">
                 <include name="${final.name}/bin/*" />
                 <include name="${final.name}/sbin/*" />
+                <include name="${final.name}/share/hcatalog/scripts/*" />
             </tarfileset>
         </tar>
     </target>

Modified: incubator/hcatalog/trunk/conf/proto-hive-site.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/conf/proto-hive-site.xml?rev=1172956&r1=1172955&r2=1172956&view=diff
==============================================================================
--- incubator/hcatalog/trunk/conf/proto-hive-site.xml (original)
+++ incubator/hcatalog/trunk/conf/proto-hive-site.xml Tue Sep 20 03:02:23 2011
@@ -57,7 +57,7 @@
 
 <property>
   <name>hive.metastore.sasl.enabled</name>
-    <value>true</value>
+    <value>false</value>
     <description>If true, the metastore thrift interface will be secured with SASL.
Clients must authenticate with Kerberos.</description>
 </property>
 

Modified: incubator/hcatalog/trunk/scripts/hcat_server_install.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/scripts/hcat_server_install.sh?rev=1172956&r1=1172955&r2=1172956&view=diff
==============================================================================
--- incubator/hcatalog/trunk/scripts/hcat_server_install.sh (original)
+++ incubator/hcatalog/trunk/scripts/hcat_server_install.sh Tue Sep 20 03:02:23 2011
@@ -29,22 +29,24 @@ function usage() {
     echo "    All paths must be absolute"
 }
 
-dir_check=`head -1 NOTICE.txt`
+dir_check=`head -1 share/doc/hcatalog/NOTICE.txt`
 if [ "${dir_check}" != "Apache HCatalog" ] ; then
     echo "This script must be run in the top level directory of your HCatalog" \
         "distribution."
     exit 1
 fi
 
-root="unknown"
+root=`pwd`
 dbroot="unknown"
 hadoop_home="unknown"
-server_port="9080"
+server_port="9933"
+alternate_root="n"
 
 while [ "${1}x" != "x" ] ; do
     if [ $1 == "-r" ] || [ $1 == "--root" ] ; then
         shift
         root=$1
+        alternate_root="y"
         shift
     elif [ $1 == "-d" ] || [ $1 == "--dbroot" ] ; then
         shift
@@ -65,7 +67,7 @@ while [ "${1}x" != "x" ] ; do
 
 done
 
-for var in $root $dbroot $hadoop_home ; do
+for var in $dbroot $hadoop_home ; do
     if [ $var == "unknown" ] ; then
         usage
         exit 1
@@ -105,33 +107,43 @@ if [ "${mysql_jar}x" == "x" ] ; then
 fi
 
 # Create the needed directories in root
-for dir in var conf var/log bin lib ; do
+#for dir in var conf var/log bin lib ; do
+for dir in var var/log bin etc libexec sbin share src; do
     if [ ! -d $root/$dir ] ; then
         mkdir $root/$dir
     fi
 done
 
 # Move files into the appropriate directories
-for dir in bin conf lib ; do
-    for file in ./$dir/* ; do
-        cp -R $file $root/$dir
+if [ "$alternate_root" == "y" ] ; then
+    echo Installing into [$root]
+    for dir in bin etc libexec sbin share src ; do
+        for file in ./$dir/* ; do
+            cp -R $file $root/$dir
+        done
     done
-done
+else
+    echo Using current directory [$root] as installation path and proceeding.
+fi
+
+#Create a softlink from distro conf dir to /etc/hcatalog location
+rm $root/share/hcatalog/conf
+ln -sf $root/etc/hcatalog $root/share/hcatalog/conf
 
 # Put the start and stop scripts into bin
-for file in hcat_server_start.sh hcat_server_stop.sh ; do
-	cp scripts/$file $root/bin
-done
+#for file in hcat_server_start.sh hcat_server_stop.sh ; do
+#	cp scripts/$file $root/bin
+#done
 
 # Move the proto-hive-site.xml to hive-site.xml
-cp $root/conf/proto-hive-site.xml $root/conf/hive-site.xml
+cp $root/etc/hcatalog/proto-hive-site.xml $root/etc/hcatalog/hive-site.xml
 
 # Set permissions on hive-site.xml to 700, since it will contain the password to the 
 # database
-chmod 700 $root/conf/hive-site.xml
+chmod 700 $root/etc/hcatalog/hive-site.xml
 
 # Write out an environment file so that the start file can use it later
-cat > $root/conf/hcat-env.sh <<!!
+cat > $root/etc/hcatalog/hcat-env.sh <<!!
 ROOT=$root
 DBROOT=$dbroot
 USER=`whoami`
@@ -143,4 +155,4 @@ echo "Installation successful"
 
 
 
-    
+ 



Mime
View raw message