From f806f7fdea7638f197fd0d2dfb785ea045dc5057 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Mon, 3 Nov 2008 17:37:20 +0000
Subject: [PATCH] HBASE-979 REST web app is not started automatically

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@710110 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                           | 1 +
 src/java/org/apache/hadoop/hbase/util/InfoServer.java | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 30792f38895..c1412b56f6a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -59,6 +59,7 @@ Release 0.19.0 - Unreleased
    HBASE-969   Won't when storefile > 2G.
    HBASE-976   HADOOP 0.19.0 RC0 is broke; replace with HEAD of branch-0.19
    HBASE-977   Arcane HStoreKey comparator bug
+   HBASE-979   REST web app is not started automatically
 
   IMPROVEMENTS
    HBASE-901   Add a limit to key length, check key and value length on client side
diff --git a/src/java/org/apache/hadoop/hbase/util/InfoServer.java b/src/java/org/apache/hadoop/hbase/util/InfoServer.java
index 82ff90e431c..dfe65d83615 100644
--- a/src/java/org/apache/hadoop/hbase/util/InfoServer.java
+++ b/src/java/org/apache/hadoop/hbase/util/InfoServer.java
@@ -34,7 +34,7 @@ import org.mortbay.http.handler.ResourceHandler;
  *   "/static/" -> points to common static files (src/webapps/static)
  *   "/" -> the jsp server code from (src/webapps/<name>)
  */
-public class InfoServer extends HttpServer{  
+public class InfoServer extends HttpServer {  
   /**
    * Create a status server on the given port.
    * The jsp scripts are taken from src/webapps/<code>name<code>.
@@ -56,6 +56,11 @@ public class InfoServer extends HttpServer{
       logContext.addHandler(new ResourceHandler());
       webServer.addContext(logContext);
     }
+    
+    if (name.equals("master")) {
+      // Put up the rest webapp.
+      webServer.addWebApplication("/api", getWebAppDir("rest"));
+    }
   }
   
   /**