From a536ff88b91b1bb4582693775edf1dd24eb1d26c Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 16 Jan 2009 19:29:05 +0000
Subject: [PATCH] HBASE-1116 generated web.xml and svn don't play nice together

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@735092 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 6bf0eb12ffc..96d5c684394 100644
--- a/build.xml
+++ b/build.xml
@@ -174,7 +174,7 @@
    <!--Conditionally generate the jsp java pages.
        We do it once per ant invocation.  See hbase-593.
      -->
-  <target name="jspc" unless="jspc.not.required">
+  <target name="jspc" depends="init" unless="jspc.not.required">
     <path id="jspc.classpath">
       <fileset dir="${basedir}/lib/jetty-ext/">
         <include name="*jar" />
@@ -191,13 +191,13 @@
      uriroot="${src.webapps}/master"
      outputdir="${generated.webapps.src}"
      package="org.apache.hadoop.hbase.generated.master"
-     webxml="${src.webapps}/master/WEB-INF/web.xml">
+     webxml="${build.webapps}/master/WEB-INF/web.xml">
     </jspcompiler>
     <jspcompiler
      uriroot="${src.webapps}/regionserver"
      outputdir="${generated.webapps.src}"
      package="org.apache.hadoop.hbase.generated.regionserver"
-     webxml="${src.webapps}/regionserver/WEB-INF/web.xml">
+     webxml="${build.webapps}/regionserver/WEB-INF/web.xml">
     </jspcompiler>
     <property name="jspc.not.required" value="true" />
     <echo message="Setting jspc.notRequired property. jsp pages generated once per ant session only" />