Changeset 6b53a4f for apps


Ignore:
Timestamp:
Sep 16, 2018 11:29:03 AM (22 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
b74abbe4
Parents:
4ead982
Message:

Build: Fix hang with Tomcat 8.5.33+ (ticket #2307)

Location:
apps
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/build.xml

    r4ead982 r6b53a4f  
    306306        <mkdir dir="../jsp/WEB-INF/" />
    307307        <mkdir dir="../jsp/WEB-INF/classes" />
    308         <!-- there are various jspc ant tasks, but they all seem a bit flakey -->
    309         <java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
     308        <!-- See apps/routerconsole/java/build.xml for important JspC build documentation -->
     309        <java classname="net.i2p.servlet.util.JspC" fork="true" failonerror="true">
    310310            <classpath>
    311311                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
  • apps/routerconsole/java/build.xml

    r4ead982 r6b53a4f  
    354354        <mkdir dir="../jsp/WEB-INF/classes" />
    355355
    356         <!-- there are various jspc ant tasks, but they all seem a bit flakey -->
     356        <!-- There are various jspc ant tasks, but they all seem a bit flakey.
     357             Warning - jspC will fail on unknown options,
     358             check oldest libtomcat8-java distro package version we use.
     359             Jessie has 8.0.14; xenial has 8.0.32; we bundle for precise/trusty.
     360             Add below to get supported options:
     361                <arg value="-help" />
     362          -->
    357363        <!--
    358364           **     Usage: jspc <options> <jsp files>
     
    382388           **         -xpoweredBy        Add X-Powered-By response header
    383389           **         -trimSpaces        Trim spaces in template text between actions, directives
     390           **     Following as of ?.?.??:
     391           **         -javaEncoding <enc> Set the encoding charset for Java classes (default UTF-8)
     392           **         -source <version>   Set the -source argument to the compiler (default 1.7)
     393           **         -target <version>   Set the -target argument to the compiler (default 1.7)
     394           **     Following as of 8.5.33:
     395           **         -threadCount <count>  Number of threads to use for compilation.
     396           **                               (default one per core)
     397           **                               ("2.0C" means two threads per core)
    384398        -->
    385         <java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
     399        <!--
     400           **  Simply call org.apache.jasper.JspC, then exit.
     401           **
     402           **  As of Tomcat 8.5.33, forking their JspC won't complete,
     403           **  because the JspC compilation is now threaded and the thread pool workers aren't daemons.
     404           **  May be fixed in a future release, maybe not, but we don't know what version distros may have.
     405           **
     406           **  https://tomcat.apache.org/tomcat-8.5-doc/changelog.html
     407           **  https://bz.apache.org/bugzilla/show_bug.cgi?id=53492
     408           **
     409           **  We could set fork=false in build.xml, but then the paths are all wrong.
     410        -->
     411        <java classname="net.i2p.servlet.util.JspC" fork="true" failonerror="true">
    386412            <!-- this prevents tomcat from complaining in debian builds -->
    387413            <jvmarg value="-Dtomcat.util.scan.StandardJarScanFilter.jarsToSkip=commons-collections.jar,junit.jar,junit4.jar" />
  • apps/susidns/src/build.xml

    r4ead982 r6b53a4f  
    3131                <pathelement location="${lib}/jasper-runtime.jar" />
    3232                <pathelement location="${lib}/jetty-util.jar" />
     33                <pathelement location="${lib}/jetty-i2p.jar" />
    3334                <pathelement location="${ant.home}/lib/ant.jar" />
    3435                <pathelement location="../../../core/java/build/i2p.jar" />
     
    7071        <mkdir dir="${tmp}" />
    7172        <echo message="Ignore any warning about /WEB-INF/web.xml not found" />
    72         <java classname="org.apache.jasper.JspC" fork="true" classpathref="cp" failonerror="true">
     73        <!-- See apps/routerconsole/java/build.xml for important JspC build documentation -->
     74        <java classname="net.i2p.servlet.util.JspC" fork="true" classpathref="cp" failonerror="true">
    7375            <arg value="-d" />
    7476            <arg value="${tmp}" />
Note: See TracChangeset for help on using the changeset viewer.