www-servers/jetty/files/5.1.1/jetty.patch

jetty.patch (text/plain), 2.43 KB, created by tuXXer on 2005-01-04 12:17:57 UTC

diff -ruN jetty-5.1.1.orig/build.xml jetty-5.1.1/build.xml
--- jetty-5.1.1.orig/build.xml	2004-11-18 15:10:14.000000000 +0100
+++ jetty-5.1.1/build.xml	2005-01-04 01:23:54.638163112 +0100
@@ -23,6 +23,7 @@
   <property name="dist"           value="${basedir}/dist"/>
   <property name="contrib"        value="${basedir}/contrib"/>
   <property name="extra"          value="${basedir}/extra"/>
+  <property name="extra-ext"      value="${basedir}/extra/ext"/>
   <property name="classes"        value="${basedir}/classes"/>
   <property name="javadoc"        value="${basedir}/javadoc"/>
   <property name="logs"           value="${basedir}/logs"/>
@@ -69,6 +70,12 @@
         <exclude name="javax.xml.jaxp.jar"/>
         <exclude name="crimson.jar"/>
        </fileset>
+      <fileset dir="${extra-ext}">
+        <include name="*.jar"/>
+        <include name="*.JAR"/>
+        <include name="*.zip"/>
+        <include name="*.ZIP"/>
+      </fileset>
     </path>
    
     <path id="classpath">
diff -ruN jetty-5.1.1.orig/etc/jetty.xml jetty-5.1.1/etc/jetty.xml
--- jetty-5.1.1.orig/etc/jetty.xml	2004-11-25 17:11:04.000000000 +0100
+++ jetty-5.1.1/etc/jetty.xml	2005-01-04 01:22:00.123571976 +0100
@@ -70,7 +70,6 @@
   <!-- Add a HTTPS SSL listener on port 8443                           -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <!-- UNCOMMENT TO ACTIVATE
-  -->
   <Call name="addListener">
     <Arg>
       <New class="org.mortbay.http.SunJsseListener">
@@ -91,7 +90,7 @@
       </New>
     </Arg>
   </Call>
-
+  -->
 
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <!-- Add a AJP13 listener on port 8009                               -->
diff -ruN jetty-5.1.1.orig/extra/unix/bin/jetty.sh jetty-5.1.1/extra/unix/bin/jetty.sh
--- jetty-5.1.1.orig/extra/unix/bin/jetty.sh	2003-09-16 14:03:34.000000000 +0200
+++ jetty-5.1.1/extra/unix/bin/jetty.sh	2005-01-04 01:22:00.126571520 +0100
@@ -362,7 +362,7 @@
                 echo $VERSION:$J
             done
         done
-    done | sort | tail -1 > $TMPJ
+    done | sort | tail -n 1 > $TMPJ
     JAVA=`cat $TMPJ | cut -d: -f2`
     JVERSION=`cat $TMPJ | cut -d: -f1`
 
@@ -397,7 +397,7 @@
     exit 1
 fi
 
-JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -1)" : '.*1\.\([0-9]\)'`
+JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -n 1)" : '.*1\.\([0-9]\)'`
 
 #####################################################
 # See if JETTY_PORT is defined