Changeset 0ad4789


Ignore:
Timestamp:
Jan 2, 2012 2:04:51 AM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
a14643f
Parents:
dd9cae5
Message:

Add jetty-rewrite-handler.jar to the Debian packaging

Location:
debian
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/i2p-router.install

    rdd9cae5 r0ad4789  
    3838pkg-temp/lib/systray4j.jar usr/share/i2p/lib
    3939
    40 # These two are copied over to avoid depending on libjetty-extra-java
     40# These are copied over to avoid depending on libjetty-extra-java
    4141# and pulling in dependencies that we don't care about
    4242pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    43 pkg-temp/lib/jetty-threadpool.jar usr/share/i2p/lib
     43pkg-temp/lib/jetty-java5-threadpool.jar usr/share/i2p/lib
     44pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
  • debian/patches/0004-jetty6.patch

    rdd9cae5 r0ad4789  
    9393       <!-- We copy everything to names without the version numbers so we
    9494            can update them later. Where there was something similar in Jetty 5,
    95 @@ -83,29 +25,26 @@
    96                jetty-java5-threadpool-xxx.jar: Concurrent thread pool for eepsite
    97                commons-logging.jar: JspC compiler
     95@@ -86,30 +28,27 @@
     96               jetty-rewrite-handler: Not used by I2P, but only 20KB and could be useful for eepsites
     97               All of these are available in the Ubuntu packages libjetty-java and libjetty-extra-java
    9898         -->
     99-        <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
    99100-        <copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
    100101-        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
    101 -        <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
     102-        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-java5-threadpool.jar" />
     103-        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-rewrite-handler-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
    102104-        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
    103 -        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-threadpool.jar" />
    104105-        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
    105106-        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
     
    107108-        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-runtime-5.5.15.jar" tofile="jettylib/jasper-runtime.jar" />
    108109-        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jsp-api-2.0.jar" tofile="jettylib/jsp-api.jar" />
    109 -        <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
     110-        <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
    110111-        <delete file="jetty.tar" />
    111112-        <delete dir="${jetty.base}" />
     
    118119+        <copy preservelastmodified="true" file="/usr/share/java/el-api-2.1.jar" tofile="jettylib/el-api.jar" />
    119120+        <copy preservelastmodified="true" file="/usr/share/java/jasper-el.jar" todir="jettylib/" />
    120 +        <copy preservelastmodified="true" file="/usr/share/java/jetty-java5-threadpool.jar" tofile="jettylib/jetty-threadpool.jar" />
     121+        <copy preservelastmodified="true" file="/usr/share/java/jetty-java5-threadpool.jar" tofile="jettylib/jetty-java5-threadpool.jar" />
     122+        <copy preservelastmodified="true" file="/usr/share/java/jetty-rewrite-handler.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
    121123+        <copy preservelastmodified="true" file="/usr/share/java/jetty-sslengine.jar" tofile="jettylib/jetty-sslengine.jar" />
    122124+        <copy preservelastmodified="true" file="/usr/share/java/jetty-start.jar" tofile="jettylib/jetty-start.jar" />
     
    134136     <target name="builddep" />
    135137-    <target name="compile" depends="builddep, ensureJettylib" >
    136 +    <target name="compile" depends="builddep,extractJettylib" >
     138+    <target name="compile" depends="builddep, extractJettylib" >
    137139         <mkdir dir="./build" />
    138140         <mkdir dir="./build/obj" />
    139141         <javac
    140 @@ -169,7 +108,6 @@
     142@@ -173,7 +112,6 @@
    141143     <target name="cleandep" depends="clean" />
    142144     <target name="distclean" depends="clean">
     
    146148     <target name="reallyclean" depends="distclean">
    147149     </target>
    148 @@ -177,22 +115,10 @@
     150@@ -181,22 +119,10 @@
    149151         <delete dir="./jettylib" />
    150152         <delete file="${jetty.filename}" />
Note: See TracChangeset for help on using the changeset viewer.