Jetty 9.2.22

Remove patches for 9.2.21

apps/jetty/build.xml

@@ -16,9 +16,9 @@
     <!-- Note: Please change all references in top-level build.xml if you update to a new Jetty! -->
     <!-- unused until we go to 9.3 -->
     <property name="jetty.branch" value="stable-9" />
-    <property name="jetty.ver" value="9.2.21.v20170120" />
+    <property name="jetty.ver" value="9.2.22.v20170606" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="3dcd4f66cc3f72800a2ee53fecf7b3f9d3f23eb2" />
+    <property name="jetty.sha1" value="7f0b10d69b214337622e3c0565f94417828ba13e" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
     <!-- change jetty.ver to jetty.branch for 9.3 -->
     <property name="jetty.url" value="http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />
@@ -159,13 +159,13 @@
         <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-security-${jetty.ver}.jar" tofile="jettylib/jetty-security.jar" />
         <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" />
-       -->
+      <!-- comment out above line and uncomment below and the patches section further down if we need patches
         <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" />
         <jar destfile="jettylib/jetty-java5-threadpool.jar" >
@@ -373,6 +373,9 @@
         </condition>
     </target>    
 
+    <!-- empty, uncomment below if needed -->
+    <target name="buildPatches" unless="${with-libjetty9-java}" />
+<!--
     <target name="buildPatches" depends="jarPatches" unless="${with-libjetty9-java}" />
 
     <target name="compilePatches" unless="${with-libjetty9-java}" >
@@ -403,6 +406,7 @@
             </or>
         </condition>
     </target>    
+-->
 
     <target name="clean" >
         <delete dir="./build" />

apps/jetty/patches/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java

