diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index 7d4c824cf55f67736028b37961a2a3fd74f7c34b..2ca7056cfdfdf32fd6b54cf432c902627caad3de 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -12,6 +12,7 @@ <target name="all" depends="build" /> + <!-- <target name="ensureJettylib" > <available property="jetty.zip.available" file="${jetty.filename}" type="file" /> <available property="jetty.zip.extracted" file="jettylib" type="dir" /> @@ -19,6 +20,8 @@ <ant target="verifyJettylib" /> <ant target="extractJettylib" /> </target> + --> + <target name="ensureJettylib" depends="extractJettylib" /> <target name="fetchJettylib" unless="jetty.zip.available" > <echo message="It seems that you don't have '${jetty.filename}' deployed." /> @@ -65,14 +68,19 @@ <touch file="${verified.filename}" /> </target> + <!-- <target name="extractJettylib" unless="jetty.zip.extracted" > + --> + <target name="extractJettylib" > <!-- for .tgz --> <!-- <gunzip src="${jetty.filename}" dest="jetty.tar" /> <untar src="jetty.tar" dest="." /> --> <!-- for .zip --> + <!-- <unzip src="${jetty.filename}" dest="." /> + --> <mkdir dir="jettylib" /> <!-- We copy everything to names without the version numbers so we can update them later. Where there was something similar in Jetty 5, @@ -96,7 +104,9 @@ <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" /> <copy preservelastmodified="true" file="${jetty.base}/lib/management/jetty-management-${jetty.ver}.jar" tofile="jettylib/org.mortbay.jmx.jar" /> <delete file="jetty.tar" /> + <!-- <delete dir="${jetty.base}" /> + --> <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it for org.apache.jasper.JspC compiler --> @@ -200,7 +210,9 @@ <target name="cleandep" depends="clean" /> <target name="distclean" depends="clean"> <delete dir="./jettylib" /> + <!-- <echo message="Not actually deleting the jetty libs (since they're so large)" /> + --> </target> <target name="reallyclean" depends="distclean"> </target> diff --git a/apps/jetty/jetty-6.1.26/README-i2p.txt b/apps/jetty/jetty-6.1.26/README-i2p.txt new file mode 100644 index 0000000000000000000000000000000000000000..efbecbcdc7a8b90db10fd45cbc8727525f48b5ba --- /dev/null +++ b/apps/jetty/jetty-6.1.26/README-i2p.txt @@ -0,0 +1,3 @@ +This is only what we need out of the 25 MB Jetty-6.1.26.zip. + +NOTICE and LICENSE files moved to ../../../licenses diff --git a/apps/jetty/jetty-6.1.26/lib/ext/jetty-java5-threadpool-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/ext/jetty-java5-threadpool-6.1.26.jar new file mode 100644 index 0000000000000000000000000000000000000000..fb75a1c62882bfc792ca09d52746d75eccbe2d9e Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/ext/jetty-java5-threadpool-6.1.26.jar differ diff --git a/apps/jetty/jetty-6.1.26/lib/ext/jetty-rewrite-handler-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/ext/jetty-rewrite-handler-6.1.26.jar new file mode 100644 index 0000000000000000000000000000000000000000..3d0a7fbe4aaecac516914cd10dabf57e52756bec Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/ext/jetty-rewrite-handler-6.1.26.jar differ diff --git a/apps/jetty/jetty-6.1.26/lib/ext/jetty-sslengine-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/ext/jetty-sslengine-6.1.26.jar new file mode 100644 index 0000000000000000000000000000000000000000..051efb59d6b215888b9630336bb1fa4f705d3b4f Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/ext/jetty-sslengine-6.1.26.jar differ diff --git a/apps/jetty/jetty-6.1.26/lib/jetty-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/jetty-6.1.26.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cbe07aeefa47ad6321addf0e75e010858f72fba Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/jetty-6.1.26.jar differ diff --git a/apps/jetty/jetty-6.1.26/lib/jetty-util-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/jetty-util-6.1.26.jar new file mode 100644 index 0000000000000000000000000000000000000000..cd237528add68b792f2e6e030344f27d9d07ec31 Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/jetty-util-6.1.26.jar differ diff --git a/apps/jetty/jetty-6.1.26/lib/management/jetty-management-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/management/jetty-management-6.1.26.jar new file mode 100644 index 0000000000000000000000000000000000000000..b5eeecb3278908eced646acb954042a0b9589c57 Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/management/jetty-management-6.1.26.jar differ diff --git a/apps/jetty/jetty-6.1.26/start.jar b/apps/jetty/jetty-6.1.26/start.jar new file mode 100644 index 0000000000000000000000000000000000000000..d3a94bcfae630a90d4103437bd3c2da0d37d98c9 Binary files /dev/null and b/apps/jetty/jetty-6.1.26/start.jar differ