Changeset 925cacc

Timestamp:

Apr 29, 2017 2:24:10 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

3dbbc29

Parents:

a21e0274

Message:

Jetty: Set up to add patch for RolloverFileOutputStream?
checked in file is unmodified from 9.2.21 for reference
patch in next checkin

Location:

apps/jetty

Files:

• build.xml (modified) (3 diffs)
• patches/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java (added)

apps/jetty/build.xml

@@ -130 +130 @@
 
     <!-- Jetty files only -->
-    <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty9-java}" >
+    <target name="copyJettylib1" depends="extractJettylib, buildPatches" unless="${with-libjetty9-java}" >
       <!-- We copy everything to names without the version numbers so we
            can update them later. Where there was something similar in Jetty 5/6,
@@ -160 +160 @@
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-servlet-${jetty.ver}.jar" tofile="jettylib/jetty-servlet.jar" />
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-servlets-${jetty.ver}.jar" tofile="jettylib/jetty-servlets.jar" />
+      <!--
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
+       -->
+        <jar destfile="jettylib/jetty-util.jar"  manifest="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" filesetmanifest="mergewithoutmain" >
+            <zipfileset excludes="**/RolloverFileOutputStream*.class" src="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" />
+            <zipfileset src="build/jetty-util-patch.jar" />
+        </jar>
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-webapp-${jetty.ver}.jar" tofile="jettylib/jetty-webapp.jar" />
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-xml-${jetty.ver}.jar" tofile="jettylib/jetty-xml.jar" />
@@ -367 +373 @@
     </target>    
 
+    <target name="buildPatches" depends="jarPatches" unless="${with-libjetty9-java}" />
+
+    <target name="compilePatches" unless="${with-libjetty9-java}" >
+        <mkdir dir="./build" />
+        <mkdir dir="./build/objPatches" />
+        <javac 
+            srcdir="./patches/jetty-util/src/main/java" 
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+            destdir="./build/objPatches" 
+            includeAntRuntime="false"
+            classpath="" >
+            <compilerarg line="${javac.compilerargs}" />
+        </javac>
+    </target>
+
+    <target name="jarPatches" depends="compilePatches, jarPatchesUpToDate" unless="jarPatches.uptodate" >
+        <jar destfile="./build/jetty-util-patch.jar" basedir="./build/objPatches" includes="**/*.class" >
+        </jar>
+    </target>    
+
+    <target name="jarPatchesUpToDate" >
+        <condition property="jarPatches.uptodate" >
+            <or>
+                <equals arg1="${with-libjetty9-java}" arg2="true" />
+                <uptodate property="jarPatches.uptodate" targetfile="jettylib/jetty-i2p.jar" >
+                    <srcfiles dir= "build/objPatches" includes="**/*.class" />
+                </uptodate>
+            </or>
+        </condition>
+    </target>    
+
     <target name="clean" >
         <delete dir="./build" />