Ignore:
Timestamp:
Mar 4, 2017 2:24:48 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
87cff00
Parents:
ec6c244
Message:

Move setting of InstanceManager? to WebAppConfiguration? to avoid race
Fix up LICENSES.txt
Build.xml cleanup
Debian:

  • Add support for with-libtomcat8-java but not with-libjetty9-java for wheezy/jessie
  • Fix wheezy/precise/trusty build files to use tomcat8 but not jetty9 packages
  • Remove build dependency on ant-optional, not required
  • Remove some remaining eclipse-ecj dependencies
  • Add short README files for wheezy and jessie
File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rec6c244 rf38ee48  
    2626    <property name="javac.compilerargs" value="" />
    2727    <property name="javac.version" value="1.7" />
    28 <!--
    29     <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
    30     <property name="tomcat.ver" value="6.0.48" />
    31     <property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" />
    32     <property name="tomcat2.lib.small" value="apache-tomcat/lib" />
    33 -->
    3428
    3529    <target name="all" depends="build" />
     
    126120
    127121    <!-- Jetty and tomcat files -->
    128     <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib" />
     122    <!--
     123         We support the following configurations:
     124           no system jars: Precise, Trusty
     125           with-libtomcat8-java: Jessie (without backports), Wheezy
     126           with-libtomcat8-java AND with-libjetty9-java: Xenial, Jessie (with backports), Stretch
     127           with-libjetty9-java (only): not supported
     128     -->
     129    <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib1, copyJettylib2, copyTomcatLib" />
    129130
    130131    <!-- Jetty files only -->
     
    172173            </manifest>
    173174        </jar>
     175    </target>
     176
     177    <!-- If with-libtomcat8-java but not with-libjetty9-java, we don't do this -->
     178    <target name="copyJettylib2" depends="extractJettylib" unless="${with-libtomcat8-java}" >
    174179        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    175180            <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" />
     
    189194        <delete dir="${jetty.base}" />
    190195      -->
    191         <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over,
    192              needed for old plugins and things. We add tomcat-juli below.
    193           -->
    194       <!--
    195         * Removed in 0.9.24, see ticket #1679
    196         * Jetty now uses tomcat-juli (added below to commons-logging.jar), not commons-logging proper,
    197         * and no known plugins use it either.
    198         <jar destfile="jettylib/commons-logging.jar" filesetmanifest="mergewithoutmain" >
    199             <zipfileset excludes="META-INF/LICENSE.txt META-INF/NOTICE.txt" src="../../installer/lib/launch4j/lib/commons-logging.jar" />
    200         </jar>
    201       -->
    202     </target>
    203 
    204     <!-- Tomcat util jar.
    205          As of Tomcat 6.0.39, the deployer does not contain some classes that are required
    206          to precompile jsps with tags (SusiDNS and i2p-bote).
    207          These classes are in the main Tomcat package, in lib/tomcat-coyote.jar.
    208          As the jar is 800 KB and we only need 12 KB of that, we extract the required classes
    209          to a new jar, created and checked in using this target.
    210          Apparently this is only required for precompilation of jsps, so this is put in
    211          with the JspC compiler jasper-runtime.jar below.
    212      -->
    213 
    214     <!-- take only what we need from the tomcat-coyote jar -->
    215 <!--
    216     <target name="buildTomcatUtilJar" unless="${with-libjetty9-java}" >
    217         <jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
    218             <zipfileset src="${tomcat2.lib}/tomcat-coyote.jar"
    219              includes="org/apache/tomcat/util/descriptor/* org/apache/tomcat/util/res/*" />
    220         </jar>
    221     </target>
    222 -->
     196    </target>
     197
    223198
    224199    <!-- Tomcat.
     
    259234         -->
    260235        <!-- the javax.el API, AND the com.sun.el parser -->
    261         <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
     236        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
    262237        <jar destfile="jettylib/commons-el.jar" >
    263238          <!--
     
    269244        </jar>
    270245
    271         <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
     246        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
    272247        <jar destfile="jettylib/jasper-runtime.jar" >
    273248          <!--
     
    288263        </jar>
    289264
    290 <!--
    291         <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    292             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/servlet-api.jar" />
    293             <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/jsp-api.jar" />
    294             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-api.jar" />
    295             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-util.jar" />
    296         </jar>
    297 -->
    298265        <!-- Ant bug, don't set update and filesetmanifest or the update doesn't happen,
    299266             Their bug tracker claims fixed in 1.8.0 but broken for me in 1.8.1
    300267          -->
    301268        <jar destfile="jettylib/commons-logging.jar" update="true" >
    302 <!--
    303             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
    304 -->
    305269            <manifest>
    306270                <attribute name="Note" value="Intentionally empty" />
Note: See TracChangeset for help on using the changeset viewer.