svn commit: r1294228 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/rest/Main.java

[stack]

Author: stack
Date: Mon Feb 27 17:00:46 2012
New Revision: 1294228

URL: http://svn.apache.org/viewvc?rev=1294228&view=rev
Log:
HBASE-5483 Allow configurable host to bind to for starting REST server from 
commandline

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/Main.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1294228&r1=1294227&r2=1294228&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Mon Feb 27 17:00:46 2012
@@ -64,6 +64,8 @@ Release 0.92.1 - Unreleased
                setup (David S. Wang)
    HBASE-5325  Expose basic information about the master-status through
                jmx beans (Hitesh Shah)
+   HBASE-5483  Allow configurable host to bind to for starting REST
+               server from commandline (Dan Rosher)
 
   TESTS
    HBASE-5223  TestMetaReaderEditor is missing call to CatalogTracker.stop()

Modified: 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/Main.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/Main.java?rev=1294228&r1=1294227&r2=1294228&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/Main.java 
(original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/rest/Main.java 
Mon Feb 27 17:00:46 2012
@@ -39,7 +39,9 @@ import org.apache.hadoop.net.DNS;
 import java.util.List;
 import java.util.ArrayList;
 
+import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Server;
+import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.servlet.Context;
 import org.mortbay.jetty.servlet.ServletHolder;
 
@@ -129,9 +131,14 @@ public class Main implements Constants {
 
     // set up Jetty and run the embedded server
 
-    int port = servlet.getConfiguration().getInt("hbase.rest.port", 8080);
+    Server server = new Server();
+
+    Connector connector = new SelectChannelConnector();
+    connector.setPort(servlet.getConfiguration().getInt("hbase.rest.port", 
8080));
+    connector.setHost(servlet.getConfiguration().get("hbase.rest.host", 
"0.0.0.0"));
+
+    server.addConnector(connector);
 
-    Server server = new Server(port);
     server.setSendServerVersion(false);
     server.setSendDateHeader(false);
     server.setStopAtShutdown(true);