Ignore:
Timestamp:
Jun 10, 2014 12:17:19 AM (6 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
1bf8fd92
Parents:
884b285
Message:

Tomcat: Bundle a stripped tomcat-coyote.jar with the utils
required to precompile jsps with tags (SusiDNS and Bote).
As of 6.0.39, these utils are required but they are not bundled
in the Tomcat deployer package, the main package is required.
This checkin has only the classes required from the jar.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r884b285 r4dd8a64  
    1111    <property name="javac.version" value="1.6" />
    1212    <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
     13    <property name="tomcat.ver" value="6.0.41" />
     14    <property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" />
     15    <property name="tomcat2.lib.small" value="apache-tomcat/lib" />
    1316
    1417    <target name="all" depends="build" />
     
    153156    </target>
    154157
     158    <!-- Tomcat util jar.
     159         As of Tomcat 6.0.39, the deployer does not contain some classes that are required
     160         to precompile jsps with tags (SusiDNS and i2p-bote).
     161         These classes are in the main Tomcat package, in lib/tomcat-coyote.jar.
     162         As the jar is 800 KB and we only need 12 KB of that, we extract the required classes
     163         to a new jar, created and checked in using this target.
     164         Apparently this is only required for precompilation of jsps, so this is put in
     165         with the JspC compiler jasper-runtime.jar below.
     166     -->
     167    <target name="buildTomcatUtilJar" >
     168        <!-- take only what we need from the tomcat-coyote jar -->
     169        <jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
     170            <zipfileset src="${tomcat2.lib}/tomcat-coyote.jar"
     171             includes="org/apache/tomcat/util/descriptor/* org/apache/tomcat/util/res/*" />
     172        </jar>
     173    </target>
     174
    155175    <!-- Tomcat.
    156176         The glassfish jars bundled in Jetty 6 are way too old.
     
    171191        <jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
    172192            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
     193            <zipfileset src="${tomcat2.lib.small}/tomcat-coyote-util.jar" />
    173194        </jar>
    174195        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
Note: See TracChangeset for help on using the changeset viewer.