svn commit: r912494 - in /hadoop/hive/branches/branch-0.5: CHANGES.txt build.xml conf/hive-default.xml

[na...@apache.org]

Author: namit
Date: Mon Feb 22 06:36:44 2010
New Revision: 912494

URL: http://svn.apache.org/viewvc?rev=912494&view=rev
Log:
HIVE-1183. hive.hwi.war.file vanished from hive-default.xml
(Zheng Shao via namit)

M    conf/hive-default.xml
M    CHANGES.txt
M    build.xml

Modified:
    hadoop/hive/branches/branch-0.5/CHANGES.txt
    hadoop/hive/branches/branch-0.5/build.xml
    hadoop/hive/branches/branch-0.5/conf/hive-default.xml

Modified: hadoop/hive/branches/branch-0.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.5/CHANGES.txt?rev=912494&r1=912493&r2=912494&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.5/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.5/CHANGES.txt Mon Feb 22 06:36:44 2010
@@ -483,6 +483,9 @@
     HIVE-1140. Fix incorrect ambiguous column reference error message.
     (Paul Yang via zshao)
 
+    HIVE-1183. hive.hwi.war.file vanished from hive-default.xml
+    (Zheng Shao via namit)
+
 Release 0.4.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/branches/branch-0.5/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.5/build.xml?rev=912494&r1=912493&r2=912494&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.5/build.xml (original)
+++ hadoop/hive/branches/branch-0.5/build.xml Mon Feb 22 06:36:44 2010
@@ -221,7 +221,11 @@
       <fileset dir="${hive.root}/bin/ext" excludes="**/.svn"/>
     </copy>
     <copy file="${hive.root}/bin/hive-config.sh" todir="${target.bin.dir}"/>
-    <copy file="${basedir}/conf/hive-default.xml" todir="${target.conf.dir}"/>
+    <copy file="${basedir}/conf/hive-default.xml" todir="${target.conf.dir}">
+      <filterset>
+        <filter token="VERSION" value="${version}"/>
+      </filterset>
+    </copy>
     <copy file="${basedir}/conf/hive-log4j.properties" todir="${target.conf.dir}"/>
     <!-- Create php thrift package -->
     <copy todir="${target.lib.dir}/php">
@@ -265,7 +269,7 @@
       <fileset file="${build.dir.hive}/common/hive-common-${version}.jar"/>
       <fileset file="${build.dir.hive}/ql/hive-exec-${version}.jar"/>
       <fileset file="${build.dir.hive}/metastore/hive-metastore-${version}.jar"/>
-      <fileset file="${build.dir.hive}/hive-hwi-${version}.war"/>
+      <fileset file="${build.dir.hive}/hwi/hive-hwi-${version}.war"/>
       <fileset file="${build.dir.hive}/contrib/hive-contrib-${version}.jar"/>
     </copy>
     <copy todir="${target.example.dir}/files" preservelastmodified="true" flatten="true">

Modified: hadoop/hive/branches/branch-0.5/conf/hive-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.5/conf/hive-default.xml?rev=912494&r1=912493&r2=912494&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.5/conf/hive-default.xml (original)
+++ hadoop/hive/branches/branch-0.5/conf/hive-default.xml Mon Feb 22 06:36:44 2010
@@ -342,6 +342,12 @@
 </property>
 
 <property>
+  <name>hive.hwi.war.file</name>
+  <value>lib/hive-hwi-@VERSION@.war</value>
+  <description>This sets the path to the HWI war file, relative to ${HIVE_HOME}. </description>
+</property>
+
+<property>
   <name>hive.hwi.listen.host</name>
   <value>0.0.0.0</value>
   <description>This is the host address the Hive Web Interface will listen on</description>