Changeset 1a28a2a for apps/jetty


Ignore:
Timestamp:
Jan 26, 2017 5:30:33 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
7fb82da
Parents:
c66559f
Message:

Use the EL API and compiler from Jetty, not old Tomcat
Bundle the DTDs, as extracted from jetty-schemas-3.1.jar
These were in lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar in Jetty 8
but are not in any lib/jsp/*.jar in Jetty 9.

GPL v2:
Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
Copyright 2004 The Apache Software Foundation
Copyright © 2009-2013 Oracle and/or its affiliates. All rights reserved.

Location:
apps/jetty
Files:
10 added
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rc66559f r1a28a2a  
    170170            </manifest>
    171171        </jar>
     172        <!-- TODO we may wish to put the compiler in jasper-runtime.jar instead -->
    172173        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    173174            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/servlet-api-3.1.jar" />
    174175            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-api-2.3.1.jar" />
    175176            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar" />
     177            <!-- These files are copied out of jetty-schemas-3.1.jar -->
     178            <!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
     179            <fileset dir="resources" includes="javax/**/*" />
    176180        </jar>
    177181      <!--
     
    238242
    239243    <target name="copyTomcatLib2" unless="${with-libtomcat-java}" >
    240         <!-- EL libs.
     244        <!-- EL API and compiler libs.
    241245             Tomcat 6 has EL 2.1.
    242246             Tomcat 7 / libservlet3.0 has EL 2.2.
     247             Jetty 9 / Tomcat 8 / libservlet3.1 has EL 3.0.
    243248             According to http://stackoverflow.com/questions/7202686/differences-between-el-2-1-and-2-2
    244249             2.2 is backwards-compatible with 2.1.
    245250         -->
    246         <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
    247             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
    248             <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
    249         </jar>
     251        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp/javax.el-3.0.0.jar" tofile="jettylib/commons-el.jar" />
    250252
    251253        <jar destfile="jettylib/jasper-runtime.jar" >
Note: See TracChangeset for help on using the changeset viewer.