Changeset b72085bc for apps/jetty


Ignore:
Timestamp:
Mar 3, 2017 3:48:10 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
15915afe
Parents:
d3abbe8
Message:

Debian builds:

  • Remove with-libtomcat6-java and with-libtomcat7-java
  • Replace with-libjetty8-java with-libjetty9-java
  • Add libtomcat8-java dependency in debian builds
  • Change libservlet-3.0-java implicit dependency to libservlet-3.1-java
  • Initial mods for trusty build files, as it does not have jetty 9
  • Initial xenial build files
  • Add link to jetty9-apache-jsp.jar
  • Add necessary util jars to jsp classpath

Non-Debian builds:

  • Move tomcat runtime from javax.servlet.jar to jasper-runtime.jar, to be consistent with Jetty 8
  • Switch from jetty (glassfish) to apache (tomcat) jsp implementation, to be consistent with Debian builds
  • Drop checked-in Tomcat 6 and Jetty 8 jars

Code:

  • Force Jasper initialization in RouterConsoleRunner? since we don't use the Jetty annotation scanner
Location:
apps/jetty
Files:
24 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rd3abbe8 rb72085bc  
    44    <!-- This copies jars, with some modifications and renaming,
    55         from the jetty-distribution directory to the jettylib directory.
    6          This is disabled if the property with-libjetty8-java=true.
     6         This is disabled if the property with-libjetty9-java=true.
    77
    88         This copies jars, with some modifications and renaming,
     
    2626    <property name="javac.compilerargs" value="" />
    2727    <property name="javac.version" value="1.7" />
     28<!--
    2829    <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
    2930    <property name="tomcat.ver" value="6.0.48" />
    3031    <property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" />
    3132    <property name="tomcat2.lib.small" value="apache-tomcat/lib" />
     33-->
    3234
    3335    <target name="all" depends="build" />
     
    4547        <condition property="jetty.zip.extracted" >
    4648            <or>
    47                 <istrue value="${with-libjetty8-java}" />
     49                <istrue value="${with-libjetty9-java}" />
    4850                <available file="${jetty.base}" type="dir" />
    4951            </or>
     
    5759        <condition property="verified.already" >
    5860            <or>
    59                 <istrue value="${with-libjetty8-java}" />
     61                <istrue value="${with-libjetty9-java}" />
    6062                <istrue value="${jetty.zip.extracted}" />
    6163                <and>
     
    127129
    128130    <!-- Jetty files only -->
    129     <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty8-java}" >
     131    <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty9-java}" >
    130132      <!-- We copy everything to names without the version numbers so we
    131133           can update them later. Where there was something similar in Jetty 5/6,
     
    170172            </manifest>
    171173        </jar>
    172         <!-- TODO we may wish to put the compiler in jasper-runtime.jar instead -->
    173174        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    174175            <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" />
     176          <!--
     177            Jetty version - see below for why we don't use this one
    175178            <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" />
    176             <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 <!--
    178             <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/jetty-jsp-${jetty.ver}.jar" />
    179 -->
     179           -->
     180            <!-- Apache version -->
     181            <!-- Also includes org.apache.*, this is copied into jasper-runtime.jar below -->
     182            <zipfileset includes="javax/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
    180183            <!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
    181184            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
     
    207210         with the JspC compiler jasper-runtime.jar below.
    208211     -->
    209     <target name="buildTomcatUtilJar" unless="${with-libservlet2.5-java}" >
    210         <!-- take only what we need from the tomcat-coyote jar -->
     212
     213    <!-- take only what we need from the tomcat-coyote jar -->
     214<!--
     215    <target name="buildTomcatUtilJar" unless="${with-libjetty9-java}" >
    211216        <jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
    212217            <zipfileset src="${tomcat2.lib}/tomcat-coyote.jar"
     
    214219        </jar>
    215220    </target>
     221-->
    216222
    217223    <!-- Tomcat.
     
    232238    <target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
    233239
    234     <target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
     240    <target name="copyTomcatLib1" unless="${with-libjetty9-java}" >
    235241        <condition property="with-libtomcat-java" >
    236242            <or>
     
    251257             2.2 is backwards-compatible with 2.1.
    252258         -->
    253         <copy preservelastmodified="true" file="${jetty.base}/lib/jsp/javax.el-3.0.0.jar" tofile="jettylib/commons-el.jar" />
    254 
     259        <!-- the javax.el API, AND the com.sun.el parser -->
     260        <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
     261        <jar destfile="jettylib/commons-el.jar" >
     262          <!--
     263            Jetty version
     264            <zipfileset src="${jetty.base}/lib/jsp/javax.el-3.0.0.jar"/>
     265           -->
     266            <!-- Apache version -->
     267            <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar"/>
     268        </jar>
     269
     270        <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
    255271        <jar destfile="jettylib/jasper-runtime.jar" >
    256             <manifest>
    257                 <attribute name="Note" value="Intentionally empty" />
    258             </manifest>
    259         </jar>
     272          <!--
     273            Jetty version
     274            <zipfileset src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar"/>
     275            To be included in jasper-runtime.jar?
     276            Server complains "NO JSP Support for /, did not find org.eclipse.jetty.jsp.JettyJspServlet" even with this included (but it still works).
     277            The following file has the class, but /usr/share/java/jetty8-jsp.jar is empty
     278            We don't use this one, because we want to be consistent with Debian builds that
     279            must use Apache (aka libtomcat8).
     280            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/jetty-jsp-${jetty.ver}.jar" />
     281           -->
     282            <!-- Apache version -->
     283            <!-- Also includes javax.servlet.jsp.*, this is copied into javax.servlet.jar above -->
     284            <zipfileset includes="org/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
     285            <!-- required Jetty initializer (see RouterConsoleRunner) -->
     286            <zipfileset src="${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.ver}.jar"/>
     287        </jar>
     288
    260289<!--
    261290        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
     
    270299          -->
    271300        <jar destfile="jettylib/commons-logging.jar" update="true" >
     301<!--
    272302            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
     303-->
     304            <manifest>
     305                <attribute name="Note" value="Intentionally empty" />
     306            </manifest>
    273307        </jar>
    274308    </target>
Note: See TracChangeset for help on using the changeset viewer.