Ignore:
Timestamp:
Mar 11, 2012 6:30:43 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
05537ba, 2415091a
Parents:
f91f83fa
Message:
  • Build:
    • Include old commons logging classes in commons-logging.jar
    • Preserve manifests in Jetty/Tomcat? jars
  • Jetty Logger: Promote warns to erros when a Throwable is the second arg
File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rf91f83fa r703f28e  
    108108        <delete dir="${jetty.base}" />
    109109      -->
    110         <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it
    111              for org.apache.jasper.JspC compiler
     110        <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over,
     111             needed for old plugins and things. We add tomcat-juli below.
    112112          -->
    113         <copy preservelastmodified="true" file="../../installer/lib/launch4j/lib/commons-logging.jar" todir="jettylib/" />
     113        <jar destfile="jettylib/commons-logging.jar" filesetmanifest="mergewithoutmain" >
     114            <zipfileset excludes="META-INF/LICENSE.txt META-INF/NOTICE.txt" src="../../installer/lib/launch4j/lib/commons-logging.jar" />
     115        </jar>
    114116        <ant target="copyTomcatLib" />
    115117    </target>
     
    122124         jasper-el.jar + el-api.jar : commons-el.jar
    123125         servlet-api.jar + jsp-api.jar : javax.servlet.jar
    124          tomcat-juli.jar : commons-logging.jar
     126         tomcat-juli.jar : Add to commons-logging.jar
    125127         empty jar : jasper-compiler.jar
    126128         Also, take NOTICE and LICENSE out of each one, we bundle those separately.
    127129     -->
    128130    <target name="copyTomcatLib" >
    129         <jar destfile="jettylib/jasper-runtime.jar" >
     131        <jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
    130132            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
    131133        </jar>
    132         <jar destfile="jettylib/commons-el.jar" duplicate="preserve" >
     134        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
    133135            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
    134136            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
    135137        </jar>
    136         <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" >
     138        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    137139            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/servlet-api.jar" />
    138140            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/jsp-api.jar" />
    139141        </jar>
    140         <jar destfile="jettylib/commons-logging.jar" >
     142        <!-- Ant bug, don't set update and filesetmanifest or the update doesn't happen,
     143             Their bug tracker claims fixed in 1.8.0 but broken for me in 1.8.1
     144          -->
     145        <jar destfile="jettylib/commons-logging.jar" update="true" >
    141146            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
    142147        </jar>
    143         <jar destfile="jettylib/jasper-compiler.jar" />
     148        <jar destfile="jettylib/jasper-compiler.jar" >
     149            <manifest>
     150                <attribute name="Note" value="Intentionally empty" />
     151            </manifest>
     152        </jar>
    144153    </target>
    145154
Note: See TracChangeset for help on using the changeset viewer.