svn commit: r710110 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/util/InfoServer.java

[st...@apache.org]

Author: stack
Date: Mon Nov  3 09:37:20 2008
New Revision: 710110

URL: http://svn.apache.org/viewvc?rev=710110&view=rev
Log:
HBASE-979 REST web app is not started automatically

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=710110&r1=710109&r2=710110&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Nov  3 09:37:20 2008
@@ -59,6 +59,7 @@
    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

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java?rev=710110&r1=710109&r2=710110&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java Mon Nov  3 09:37:20 2008
@@ -34,7 +34,7 @@
  *   "/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 @@
       logContext.addHandler(new ResourceHandler());
       webServer.addContext(logContext);
     }
+    
+    if (name.equals("master")) {
+      // Put up the rest webapp.
+      webServer.addWebApplication("/api", getWebAppDir("rest"));
+    }
   }
   
   /**