Author: apurtell
Date: Sun Oct 11 08:50:54 2009
New Revision: 824041
URL: http://svn.apache.org/viewvc?rev=824041&view=rev
Log:
HBABSE-1889 ClassNotFoundException on trunk for REST
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/bin/hbase
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java
hadoop/hbase/trunk/src/webapps/rest/META-INF/MANIFEST.MF
hadoop/hbase/trunk/src/webapps/rest/WEB-INF/web.xml
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=824041&r1=824040&r2=824041&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Sun Oct 11 08:50:54 2009
@@ -63,6 +63,7 @@
Filters client-side
HBASE-1890 hbase-1506 where assignment is done at regionserver doesn't
work
+ HBASE-1889 ClassNotFoundException on trunk for REST
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hadoop/hbase/trunk/bin/hbase
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hbase?rev=824041&r1=824040&r2=824041&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hbase (original)
+++ hadoop/hbase/trunk/bin/hbase Sun Oct 11 08:50:54 2009
@@ -58,7 +58,6 @@
echo " shell run the HBase shell"
echo " master run an HBase HMaster node"
echo " regionserver run an HBase HRegionServer node"
- echo " rest run an HBase REST server"
echo " thrift run an HBase Thrift server"
echo " zookeeper run a Zookeeper server"
echo " migrate upgrade an hbase.rootdir"
@@ -192,8 +191,6 @@
elif [ "$COMMAND" = "regionserver" ] ; then
CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer'
HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
-elif [ "$COMMAND" = "rest" ] ; then
- CLASS='org.apache.hadoop.hbase.rest.Dispatcher'
elif [ "$COMMAND" = "thrift" ] ; then
CLASS='org.apache.hadoop.hbase.thrift.ThriftServer'
HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"
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=824041&r1=824040&r2=824041&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
Sun Oct 11 08:50:54 2009
@@ -50,19 +50,7 @@
public InfoServer(String name, String bindAddress, int port, boolean
findPort)
throws IOException {
super(name, bindAddress, port, findPort);
-
- HandlerCollection handlers =
- new ContextHandlerCollection();
-
- if (name.equals("master")) {
- // Put up the rest webapp.
- WebAppContext wac = new WebAppContext();
- wac.setContextPath("/api");
- wac.setWar(getWebAppDir("rest"));
-
- handlers.addHandler(wac);
- }
- webServer.addHandler(handlers);
+ webServer.addHandler(new ContextHandlerCollection());
}
protected void addDefaultApps(ContextHandlerCollection parent, String appDir)
Modified: hadoop/hbase/trunk/src/webapps/rest/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/webapps/rest/META-INF/MANIFEST.MF?rev=824041&r1=824040&r2=824041&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/webapps/rest/META-INF/MANIFEST.MF (original)
+++ hadoop/hbase/trunk/src/webapps/rest/META-INF/MANIFEST.MF Sun Oct 11
08:50:54 2009
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
-Manifest-Version: 1.0
-Class-Path:
-
-Manifest-Version: 1.0
-Class-Path:
-
Modified: hadoop/hbase/trunk/src/webapps/rest/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/webapps/rest/WEB-INF/web.xml?rev=824041&r1=824040&r2=824041&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/webapps/rest/WEB-INF/web.xml (original)
+++ hadoop/hbase/trunk/src/webapps/rest/WEB-INF/web.xml Sun Oct 11 08:50:54 2009
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
- <display-name>jsonrest</display-name>
- <servlet>
- <description>Hbase JSONREST Interface</description>
- <display-name>api</display-name>
- <servlet-name>api</servlet-name>
- <servlet-class>org.apache.hadoop.hbase.rest.Dispatcher</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>api</servlet-name>
- <url-pattern>/api/*</url-pattern>
- </servlet-mapping>
-</web-app>
