Changeset 92b9d0a for apps/jetty

Timestamp:

Dec 23, 2011 12:56:48 AM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

99ad70e

Parents:

bd14dc3

Message:

First cut at migrating to Jetty 6 and prep for using an external
Jetty 6 package.

• Add several jars from the Jetty 6 distribution
• Update jetty.xml
• Add context XML files
• Update WorkingDir? to migrate the content XML files
• Update RouterConsoleRunner? and LocaleWebAppHandler?
• Remove all old Jetty 5.1.15 local mods; this will break Seedless using a custom Server() constructor
• Update I2PRequestLog to be a mod of NCSARequestLog from 6.1.26
• Put I2PRequestLog in its own jar
• Copy MultiPartRequest? and other required classes from Jetty 5.1.15 and add it to susimail, as the replacement MultiPartFilter? in Jetty 6 is difficult to migrate to, and does not support content-type
• Update i2psnark for Jetty 6
• Disable i2psnark RunStandalone?, unused and instantiated Jetty 5
• Fix up all webapp build.xml to reference new jars

Not yet working: Plugin/webapp run detection and stopping, eepsite CGI
Not well tested: Plugins, classpaths, webapps

Location:

apps/jetty

Files:

• build.xml (modified) (4 diffs)
• java/src/org/mortbay/http/HttpContext.java (deleted)
• java/src/org/mortbay/http/NCSARequestLog.java (deleted)
• java/src/org/mortbay/http/handler/ResourceHandler.java (deleted)
• java/src/org/mortbay/jetty/Server.java (deleted)
• java/src/org/mortbay/util/FileResource.java (deleted)
• java/src/org/mortbay/util/InetAddrPort.java (deleted)
• java/src/org/mortbay/util/Resource.java (deleted)
• java/src/org/mortbay/util/URI.java (deleted)

apps/jetty/build.xml

@@ -2 +2 @@
 <project basedir="." default="all" name="jetty">
 
-    <property name="jetty.base" value="jetty-5.1.15" />
-    <property name="jetty.sha1" value="3a7a3de50f86f0cdb23c33aec632ea7f44132c5e" />
-    <property name="jetty.filename" value="${jetty.base}.tgz" />
-    <property name="jetty.url" value="http://dist.codehaus.org/jetty/jetty-5.1.x/${jetty.filename}" />
+    <property name="jetty.ver" value="6.1.26" />
+    <property name="jetty.base" value="jetty-${jetty.ver}" />
+    <property name="jetty.sha1" value="9485913f1a1945a849a90f1a34853d22350bc524" />
+    <property name="jetty.filename" value="${jetty.base}.zip" />
+    <property name="jetty.url" value="http://dist.codehaus.org/jetty/${jetty.base}/${jetty.filename}" />
     <property name="verified.filename" value="verified.txt" />
     <property name="javac.compilerargs" value="" />
@@ -65 +66 @@
 
     <target name="extractJettylib" unless="jetty.zip.extracted" >
+      <!-- for .tgz -->
+      <!--
         <gunzip src="${jetty.filename}" dest="jetty.tar" />
         <untar src="jetty.tar" dest="." />
+      -->
+      <!-- for .zip -->
+        <unzip src="${jetty.filename}" dest="." />
         <mkdir dir="jettylib" />
-        <copy todir="jettylib" preservelastmodified="true" >
-            <fileset dir="${jetty.base}/lib">
-                <include name="*.jar" />
-            </fileset>
-            <fileset dir="${jetty.base}/ext">
-                <include name="ant.jar" />
-                <include name="commons-el.jar" />
-                <include name="commons-logging.jar" />
-                <include name="jasper-compiler.jar" />
-                <include name="jasper-runtime.jar" />
-            </fileset>
-        </copy>
+      <!-- We copy everything to names without the version numbers so we
+           can update them later. Where there was something similar in Jetty 5,
+           we use the same names.
+           Reasons for inclusion:
+              start.jar: Needed for clients.config startup of eepsites
+              jetty-util-xxx.jar: LifeCycle (base class for stuff), URIUtil (used in i2psnark)
+              jetty-sslengine-xxx.jar: SSL NIO Connector for console
+              jetty-java5-threadpool-xxx.jar: Concurrent thread pool for eepsite
+              commons-logging.jar: JspC compiler
+              TODO which of these are available in the Ubuntu packages?
+        -->
+        <copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
+        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
+        <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
+        <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/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-threadpool.jar" />
+        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
+        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
+        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-compiler-5.5.15.jar" tofile="jettylib/jasper-compiler.jar" />
+        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-runtime-5.5.15.jar" tofile="jettylib/jasper-runtime.jar" />
+        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jsp-api-2.0.jar" tofile="jettylib/jsp-api.jar" />
+        <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.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
+          -->
+        <copy preservelastmodified="true" file="../../installer/lib/launch4j/lib/commons-logging.jar" todir="jettylib/" />
     </target>
 
     <target name="build" depends="jar" />
+
     <target name="builddep" />
     <target name="compile" depends="builddep, ensureJettylib" >
@@ -94 +115 @@
             destdir="./build/obj" 
             includeAntRuntime="false"
-            classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar" >
+            classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-util.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -113 +134 @@
     </target>
 
+    <!-- With Jetty 5 we replaced classes in the jar, but with Jetty 6 we
+         put our stuff in its own jar so we can work with standard Jetty 6 packages
+      -->
     <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
         <!-- set if unset -->
         <property name="workspace.changes.tr" value="" />
-        <jar destfile="./jettylib/org.mortbay.jetty.jar" basedir="./build/obj" includes="**/*.class" update="true" >
+        <jar destfile="./jettylib/jetty-i2p.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
                 <attribute name="Build-Date" value="${build.timestamp}" />