Index: conf/hive-default.xml
===================================================================
--- conf/hive-default.xml (revision 811825)
+++ conf/hive-default.xml (working copy)
@@ -299,8 +299,8 @@
hive.hwi.war.file
- ${HIVE_HOME}/lib/hive-hwi.war
- This is the WAR file with the jsp content for Hive Web Interface
+ lib/hive_hwi.war
+ path appended to HIVE_HOME to locate the HWI WAR file
Index: hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java
===================================================================
--- hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java (revision 811825)
+++ hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java (working copy)
@@ -57,12 +57,16 @@
String hwiWAR = conf.getVar(HiveConf.ConfVars.HIVEHWIWARFILE);
- if (! new File (hwiWAR).exists() ){
+ String hivehome = System.getenv().get("HIVE_HOME");
+ File hwiWARFile = new File(hivehome,hwiWAR);
+ if (! hwiWARFile.exists() ){
l4j.fatal("HWI WAR file not found at "+ hwiWAR );
+ System.exit(1);
}
+
webServer = ShimLoader.getJettyShims().startServer(listen, port);
- webServer.addWar(hwiWAR, "/hwi");
+ webServer.addWar(hwiWARFile.toString(), "/hwi");
/*The command line args may be used by multiple components. Rather by setting
* these as a system property we avoid having to specifically pass them