Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBABSE-1889 ClassNotFoundException on trunk for REST 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@824041 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Kyle Purtell 2009-10-11 08:50:54 +00:00
parent 2bf23f56cd
commit 55afbc4675
5 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -63,6 +63,7 @@ Release 0.21.0 - Unreleased
Filters client-side Filters client-side
HBASE-1890 hbase-1506 where assignment is done at regionserver doesn't HBASE-1890 hbase-1506 where assignment is done at regionserver doesn't
work work
HBASE-1889 ClassNotFoundException on trunk for REST
IMPROVEMENTS IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable HBASE-1760 Cleanup TODOs in HTable

3
bin/hbase
View File

@ -58,7 +58,6 @@ if [ $# = 0 ]; then
echo " shell run the HBase shell" echo " shell run the HBase shell"
echo " master run an HBase HMaster node" echo " master run an HBase HMaster node"
echo " regionserver run an HBase HRegionServer node" echo " regionserver run an HBase HRegionServer node"
echo " rest run an HBase REST server"
echo " thrift run an HBase Thrift server" echo " thrift run an HBase Thrift server"
echo " zookeeper run a Zookeeper server" echo " zookeeper run a Zookeeper server"
echo " migrate upgrade an hbase.rootdir" echo " migrate upgrade an hbase.rootdir"
@ -192,8 +191,6 @@ elif [ "$COMMAND" = "master" ] ; then
elif [ "$COMMAND" = "regionserver" ] ; then elif [ "$COMMAND" = "regionserver" ] ; then
CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer' CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer'
HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS" HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
elif [ "$COMMAND" = "rest" ] ; then
CLASS='org.apache.hadoop.hbase.rest.Dispatcher'
elif [ "$COMMAND" = "thrift" ] ; then elif [ "$COMMAND" = "thrift" ] ; then
CLASS='org.apache.hadoop.hbase.thrift.ThriftServer' CLASS='org.apache.hadoop.hbase.thrift.ThriftServer'
HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS" HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"

14
src/java/org/apache/hadoop/hbase/util/InfoServer.java
View File

@ -50,19 +50,7 @@ public class InfoServer extends HttpServer {
public InfoServer(String name, String bindAddress, int port, boolean findPort) public InfoServer(String name, String bindAddress, int port, boolean findPort)
throws IOException { throws IOException {
super(name, bindAddress, port, findPort); super(name, bindAddress, port, findPort);
webServer.addHandler(new ContextHandlerCollection());
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);
} }
protected void addDefaultApps(ContextHandlerCollection parent, String appDir) protected void addDefaultApps(ContextHandlerCollection parent, String appDir)

9
src/webapps/rest/META-INF/MANIFEST.MF
View File

@ -1,9 +0,0 @@
Manifest-Version: 1.0
Class-Path:
Manifest-Version: 1.0
Class-Path:
Manifest-Version: 1.0
Class-Path:

14
src/webapps/rest/WEB-INF/web.xml
View File

@ -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>