svn commit: r656794 - /hadoop/hbase/trunk/build.xml

[st...@apache.org]

Author: stack
Date: Thu May 15 11:53:12 2008
New Revision: 656794

URL: http://svn.apache.org/viewvc?rev=656794&view=rev
Log:
HBASE-593 build on hudson failing compiling jsp -- make it so we do jspc once per invocation

Modified:
    hadoop/hbase/trunk/build.xml

Modified: hadoop/hbase/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/build.xml?rev=656794&r1=656793&r2=656794&view=diff
==============================================================================
--- hadoop/hbase/trunk/build.xml (original)
+++ hadoop/hbase/trunk/build.xml Thu May 15 11:53:12 2008
@@ -67,6 +67,7 @@
   <property name="javadoc.link.java"
     value="http://java.sun.com/j2se/1.5/docs/api/"/>
   <property name="javadoc.packages" value="org.apache.hadoop.hbase.*"/>
+  <property name="jarfile" value="${build.dir}/${final.name}.jar" />
 
 
   <!--We need to have the hadoop jars ride in front of the hbase classes or we
@@ -135,7 +136,7 @@
      />
   </target>
 
-  <target name="compile" depends="init,jspc,javacc">
+  <target name="compile" depends="init,javacc,jspc">
    <!--Compile whats under src and generated java classes made from jsp-->
    <javac
     encoding="${build.encoding}"
@@ -155,7 +156,7 @@
         <include name="**/*.properties" />
       </fileset>
     </copy>
-    <jar jarfile="${build.dir}/${final.name}.jar"
+    <jar jarfile="${jarfile}"
         basedir="${build.classes}" >
       <fileset file="${basedir}/conf/hbase-default.xml"/>
       <zipfileset dir="${build.webapps}" prefix="webapps"/>
@@ -165,7 +166,10 @@
     </jar>
   </target>
 
-  <target name="jspc" >
+   <!--Conditionally generate the jsp java pages.
+       We do it once per ant invocation.  See hbase-593.
+     -->
+  <target name="jspc" unless="jspc.not.required">
     <path id="jspc.classpath">
       <fileset dir="${basedir}/lib/jetty-ext/">
         <include name="*jar" />
@@ -190,6 +194,8 @@
      package="org.apache.hadoop.hbase.generated.regionserver"
      webxml="${src.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" />
   </target>
 
   <!-- ================================================================== -->