浏览代码

Stop using deprecated 'jspc' ant task and instead call jasper directly. Also rename webapp files to align with package name.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@376366 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 19 年之前
父节点
当前提交
05c6226a0d
共有 3 个文件被更改,包括 9 次插入7 次删除
  1. 9 7
      build.xml
  2. 0 0
      src/webapps/mapred/jobdetails.jsp
  3. 0 0
      src/webapps/mapred/jobtracker.jsp

+ 9 - 7
build.xml

@@ -96,16 +96,18 @@
   <!-- ====================================================== -->
   <!-- ====================================================== -->
   <!-- Compile the Java files                                 -->
   <!-- Compile the Java files                                 -->
   <!-- ====================================================== -->
   <!-- ====================================================== -->
+  <taskdef classname="org.apache.jasper.JspC" name="jsp-compile" >
+      <classpath refid="classpath"/>
+  </taskdef>
+
   <target name="compile" depends="init">
   <target name="compile" depends="init">
-    <jspc 
-     srcdir="${src.webapps}"
-     includes="**/*.jsp"
-     destdir="${build.src}"
+
+    <jsp-compile
+     uriroot="${src.webapps}/mapred"
+     outputdir="${build.src}"
      package="org.apache.hadoop.mapred"
      package="org.apache.hadoop.mapred"
-     uriroot="${src.webapps}/jobtracker"
      webxml="${build.webapps}/WEB-INF/web.xml">
      webxml="${build.webapps}/WEB-INF/web.xml">
-      <classpath refid="classpath"/>
-    </jspc>
+    </jsp-compile>
 
 
     <javac 
     <javac 
      encoding="${build.encoding}" 
      encoding="${build.encoding}" 

+ 0 - 0
src/webapps/jobtracker/jobdetails.jsp → src/webapps/mapred/jobdetails.jsp


+ 0 - 0
src/webapps/jobtracker/jobtracker.jsp → src/webapps/mapred/jobtracker.jsp