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
This commit is contained in:
parent
1381d23645
commit
a536ff88b9
|
@ -174,7 +174,7 @@
|
||||||
<!--Conditionally generate the jsp java pages.
|
<!--Conditionally generate the jsp java pages.
|
||||||
We do it once per ant invocation. See hbase-593.
|
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">
|
<path id="jspc.classpath">
|
||||||
<fileset dir="${basedir}/lib/jetty-ext/">
|
<fileset dir="${basedir}/lib/jetty-ext/">
|
||||||
<include name="*jar" />
|
<include name="*jar" />
|
||||||
|
@ -191,13 +191,13 @@
|
||||||
uriroot="${src.webapps}/master"
|
uriroot="${src.webapps}/master"
|
||||||
outputdir="${generated.webapps.src}"
|
outputdir="${generated.webapps.src}"
|
||||||
package="org.apache.hadoop.hbase.generated.master"
|
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>
|
||||||
<jspcompiler
|
<jspcompiler
|
||||||
uriroot="${src.webapps}/regionserver"
|
uriroot="${src.webapps}/regionserver"
|
||||||
outputdir="${generated.webapps.src}"
|
outputdir="${generated.webapps.src}"
|
||||||
package="org.apache.hadoop.hbase.generated.regionserver"
|
package="org.apache.hadoop.hbase.generated.regionserver"
|
||||||
webxml="${src.webapps}/regionserver/WEB-INF/web.xml">
|
webxml="${build.webapps}/regionserver/WEB-INF/web.xml">
|
||||||
</jspcompiler>
|
</jspcompiler>
|
||||||
<property name="jspc.not.required" value="true" />
|
<property name="jspc.not.required" value="true" />
|
||||||
<echo message="Setting jspc.notRequired property. jsp pages generated once per ant session only" />
|
<echo message="Setting jspc.notRequired property. jsp pages generated once per ant session only" />
|
||||||
|
|
Loading…
Reference in New Issue