[jira] Commented: (HBASE-1116) generated web.xml and svn don't play nice together

["stack (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/HBASE-1116?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12664637#action_12664637 ] 

stack commented on HBASE-1116:
------------------------------

Testing below (previous patch only did half the job):

{code}
Index: build.xml
===================================================================
--- build.xml   (revision 735090)
+++ build.xml   (working copy)
@@ -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" />
{code}

> generated web.xml and svn don't play nice together
> --------------------------------------------------
>
>                 Key: HBASE-1116
>                 URL: https://issues.apache.org/jira/browse/HBASE-1116
>             Project: Hadoop HBase
>          Issue Type: Bug
>            Reporter: stack
>             Fix For: 0.19.0
>
>
> {code}
> Index: web.xml
> ===================================================================
> --- web.xml     (revision 731999)
> +++ web.xml     (working copy)
> @@ -15,13 +15,13 @@
>      </servlet>
>      <servlet>
> -        <servlet-name>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-name>
> -        <servlet-class>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-class>
> +        <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
> +        <servlet-class>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-class>
>      </servlet>
>      <servlet>
> -        <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
> -        <servlet-class>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-class>
> +        <servlet-name>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-name>
> +        <servlet-class>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-class>
>      </servlet>
>      <servlet-mapping>
> @@ -30,13 +30,13 @@
>      </servlet-mapping>
>      <servlet-mapping>
> -        <servlet-name>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-name>
> -        <url-pattern>/regionhistorian.jsp</url-pattern>
> +        <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
> +        <url-pattern>/table.jsp</url-pattern>
>      </servlet-mapping>
>      <servlet-mapping>
> -        <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
> -        <url-pattern>/table.jsp</url-pattern>
> +        <servlet-name>org.apache.hadoop.hbase.generated.master.regionhistorian_jsp</servlet-name>
> +        <url-pattern>/regionhistorian.jsp</url-pattern>
>      </servlet-mapping>
>  </web-app>
>    - Andy
> {code}

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.