Return-Path: 
 <hbase-commits-return-1004-apmail-hadoop-hbase-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-hbase-commits-archive@locus.apache.org
Received: (qmail 53032 invoked from network); 16 Jan 2009 19:29:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 Jan 2009 19:29:28 -0000
Received: (qmail 40310 invoked by uid 500); 16 Jan 2009 19:29:28 -0000
Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org
Received: (qmail 40297 invoked by uid 500); 16 Jan 2009 19:29:28 -0000
Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hbase-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:hbase-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:hbase-commits@hadoop.apache.org>
List-Id: <hbase-commits.hadoop.apache.org>
Reply-To: hbase-dev@hadoop.apache.org
Delivered-To: mailing list hbase-commits@hadoop.apache.org
Received: (qmail 40288 invoked by uid 99); 16 Jan 2009 19:29:28 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jan 2009 11:29:28 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jan 2009 19:29:26 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 77D3923888A0; Fri, 16 Jan 2009 11:29:05 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r735092 - /hadoop/hbase/trunk/build.xml
Date: Fri, 16 Jan 2009 19:29:05 -0000
To: hbase-commits@hadoop.apache.org
From: stack@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090116192905.77D3923888A0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: stack
Date: Fri Jan 16 11:29:05 2009
New Revision: 735092

URL: http://svn.apache.org/viewvc?rev=735092&view=rev
Log:
HBASE-1116 generated web.xml and svn don't play nice together

Modified:
    hadoop/hbase/trunk/build.xml

Modified: hadoop/hbase/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/build.xml?rev=735092&r1=735091&r2=735092&view=diff
==============================================================================
--- hadoop/hbase/trunk/build.xml (original)
+++ hadoop/hbase/trunk/build.xml Fri Jan 16 11:29:05 2009
@@ -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" />