@@ -1,354 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.util; 
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-import java.util.Timer;
-import java.util.TimerTask;
-
-/** 
- * RolloverFileOutputStream.
- *
- * <p>
- * This output stream puts content in a file that is rolled over every 24 hours.
- * The filename must include the string "yyyy_mm_dd", which is replaced with the 
- * actual date when creating and rolling over the file.
- * </p>
- * <p>
- * Old files are retained for a number of days before being deleted.
- * </p>
- */
-public class RolloverFileOutputStream extends FilterOutputStream
-{
-    private static Timer __rollover;
-    
-    final static String YYYY_MM_DD="yyyy_mm_dd";
-    final static String ROLLOVER_FILE_DATE_FORMAT = "yyyy_MM_dd";
-    final static String ROLLOVER_FILE_BACKUP_FORMAT = "HHmmssSSS";
-    final static int ROLLOVER_FILE_RETAIN_DAYS = 31;
-
-    private RollTask _rollTask;
-    private Calendar midnight;
-    private SimpleDateFormat _fileBackupFormat;
-    private SimpleDateFormat _fileDateFormat;
-
-    private String _filename;
-    private File _file;
-    private boolean _append;
-    private int _retainDays;
-    
-    private final TimeZone _zone;
-
-    /* ------------------------------------------------------------ */
-    /**
-     * @param filename The filename must include the string "yyyy_mm_dd", 
-     * which is replaced with the actual date when creating and rolling over the file.
-     * @throws IOException
-     */
-    public RolloverFileOutputStream(String filename)
-        throws IOException
-    {
-        this(filename,true,ROLLOVER_FILE_RETAIN_DAYS);
-    }
-    
-    /* ------------------------------------------------------------ */
-    /**
-     * @param filename The filename must include the string "yyyy_mm_dd", 
-     * which is replaced with the actual date when creating and rolling over the file.
-     * @param append If true, existing files will be appended to.
-     * @throws IOException
-     */
-    public RolloverFileOutputStream(String filename, boolean append)
-        throws IOException
-    {
-        this(filename,append,ROLLOVER_FILE_RETAIN_DAYS);
-    }
-
-    /* ------------------------------------------------------------ */
-    /**
-     * @param filename The filename must include the string "yyyy_mm_dd", 
-     * which is replaced with the actual date when creating and rolling over the file.
-     * @param append If true, existing files will be appended to.
-     * @param retainDays The number of days to retain files before deleting them.  0 to retain forever.
-     * @throws IOException
-     */
-    public RolloverFileOutputStream(String filename,
-                                    boolean append,
-                                    int retainDays)
-        throws IOException
-    {
-        this(filename,append,retainDays,TimeZone.getDefault());
-    }
-
-    /* ------------------------------------------------------------ */
-    /**
-     * @param filename The filename must include the string "yyyy_mm_dd", 
-     * which is replaced with the actual date when creating and rolling over the file.
-     * @param append If true, existing files will be appended to.
-     * @param retainDays The number of days to retain files before deleting them. 0 to retain forever.
-     * @throws IOException
-     */
-    public RolloverFileOutputStream(String filename,
-                                    boolean append,
-                                    int retainDays,
-                                    TimeZone zone)
-        throws IOException
-    {
-
-         this(filename,append,retainDays,zone,null,null);
-    }
-     
-    /* ------------------------------------------------------------ */
-    /**
-     * @param filename The filename must include the string "yyyy_mm_dd", 
-     * which is replaced with the actual date when creating and rolling over the file.
-     * @param append If true, existing files will be appended to.
-     * @param retainDays The number of days to retain files before deleting them. 0 to retain forever.
-     * @param dateFormat The format for the date file substitution. The default is "yyyy_MM_dd". 
-     * @param backupFormat The format for the file extension of backup files. The default is "HHmmssSSS". 
-     * @throws IOException
-     */
-    public RolloverFileOutputStream(String filename,
-                                    boolean append,
-                                    int retainDays,
-                                    TimeZone zone,
-                                    String dateFormat,
-                                    String backupFormat)
-        throws IOException
-    {
-        super(null);
-
-        if (dateFormat==null)
-            dateFormat=ROLLOVER_FILE_DATE_FORMAT;
-        _fileDateFormat = new SimpleDateFormat(dateFormat);
-        
-        if (backupFormat==null)
-            backupFormat=ROLLOVER_FILE_BACKUP_FORMAT;
-        _fileBackupFormat = new SimpleDateFormat(backupFormat);
-        
-        _fileBackupFormat.setTimeZone(zone);
-        _fileDateFormat.setTimeZone(zone);
-        
-        if (filename!=null)
-        {
-            filename=filename.trim();
-            if (filename.length()==0)
-                filename=null;
-        }
-        if (filename==null)
-            throw new IllegalArgumentException("Invalid filename");
-
-        _filename=filename;
-        _append=append;
-        _retainDays=retainDays;
-        setFile();
-        
-        _zone = zone;
-        synchronized(RolloverFileOutputStream.class)
-        {
-            if (__rollover==null)
-                __rollover=new Timer(RolloverFileOutputStream.class.getName(),true);
-            
-            scheduleNextRollover();
-        }
-    }
-    
-    private void scheduleNextRollover()
-    {
-        _rollTask=new RollTask();
-
-        midnight = Calendar.getInstance();
-        midnight.setTimeZone(_zone);
-        // set to midnight
-        midnight.set(Calendar.HOUR_OF_DAY, 0);
-        midnight.set(Calendar.MINUTE, 0);
-        midnight.set(Calendar.SECOND, 0);
-        midnight.set(Calendar.MILLISECOND, 0);
-
-        // Increment to next day.
-        // Using Calendar.add(DAY, 1) takes in account Daylights Savings
-        // differences, and still maintains the "midnight" settings for
-        // Hour, Minute, Second, Milliseconds
-        midnight.add(Calendar.DAY_OF_MONTH, 1);
-        __rollover.schedule(_rollTask,midnight.getTime());
-    }
-
-    /* ------------------------------------------------------------ */
-    public String getFilename()
-    {
-        return _filename;
-    }
-    
-    /* ------------------------------------------------------------ */
-    public String getDatedFilename()
-    {
-        if (_file==null)
-            return null;
-        return _file.toString();
-    }
-    
-    /* ------------------------------------------------------------ */
-    public int getRetainDays()
-    {
-        return _retainDays;
-    }
-
-    /* ------------------------------------------------------------ */
-    private synchronized void setFile()
-        throws IOException
-    {
-        // Check directory
-        File file = new File(_filename);
-        _filename=file.getCanonicalPath();
-        file=new File(_filename);
-        File dir= new File(file.getParent());
-        if (!dir.isDirectory() || !dir.canWrite())
-            throw new IOException("Cannot write log directory "+dir);
-            
-        Date now=new Date();
-        
-        // Is this a rollover file?
-        String filename=file.getName();
-        int i=filename.toLowerCase(Locale.ENGLISH).indexOf(YYYY_MM_DD);
-        if (i>=0)
-        {
-            file=new File(dir,
-                          filename.substring(0,i)+
-                          _fileDateFormat.format(now)+
-                          filename.substring(i+YYYY_MM_DD.length()));
-        }
-            
-        if (file.exists()&&!file.canWrite())
-            throw new IOException("Cannot write log file "+file);
-
-        // Do we need to change the output stream?
-        if (out==null || !file.equals(_file))
-        {
-            // Yep
-            _file=file;
-            if (!_append && file.exists())
-                file.renameTo(new File(file.toString()+"."+_fileBackupFormat.format(now)));
-            OutputStream oldOut=out;
-            out=new FileOutputStream(file.toString(),_append);
-            if (oldOut!=null)
-                oldOut.close();
-            //if(log.isDebugEnabled())log.debug("Opened "+_file);
-        }
-    }
-
-    /* ------------------------------------------------------------ */
-    private void removeOldFiles()
-    {
-        if (_retainDays>0)
-        {
-            Calendar now = Calendar.getInstance();
-            now.add(Calendar.DAY_OF_MONTH, (-1)*_retainDays);
-            long expired = now.getTimeInMillis();
-            
-            File file= new File(_filename);
-            File dir = new File(file.getParent());
-            String fn=file.getName();
-            int s=fn.toLowerCase(Locale.ENGLISH).indexOf(YYYY_MM_DD);
-            if (s<0)
-                return;
-            String prefix=fn.substring(0,s);
-            String suffix=fn.substring(s+YYYY_MM_DD.length());
-
-            String[] logList=dir.list();
-            for (int i=0;i<logList.length;i++)
-            {
-                fn = logList[i];
-                if(fn.startsWith(prefix)&&fn.indexOf(suffix,prefix.length())>=0)
-                {        
-                    File f = new File(dir,fn);
-                    if(f.lastModified() < expired)
-                    {
-                        f.delete();
-                    }
-                }
-            }
-        }
-    }
-
-    /* ------------------------------------------------------------ */
-    @Override
-    public void write (byte[] buf)
-            throws IOException
-     {
-            out.write (buf);
-     }
-
-    /* ------------------------------------------------------------ */
-    @Override
-    public void write (byte[] buf, int off, int len)
-            throws IOException
-     {
-            out.write (buf, off, len);
-     }
-    
-    /* ------------------------------------------------------------ */
-    @Override
-    public void close()
-        throws IOException
-    {
-        synchronized(RolloverFileOutputStream.class)
-        {
-            try{super.close();}
-            finally
-            {
-                out=null;
-                _file=null;
-            }
-    
-            if (_rollTask != null)
-            {
-                _rollTask.cancel();
-            }
-        }
-    }
-    
-    /* ------------------------------------------------------------ */
-    private class RollTask extends TimerTask
-    {
-        @Override
-        public void run()
-        {
-            try
-            {
-                RolloverFileOutputStream.this.setFile();
-                RolloverFileOutputStream.this.scheduleNextRollover();
-                RolloverFileOutputStream.this.removeOldFiles();
-            }
-            catch(Throwable t)
-            {
-                // Cannot log this exception to a LOG, as RolloverFOS can be used by logging
-                t.printStackTrace(System.err);
-            }
-        }
-    }
-}