Ignore:
Timestamp:
Jan 1, 2012 5:57:59 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
dd9cae5
Parents:
b5f97d0
Message:
  • Fix jetty.xml migrate quote handling
  • Fix I2PRequestLog javadoc
  • Rename jetty-threadpool.jar to jetty-java5-threadpool.jar to match ubuntu symlink
  • Bundle jetty-rewrite-handler.jar (20KB) and .xml config to make it easier to do rewrites (unused by I2P)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rb5f97d0 r33b25b57  
    7676      <!-- We copy everything to names without the version numbers so we
    7777           can update them later. Where there was something similar in Jetty 5,
    78            we use the same names.
     78           we use the same names so they will overwrite the Jetty 5 jar on upgrade.
     79           Otherwise we use the same name as the symlink in Ubuntu /usr/share/java.
    7980           Reasons for inclusion:
    8081              start.jar: Needed for clients.config startup of eepsites
     
    8283              jetty-sslengine-xxx.jar: SSL NIO Connector for console
    8384              jetty-java5-threadpool-xxx.jar: Concurrent thread pool for eepsite
    84               commons-logging.jar: JspC compiler
    85               TODO which of these are available in the Ubuntu packages?
     85              jasper*, commons-logging.jar: JspC compiler, webapp runtime
     86              jetty-rewrite-handler: Not used by I2P, but only 20KB and could be useful for eepsites
     87              All of these are available in the Ubuntu packages libjetty-java and libjetty-extra-java
    8688        -->
     89        <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
    8790        <copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
    8891        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
    89         <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
     92        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-java5-threadpool.jar" />
     93        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-rewrite-handler-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
    9094        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
    91         <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-threadpool.jar" />
    9295        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
    9396        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
     
    9598        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-runtime-5.5.15.jar" tofile="jettylib/jasper-runtime.jar" />
    9699        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jsp-api-2.0.jar" tofile="jettylib/jsp-api.jar" />
    97         <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
     100        <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
    98101        <delete file="jetty.tar" />
    99102        <delete dir="${jetty.base}" />
Note: See TracChangeset for help on using the changeset viewer.