HBASE-2586 Move hbase webapps to a hbase-webapps dir

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@948298 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -357,6 +357,8 @@ Release 0.21.0 - Unreleased
                (Todd Lipcon via Stack)
    HBASE-2590  Failed parse of branch element in saveVersion.sh
                (Benoît Sigoure via Stack)
+   HBASE-2586  Move hbase webapps to a hbase-webapps dir (Todd Lipcon via
+               Andrew Purtell)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

pom.xml

@@ -268,7 +268,7 @@
         <directory>src/main/resources</directory>
       </resource>
       <resource>
-        <directory>src/main/webapps</directory>
+        <directory>src/main/hbase-webapps</directory>
         <includes>
           <include>*/.gif</include>
           <include>*/.css</include>
@@ -359,14 +359,14 @@
             <configuration>
               <tasks>
                 <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath"/>
-                <jspcompiler uriroot="${basedir}/src/main/resources/webapps/master"
+                <jspcompiler uriroot="${basedir}/src/main/resources/hbase-webapps/master"
                              outputdir="${project.build.directory}/jspc"
                              package="org.apache.hadoop.hbase.generated.master"
-                             webxml="${basedir}/src/main/resources/webapps/master/WEB-INF/web.xml"/>
-                <jspcompiler uriroot="${basedir}/src/main/resources/webapps/regionserver"
+                             webxml="${basedir}/src/main/resources/hbase-webapps/master/WEB-INF/web.xml"/>
+                <jspcompiler uriroot="${basedir}/src/main/resources/hbase-webapps/regionserver"
                              outputdir="${project.build.directory}/jspc"
                              package="org.apache.hadoop.hbase.generated.regionserver"
-                             webxml="${basedir}/src/main/resources/webapps/regionserver/WEB-INF/web.xml"/>
+                             webxml="${basedir}/src/main/resources/hbase-webapps/regionserver/WEB-INF/web.xml"/>
               </tasks>
             </configuration>
             <goals>

src/assembly/bin.xml

@@ -34,8 +34,8 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>target/classes/webapps</directory>
-      <outputDirectory>webapps</outputDirectory>
+      <directory>target/classes/hbase-webapps</directory>
+      <outputDirectory>hbase-webapps</outputDirectory>
       <excludes>
         <exclude>**/*.jsp</exclude>
       </excludes>

src/main/java/org/apache/hadoop/hbase/util/InfoServer.java

@@ -34,13 +34,13 @@ import java.util.Map;
  * is to serve up status information for the server.
  * There are three contexts:
  *   "/stacks/" -> points to stack trace
- *   "/static/" -> points to common static files (src/webapps/static)
- *   "/" -> the jsp server code from (src/webapps/<name>)
+ *   "/static/" -> points to common static files (src/hbase-webapps/static)
+ *   "/" -> the jsp server code from (src/hbase-webapps/<name>)
  */
 public class InfoServer extends HttpServer {
   /**
    * Create a status server on the given port.
-   * The jsp scripts are taken from src/webapps/<code>name<code>.
+   * The jsp scripts are taken from src/hbase-webapps/<code>name<code>.
    * @param name The name of the server
    * @param bindAddress address to bind to
    * @param port The port to use on the server
@@ -103,7 +103,7 @@ public class InfoServer extends HttpServer {
   throws IOException {
     URL url = InfoServer.class.getClassLoader().getResource(path);
     if (url == null)
-      throw new IOException("webapps not found in CLASSPATH: " + path);
+      throw new IOException("hbase-webapps not found in CLASSPATH: " + path);
     return url.toString();
   }
 
@@ -116,7 +116,7 @@ public class InfoServer extends HttpServer {
   public static String getWebAppDir(final String webappName)
   throws IOException {
     String webappDir;
-    webappDir = getWebAppsPath("webapps/" + webappName);
+    webappDir = getWebAppsPath("hbase-webapps/" + webappName);
     return webappDir;
   }
 }