From bdcc7f126a9ee4ee19ad3554ca2249734063fdd1 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Thu, 10 Jun 2010 23:21:45 +0000
Subject: [PATCH] HBASE-2703 ui not working in distributed context

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@953495 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                   |   1 +
 bin/hbase                                     |  24 +++----
 pom.xml                                       |  67 ++++++++++--------
 src/assembly/bin.xml                          |   5 +-
 .../hbase-webapps/static/hbase_logo_med.gif   | Bin 0 -> 3592 bytes
 5 files changed, 49 insertions(+), 48 deletions(-)
 create mode 100644 src/main/resources/hbase-webapps/static/hbase_logo_med.gif

diff --git a/CHANGES.txt b/CHANGES.txt
index d1654658b26..d21cfff5410 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -380,6 +380,7 @@ Release 0.21.0 - Unreleased
    HBASE-2616  TestHRegion.testWritesWhileGetting flaky on trunk
    HBASE-2684  TestMasterWrongRS flaky in trunk
    HBASE-2691  LeaseStillHeldException totally ignored by RS, wrongly named
+   HBASE-2703  ui not working in distributed context
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/bin/hbase b/bin/hbase
index b5293b6b17d..0882d3ac210 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -136,19 +136,6 @@ add_maven_test_classes_to_classpath() {
   fi
 }
 
-add_maven_target_dir_to_classpath() {
-  # I never seem to *have* such a dir. -tlipcon
-  HBASE_VER=`grep '<version>' $HBASE_HOME/pom.xml | head -1 | sed 's/.*<version>\(.*\)<\/version>/\1/'`
-  MAVEN_TARGET_DIR=$HBASE_HOME/target/hbase-$HBASE_VER-bin/hbase-$HBASE_VER
-  if [ -d "$MAVEN_TARGET_DIR" ]; then
-    for f in $MAVEN_TARGET_DIR/*.jar $MAVEN_TARGET_DIR/lib/*.jar; do
-      if [ -f $f ]; then
-        CLASSPATH=${CLASSPATH}:$f;
-      fi
-    done
-  fi
-}
-
 # Add maven target directory
 if $in_sources_dir; then
   add_maven_deps_to_classpath
@@ -158,11 +145,18 @@ fi
 
 # For releases, add hbase & webapps to CLASSPATH
 # Webapps must come first else it messes up Jetty
-if [ -d "$HBASE_HOME/webapps" ]; then
+if [ -d "$HBASE_HOME/hbase-webapps" ]; then
   CLASSPATH=${CLASSPATH}:$HBASE_HOME
 fi
+if [ -d "$HBASE_HOME/target/hbase-webapps" ]; then
+  CLASSPATH="${CLASSPATH}:${HBASE_HOME}/target"
+fi
 for f in $HBASE_HOME/hbase*.jar; do
-  if [ -f $f ]; then
+  if [[ $f = *sources.jar ]]
+  then
+    : # Skip sources.jar
+  elif [ -f $f ]
+  then
     CLASSPATH=${CLASSPATH}:$f;
   fi
 done
diff --git a/pom.xml b/pom.xml
index 03c6ec84209..87b5bd49fa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,13 +7,11 @@
   <packaging>jar</packaging>
   <version>0.21.0-SNAPSHOT</version>
   <name>HBase</name>
-  <!-- START SNIPPET: description -->
   <description>
   HBase is the &amp;lt;a href="http://hadoop.apache.org"&amp;rt;Hadoop&lt;/a&amp;rt; database. Use it when you need random, realtime read/write access to your Big Data.
     This project's goal is the hosting of very large tables -- billions of rows X millions of columns -- atop clusters
     of commodity hardware.
   </description>
-  <!-- END SNIPPET: description -->
   <url>http://hbase.apache.org</url>
 
   <licenses>
@@ -286,15 +284,15 @@
 
     <resources>
       <resource>
-        <directory>src/main/resources</directory>
+        <directory>src/main/resources/</directory>
+        <includes>
+          <include>hbase-default.xml</include>
+        </includes>
       </resource>
       <resource>
-        <directory>src/main/hbase-webapps</directory>
+          <directory>${project.build.directory}</directory>
         <includes>
-          <include>*/.gif</include>
-          <include>*/.css</include>
-          <include>*/.html</include>
-          <include>*/.xml</include>
+            <include>hbase-webapps/**</include>
         </includes>
       </resource>
     </resources>
@@ -375,32 +373,43 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>JSPC</id>
+            <id>generate</id>
             <phase>generate-sources</phase>
             <configuration>
               <tasks>
+                <property name="build.webapps"
+                  location="${project.build.directory}/hbase-webapps" />
+                <property name="src.webapps"
+                  location="${basedir}/src/main/resources/hbase-webapps" />
+                <property name="generated.sources"
+                  location="${project.build.directory}/generated-sources" />
+
+                <mkdir dir="${build.webapps}"/>
+                <copy todir="${build.webapps}">
+                  <fileset dir="${src.webapps}">
+                    <exclude name="**/*.jsp" />
+                    <exclude name="**/.*" />
+                    <exclude name="**/*~" />
+                  </fileset>
+                </copy>
+
+                <!--The compile.classpath is passed in by maven-->
                 <taskdef classname="org.apache.jasper.JspC" name="jspcompiler" classpathref="maven.compile.classpath"/>
-                <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/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/hbase-webapps/regionserver/WEB-INF/web.xml"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>package-info</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <tasks>
+
+                <mkdir dir="${build.webapps}/master/WEB-INF"/>
+                <jspcompiler uriroot="${src.webapps}/master"
+                    outputdir="${generated.sources}"
+                  package="org.apache.hadoop.hbase.generated.master"
+                  webxml="${build.webapps}/master/WEB-INF/web.xml"/>
+
+                <mkdir dir="${build.webapps}/regionserver/WEB-INF"/>
+                <jspcompiler uriroot="${src.webapps}/regionserver"
+                    outputdir="${generated.sources}"
+                  package="org.apache.hadoop.hbase.generated.regionserver"
+                  webxml="${build.webapps}/regionserver/WEB-INF/web.xml"/>
+
                 <exec executable="sh">
-                  <arg line="${basedir}/src/saveVersion.sh ${project.version} ${project.build.directory}/generated-sources"/>
+                    <arg line="${basedir}/src/saveVersion.sh ${project.version} ${generated.sources}"/>
                 </exec>
               </tasks>
             </configuration>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 95227c9858b..4705d2f9a8b 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -34,11 +34,8 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>target/classes/hbase-webapps</directory>
+      <directory>target/hbase-webapps</directory>
       <outputDirectory>hbase-webapps</outputDirectory>
-      <excludes>
-        <exclude>**/*.jsp</exclude>
-      </excludes>
     </fileSet>
     <fileSet>
       <directory>target/site</directory>
diff --git a/src/main/resources/hbase-webapps/static/hbase_logo_med.gif b/src/main/resources/hbase-webapps/static/hbase_logo_med.gif
new file mode 100644
index 0000000000000000000000000000000000000000..36d3e3c9127d8e203ce975785f332b904d6d29d3
GIT binary patch
literal 3592
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
Ok|H^hBso_B0RTHpJCq{;

literal 0
HcmV?d00001