HADOOP-4094. Hive now has hive-default.xml and hive-site.xml similar

to core hadoop. (Prasad Chakka via dhruba)



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

CHANGES.txt

@@ -531,6 +531,9 @@ Trunk (unreleased changes)
     HADOOP-4133. Log files generated by Hive should reside in the 
     build directory. (Prasad Chakka via dhruba)
 
+    HADOOP-4094. Hive now has hive-default.xml and hive-site.xml similar
+    to core hadoop. (Prasad Chakka via dhruba)
+
 Release 0.18.1 - Unreleased
 
   IMPROVEMENTS

src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

@@ -172,7 +172,13 @@ public class HiveConf extends Configuration {
     if(hconfurl == null) {
       l4j.warn("Unable to locate default hive configuration");
     } else {
-      addResource("hive-default.xml");
+      addResource(hconfurl);
+    }
+    URL hsiteurl = getClassLoader().getResource("hive-site.xml");
+    if(hsiteurl == null) {
+      l4j.warn("Unable to locate hive site configuration");
+    } else {
+      addResource(hsiteurl);
     }
 
     // if hadoop configuration files are already in our path - then define