svn commit: r709350 - /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java

[st...@apache.org]

Author: stack
Date: Thu Oct 30 22:12:18 2008
New Revision: 709350

URL: http://svn.apache.org/viewvc?rev=709350&view=rev
Log:
HBASE-785   Remove InfoServer, use HADOOP-3824 StatusHttpServer; fix broken build

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

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=709350&r1=709349&r2=709350&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 Thu Oct 30 22:12:18 2008
@@ -56,10 +56,6 @@
       logContext.addHandler(new ResourceHandler());
       webServer.addContext(logContext);
     }
-    if (name.equals("master")) {
-      // Put up the rest webapp.
-      this.webServer.addWebApplication("/api", getWebAppDir("rest"));
-    }
   }
   
   /**
@@ -67,10 +63,25 @@
   * @param path Path to find.
   * @return the pathname as a URL
   */
-  private static String getWebAppsPath(final String path) throws IOException {
+  protected String getWebAppsPath() throws IOException {
+    // Hack: webapps is not a unique enough element to find in CLASSPATH
+    // We'll more than likely find the hadoop webapps dir.  So, instead
+    // look for the 'master' webapp in the webapps subdir.  That should
+    // get us the hbase context.  Presumption is that place where the
+    // master webapp resides is where we want this InfoServer picking up
+    // web applications.
+    final String master = "master";
+    String p = getWebAppDir(master);
+    // Now strip master + the separator off the end of our context
+    return p.substring(0, p.length() - (master.length() + 1/* The separator*/));
+  }
+
+  private static String getWebAppsPath(final String path)
+  throws IOException {
     URL url = InfoServer.class.getClassLoader().getResource(path);
     if (url == null) 
       throw new IOException("webapps not found in CLASSPATH: " + path); 
+    System.out.println("URL " + url);
     return url.toString();
   }
 
@@ -80,7 +91,8 @@
    * @return path
    * @throws IOException
    */
-  public static String getWebAppDir(final String webappName) throws IOException {
+  public static String getWebAppDir(final String webappName)
+  throws IOException {
     String webappDir = null;
     try {
       webappDir = getWebAppsPath("webapps" + File.separator + webappName);
@@ -90,5 +102,4 @@
     }
     return webappDir;
   }
-  
 }