User: janb    
  Date: 02/02/19 21:33:46

  Modified:    jetty/src/main/org/mortbay/util B64Code.java
                        BadResource.java BlockingQueue.java
                        ByteArrayISO8859Writer.java
                        ByteArrayOutputStream2.java
                        ByteBufferOutputStream.java Code.java
                        CodeException.java DateCache.java FileResource.java
                        Frame.java IO.java InetAddrPort.java
                        JarFileResource.java JarResource.java
                        KeyPairTool.java LazyList.java LifeCycle.java
                        LifeCycleThread.java LineInput.java Log.java
                        LogSink.java MultiException.java MultiMap.java
                        Observed.java OutputStreamLogSink.java
                        Password.java Primitive.java
                        QuotedStringTokenizer.java Resource.java
                        RolloverFileOutputStream.java SingletonList.java
                        StringMap.java StringUtil.java TestCase.java
                        ThreadPool.java ThreadedServer.java URI.java
                        UnixCrypt.java UrlEncoded.java
  Log:
  Updating to latest Jetty with tag JBOSS_20020220222111
  
  Revision  Changes    Path
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/B64Code.java
  
  Index: B64Code.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/B64Code.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- B64Code.java      10 Feb 2002 17:57:45 -0000      1.2
  +++ B64Code.java      20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: B64Code.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: B64Code.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -13,7 +13,7 @@
    * <p> Note that in a web services context the usual case is to not want
    * linebreaks or other white space in the encoded output.
    *
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Brett Sealey (bretts)
    * @author Greg Wilkins (gregw)
    */
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/BadResource.java
  
  Index: BadResource.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/BadResource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BadResource.java  10 Feb 2002 17:57:45 -0000      1.2
  +++ BadResource.java  20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: BadResource.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: BadResource.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   package org.mortbay.util;
   
  @@ -18,7 +18,7 @@
    * A Resource that is returned for a bade URL.  Acts as a resource
    * that does not exist and throws appropriate exceptions.
    *
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   class BadResource extends Resource
  
  
  
  1.3       +2 -8      contrib/jetty/src/main/org/mortbay/util/BlockingQueue.java
  
  Index: BlockingQueue.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/BlockingQueue.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BlockingQueue.java        10 Feb 2002 17:57:45 -0000      1.2
  +++ BlockingQueue.java        20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: BlockingQueue.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: BlockingQueue.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  @@ -12,7 +12,7 @@
    * Implemented as circular buffer in a Vector. Synchronization is on the
    * vector to avoid double synchronization.
    *
  - * @version $Id: BlockingQueue.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: BlockingQueue.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class BlockingQueue
  @@ -35,18 +35,12 @@
       }
   
       /* ------------------------------------------------------------ */
  -    /** 
  -     * @return 
  -     */
       public int size()
       {
           return size;
       }
       
       /* ------------------------------------------------------------ */
  -    /** 
  -     * @return 
  -     */
       public int maxSize()
       {
           return maxSize;
  
  
  
  1.3       +0 -0      
contrib/jetty/src/main/org/mortbay/util/ByteArrayISO8859Writer.java
  
  Index: ByteArrayISO8859Writer.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/ByteArrayISO8859Writer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ByteArrayISO8859Writer.java       10 Feb 2002 17:57:45 -0000      1.2
  +++ ByteArrayISO8859Writer.java       20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 2001 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: ByteArrayISO8859Writer.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: ByteArrayISO8859Writer.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  @@ -18,7 +18,7 @@
    * many inefficiencies associated with these standard library classes.
    * It has been optimized for standard ASCII characters.
    * 
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   public class ByteArrayISO8859Writer extends Writer
  
  
  
  1.3       +0 -0      
contrib/jetty/src/main/org/mortbay/util/ByteArrayOutputStream2.java
  
  Index: ByteArrayOutputStream2.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/ByteArrayOutputStream2.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ByteArrayOutputStream2.java       10 Feb 2002 17:57:45 -0000      1.2
  +++ ByteArrayOutputStream2.java       20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 2001 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: ByteArrayOutputStream2.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: ByteArrayOutputStream2.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  @@ -9,7 +9,7 @@
   /* ------------------------------------------------------------ */
   /** ByteArrayOutputStream with public internals
   
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   public class ByteArrayOutputStream2 extends ByteArrayOutputStream
  
  
  
  1.3       +0 -0      
contrib/jetty/src/main/org/mortbay/util/ByteBufferOutputStream.java
  
  Index: ByteBufferOutputStream.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/ByteBufferOutputStream.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ByteBufferOutputStream.java       10 Feb 2002 17:57:45 -0000      1.2
  +++ ByteBufferOutputStream.java       20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 2001 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: ByteBufferOutputStream.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: ByteBufferOutputStream.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  @@ -13,7 +13,7 @@
    * except that it maintains a reserve of bytes at the start of the
    * buffer and allows efficient prepending of data.
    *
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   public class ByteBufferOutputStream extends OutputStream
  
  
  
  1.3       +4 -5      contrib/jetty/src/main/org/mortbay/util/Code.java
  
  Index: Code.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/Code.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Code.java 10 Feb 2002 17:57:45 -0000      1.2
  +++ Code.java 20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 MortBay Consulting, Sydney
  -// $Id: Code.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: Code.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -58,8 +58,7 @@
   *      my.package.main
   * </pre>
   *
  -* @see ISS.Base.Log
  -* @version $Id: Code.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +* @version $Id: Code.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   * @author Greg Wilkins
   */
   public class Code
  @@ -453,7 +452,7 @@
       
       /*-------------------------------------------------------------------*/
       /** Get debug status for the current stack frame.
  -     * @returns true if debug is on for this stack frame
  +     * @return true if debug is on for this stack frame
        */
       public static boolean debug()
       {
  @@ -926,7 +925,7 @@
               
               for (int i=0;i<mx.size();i++)
               {
  -                __out.println("getException("+i+"):");
  +                __out.print("["+i+"]=");
                   Throwable ex2=mx.getException(i);
                   expandThrowable(ex2);
               }
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/CodeException.java
  
  Index: CodeException.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/CodeException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CodeException.java        10 Feb 2002 17:57:45 -0000      1.2
  +++ CodeException.java        20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 MortBay Consulting, Sydney
  -// $Id: CodeException.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: CodeException.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -10,7 +10,7 @@
    * 
    * Thrown by Code.assert or Code.fail
    * @see Code
  - * @version  $Id: CodeException.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version  $Id: CodeException.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins
    */
   public class CodeException extends RuntimeException
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/DateCache.java
  
  Index: DateCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/DateCache.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DateCache.java    10 Feb 2002 17:57:45 -0000      1.2
  +++ DateCache.java    20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: DateCache.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: DateCache.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  @@ -27,7 +27,7 @@
    * If consecutive calls are frequently very different, then this
    * may be a little slower than a normal DateFormat.
    *
  - * @version $Id: DateCache.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: DateCache.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Kent Johnson <[EMAIL PROTECTED]>
    * @author Greg Wilkins (gregw)
    */
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/FileResource.java
  
  Index: FileResource.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/FileResource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FileResource.java 10 Feb 2002 17:57:45 -0000      1.2
  +++ FileResource.java 20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: FileResource.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: FileResource.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   package org.mortbay.util;
   
  @@ -26,7 +26,7 @@
    * If alias checking is turned on, then aliased resources are
    * treated as if they do not exist, nor can they be created.
    *
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   class FileResource extends Resource
  
  
  
  1.3       +3 -5      contrib/jetty/src/main/org/mortbay/util/Frame.java
  
  Index: Frame.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/Frame.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Frame.java        10 Feb 2002 17:57:45 -0000      1.2
  +++ Frame.java        20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 MortBay Consulting, Sydney
  -// $Id: Frame.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: Frame.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -95,7 +95,7 @@
       
       /* ------------------------------------------------------------ */
       /** Internal only Constructor. */
  -    Frame(String stack, int ignoreFrames, boolean partial)
  +    private Frame(String stack, int ignoreFrames, boolean partial)
       {
           _stack = stack;
           internalInit(ignoreFrames, partial);
  @@ -246,9 +246,7 @@
           if (f._where == null) return null;
           f._thread = _thread;
           return f;
  -    }
  -    
  -    
  +    }    
   }
   
   
  
  
  
  1.3       +22 -4     contrib/jetty/src/main/org/mortbay/util/IO.java
  
  Index: IO.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/IO.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IO.java   10 Feb 2002 17:57:45 -0000      1.2
  +++ IO.java   20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: IO.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: IO.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  @@ -10,6 +10,7 @@
   import java.io.OutputStream;
   import java.io.Reader;
   import java.io.Writer;
  +import java.io.File;
   
   /* ======================================================================== */
   /** IO Utilities.
  @@ -188,9 +189,7 @@
       }
   
       /* ------------------------------------------------------------ */
  -    /** Read input stream to string 
  -     * @param in 
  -     * @return 
  +    /** Read input stream to string.
        */
       public static String toString(InputStream in)
           throws IOException
  @@ -200,6 +199,25 @@
           return new String(out.toByteArray());
       }
   
  +
  +    /* ------------------------------------------------------------ */
  +    /** Delete File.
  +     * This delete will recursively delete directories - BE CAREFULL
  +     * @param file The file to be deleted.
  +     */
  +    public static void delete(File file)
  +    {
  +        if (!file.exists())
  +            return;
  +        if (file.isDirectory())
  +        {
  +            File[] files = file.listFiles();
  +            for (int i=0;files!=null && i<files.length;i++)
  +                delete(files[i]);
  +        }
  +        file.delete();
  +    }
  +    
       
       /* ------------------------------------------------------------ */
       /** Run copy for copyThread()
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/InetAddrPort.java
  
  Index: InetAddrPort.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/InetAddrPort.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InetAddrPort.java 10 Feb 2002 17:57:45 -0000      1.2
  +++ InetAddrPort.java 20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: InetAddrPort.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: InetAddrPort.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/JarFileResource.java
  
  Index: JarFileResource.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/JarFileResource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JarFileResource.java      10 Feb 2002 17:57:45 -0000      1.2
  +++ JarFileResource.java      20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: JarFileResource.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: JarFileResource.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   package org.mortbay.util;
   
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/JarResource.java
  
  Index: JarResource.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/JarResource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JarResource.java  10 Feb 2002 17:57:45 -0000      1.2
  +++ JarResource.java  20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: JarResource.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: JarResource.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   package org.mortbay.util;
   
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/KeyPairTool.java
  
  Index: KeyPairTool.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/KeyPairTool.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- KeyPairTool.java  10 Feb 2002 17:57:45 -0000      1.2
  +++ KeyPairTool.java  20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1998 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: KeyPairTool.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: KeyPairTool.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -39,7 +39,7 @@
    * <p> The inverse operation, exporting a keypair to an external format, has
    *     been left as an exercise for the reader... :-)
    *
  - * @version $Id: KeyPairTool.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: KeyPairTool.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Brett Sealey
    */
   public class KeyPairTool
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/LazyList.java
  
  Index: LazyList.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/LazyList.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LazyList.java     10 Feb 2002 17:57:45 -0000      1.2
  +++ LazyList.java     20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: LazyList.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: LazyList.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -38,7 +38,7 @@
    * An ArrayList of default size is used as the initial LazyList.
    *
    * @see java.util.List
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   public class LazyList extends AbstractList
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/LifeCycle.java
  
  Index: LifeCycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/LifeCycle.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LifeCycle.java    10 Feb 2002 17:57:45 -0000      1.2
  +++ LifeCycle.java    20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: LifeCycle.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: LifeCycle.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;/* 
------------------------------------------------------------ */
  @@ -8,7 +8,7 @@
    * Represents the life cycle interface for an abstract
    * software component. 
    *
  - * @version $Id: LifeCycle.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: LifeCycle.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public interface LifeCycle
  
  
  
  1.3       +1 -12     contrib/jetty/src/main/org/mortbay/util/LifeCycleThread.java
  
  Index: LifeCycleThread.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/LifeCycleThread.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LifeCycleThread.java      10 Feb 2002 17:57:45 -0000      1.2
  +++ LifeCycleThread.java      20 Feb 2002 05:33:45 -0000      1.3
  @@ -5,7 +5,7 @@
   /* ------------------------------------------------------------ */
   /** Base Thread class implementing LifeCycle.
    *
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   public abstract class LifeCycleThread implements LifeCycle, Runnable
  @@ -16,35 +16,24 @@
       private Object _configuration;
       
       /* ------------------------------------------------------------ */
  -    /** 
  -     * @return 
  -     */
       public boolean isDaemon()
       {
           return _daemon;
       }
       
       /* ------------------------------------------------------------ */
  -    /** 
  -     * @param d 
  -     */
       public void setDaemon(boolean d)
       {
           _daemon = d;
       }
       
       /* ------------------------------------------------------------ */
  -    /** 
  -     * @return 
  -     */
       public boolean isStarted()
       {
           return _running;
       }
   
       /* ------------------------------------------------------------ */
  -    /** 
  -     */
       public synchronized void start()
           throws Exception
       {
  
  
  
  1.3       +11 -9     contrib/jetty/src/main/org/mortbay/util/LineInput.java
  
  Index: LineInput.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/LineInput.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LineInput.java    10 Feb 2002 17:57:45 -0000      1.2
  +++ LineInput.java    20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: LineInput.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: LineInput.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  @@ -33,12 +33,11 @@
    * Line input uses the mark/reset mechanism, so any marks set
    * prior to a readLine call are lost.
    *
  - * @version $Id: LineInput.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: LineInput.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class LineInput extends FilterInputStream                           
   {
  -    
       /* ------------------------------------------------------------ */
       private byte _buf[];
       private ByteBuffer _byteBuffer;
  @@ -53,9 +52,11 @@
       private String _encoding;
       private boolean _eof=false;
       private boolean _lastCr=false;
  -
  +    private boolean _seenCrLf=false;
  +    
       private final static int LF=10;
       private final static int CR=13;
  +
       
       /* ------------------------------------------------------------ */
       /** Constructor.
  @@ -274,7 +275,7 @@
           _lineBuffer.size=
               _reader.read(_lineBuffer.buffer,0,_lineBuffer.buffer.length);
           _mark=-1;
  -        
  +
           return _lineBuffer;
       }
       
  @@ -472,6 +473,7 @@
           // the first char is a LF, skip it
           if (_avail-_pos>0 && _lastCr && _buf[_pos]==LF)
           {
  +            _seenCrLf=true;
               _pos++;
               if (_mark>=0)
                   _mark++;
  @@ -529,10 +531,9 @@
                   }
                   
                   // If we have a CR and no more characters are available
  -                // try again and if it is still the case
  -                // return a line.
  -                if (cr && in.available()==0)
  +                if (cr && in.available()==0 && !_seenCrLf)
                   {
  +                    Code.debug("Missing LF");
                       _lastCr=true;
                       cr=true;
                       lf=true;
  @@ -553,7 +554,8 @@
               
               switch(b)
               {
  -              case LF: 
  +              case LF:
  +                  if (cr) _seenCrLf=true;
                     lf=true;
                     break LineLoop;
                   
  
  
  
  1.3       +2 -5      contrib/jetty/src/main/org/mortbay/util/Log.java
  
  Index: Log.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/Log.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Log.java  10 Feb 2002 17:57:45 -0000      1.2
  +++ Log.java  20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 MortBay Consulting, Sydney
  -// $Id: Log.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: Log.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -80,7 +80,7 @@
           if (!_initialized)
           {
               _logOptions=System.getProperty("LOG_OPTIONS",
  -                                           Code.debug()?"stLT":"tT");
  +                                           Code.getDebug()?"stLT":"tT");
               String sinkClasses = System.getProperty("LOG_CLASSES",
                                                       
"org.mortbay.util.OutputStreamLogSink");
               StringTokenizer sinkTokens = new StringTokenizer(sinkClasses, ";");
  @@ -165,9 +165,6 @@
       }
       
       /* ------------------------------------------------------------ */
  -    /** 
  -     * @return 
  -     */
       public LogSink[] getLogSinks()
       {
           return _sinks;
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/LogSink.java
  
  Index: LogSink.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/LogSink.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LogSink.java      10 Feb 2002 17:57:45 -0000      1.2
  +++ LogSink.java      20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 MortBay Consulting, Sydney
  -// $Id: LogSink.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: LogSink.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -15,7 +15,7 @@
    * logging APIs.
    *
    * 
  - * @version $Id: LogSink.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: LogSink.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public interface LogSink extends LifeCycle
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/MultiException.java
  
  Index: MultiException.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/MultiException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MultiException.java       10 Feb 2002 17:57:45 -0000      1.2
  +++ MultiException.java       20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,7 +1,7 @@
   
   // ========================================================================
   // Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: MultiException.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: MultiException.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/MultiMap.java
  
  Index: MultiMap.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/MultiMap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MultiMap.java     10 Feb 2002 17:57:45 -0000      1.2
  +++ MultiMap.java     20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: MultiMap.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: MultiMap.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -24,7 +24,7 @@
    * Multi-values items are always stored as a List.
    *
    * 
  - * @version $Id: MultiMap.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: MultiMap.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class MultiMap extends HashMap
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/Observed.java
  
  Index: Observed.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/Observed.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Observed.java     10 Feb 2002 17:57:45 -0000      1.2
  +++ Observed.java     20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: Observed.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: Observed.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  
  
  
  1.3       +3 -3      contrib/jetty/src/main/org/mortbay/util/OutputStreamLogSink.java
  
  Index: OutputStreamLogSink.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/OutputStreamLogSink.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OutputStreamLogSink.java  10 Feb 2002 17:57:45 -0000      1.2
  +++ OutputStreamLogSink.java  20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 MortBay Consulting, Sydney
  -// $Id: OutputStreamLogSink.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: OutputStreamLogSink.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -45,7 +45,7 @@
    * format, otherwise GMT is used.
    *
    * @see org.mortbay.util.Log
  - * @version $Id: OutputStreamLogSink.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: OutputStreamLogSink.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class OutputStreamLogSink
  @@ -371,7 +371,7 @@
               // Determine the indent string for the message and append it
               // to the buffer. Only put a newline in the buffer if the first
               // line is not blank
  -            String nl=__lineSeparator+(_logOneLine?"":"+ ");
  +            String nl=__lineSeparator;
               
               if (_logLabels && !_logOneLine && _buffer.length() > 0)
                   _buffer.write(nl);
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/Password.java
  
  Index: Password.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/Password.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Password.java     10 Feb 2002 17:57:45 -0000      1.2
  +++ Password.java     20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1998 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: Password.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: Password.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -46,7 +46,7 @@
    * than recovered.  Note that it is not strong security - specially if
    * simple passwords are used.
    * 
  - * @version $Id: Password.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: Password.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class Password
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/Primitive.java
  
  Index: Primitive.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/Primitive.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Primitive.java    10 Feb 2002 17:57:45 -0000      1.2
  +++ Primitive.java    20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: Primitive.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: Primitive.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -12,7 +12,7 @@
   /* ------------------------------------------------------------ */
   /** Utility handling of primitive types 
    *
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   public class Primitive
  
  
  
  1.3       +0 -0      
contrib/jetty/src/main/org/mortbay/util/QuotedStringTokenizer.java
  
  Index: QuotedStringTokenizer.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/QuotedStringTokenizer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- QuotedStringTokenizer.java        10 Feb 2002 17:57:45 -0000      1.2
  +++ QuotedStringTokenizer.java        20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: QuotedStringTokenizer.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: QuotedStringTokenizer.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -18,7 +18,7 @@
    * Quotes can be escaped with '\'.
    *
    * @see java.util.StringTokenizer
  - * @version $Id: QuotedStringTokenizer.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: QuotedStringTokenizer.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class QuotedStringTokenizer
  
  
  
  1.3       +5 -15     contrib/jetty/src/main/org/mortbay/util/Resource.java
  
  Index: Resource.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/Resource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Resource.java     10 Feb 2002 17:57:45 -0000      1.2
  +++ Resource.java     20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: Resource.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: Resource.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   package org.mortbay.util;
   
  @@ -16,11 +16,9 @@
   
   
   /* ------------------------------------------------------------ */
  -/**
  - * Class that represents a resource accessible through the file or URL
  - * <p>
  +/** Abstract resource class.
    *
  - * @version $Id: Resource.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: Resource.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Nuno Pregui�a
    * @author Greg Wilkins (gregw)
    */
  @@ -32,10 +30,6 @@
       protected InputStream _in=null;
   
       /* ------------------------------------------------------------ */
  -    /**
  -     * @param url
  -     * @return
  -     */
       public static Resource newResource(URL url)
           throws IOException
       {
  @@ -79,10 +73,8 @@
   
       /* ------------------------------------------------------------ */
       /** Construct a resource from a string.
  -     * If the string is not a URL, it is treated as an absolute or
  -     * relative file path.
  -     * @param resource.
  -     * @return
  +     * @param resource A URL or filename.
  +     * @return A Resource object.
        */
       public static Resource newResource(String resource)
           throws MalformedURLException, IOException
  @@ -150,8 +142,6 @@
       /** Construct a system resource from a string.
        * The resource is tried as classloader resource before being
        * treated as a normal resource.
  -     * @param resource.
  -     * @return
        */
       public static Resource newSystemResource(String resource)
           throws IOException
  
  
  
  1.2       +0 -0      
contrib/jetty/src/main/org/mortbay/util/RolloverFileOutputStream.java
  
  Index: RolloverFileOutputStream.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/RolloverFileOutputStream.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RolloverFileOutputStream.java     10 Feb 2002 17:57:45 -0000      1.1
  +++ RolloverFileOutputStream.java     20 Feb 2002 05:33:45 -0000      1.2
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 MortBay Consulting, Sydney
  -// $Id: RolloverFileOutputStream.java,v 1.1 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: RolloverFileOutputStream.java,v 1.2 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -24,7 +24,7 @@
   
   /* ------------------------------------------------------------ */
   /** 
  - * @version $Id: RolloverFileOutputStream.java,v 1.1 2002/02/10 17:57:45 olegnitz 
Exp $
  + * @version $Id: RolloverFileOutputStream.java,v 1.2 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class RolloverFileOutputStream extends FilterOutputStream
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/SingletonList.java
  
  Index: SingletonList.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/SingletonList.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SingletonList.java        10 Feb 2002 17:57:45 -0000      1.2
  +++ SingletonList.java        20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: SingletonList.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: SingletonList.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -15,7 +15,7 @@
    * element is provided for JDK 1.2 JVMs, which do not provide
    * the Collections.singletonList method.
    *
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   public class SingletonList extends AbstractList
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/StringMap.java
  
  Index: StringMap.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/StringMap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StringMap.java    10 Feb 2002 17:57:45 -0000      1.2
  +++ StringMap.java    20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 Mort Bay Consulting, Sydney
  -// $Id: StringMap.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: StringMap.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   package org.mortbay.util;
   
  
  
  
  1.3       +8 -6      contrib/jetty/src/main/org/mortbay/util/StringUtil.java
  
  Index: StringUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/StringUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StringUtil.java   10 Feb 2002 17:57:45 -0000      1.2
  +++ StringUtil.java   20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: StringUtil.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: StringUtil.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  @@ -8,7 +8,12 @@
   // ====================================================================
   /** Fast String Utilities.
    *
  - * @version $Revision: 1.2 $
  + * These string utilities provide both conveniance methods and
  + * performance improvements over most standard library versions. The
  + * main aim of the optimizations is to avoid object creation unless
  + * absolutely required.
  + *
  + * @version $Revision: 1.3 $
    * @author Greg Wilkins (gregw)
    */
   public class StringUtil
  @@ -53,7 +58,6 @@
       /* ------------------------------------------------------------ */
       /**
        * fast lower case conversion. Only works on ascii (not unicode)
  -     * @author Jesper J�rgensen, Caput
        * @param s the string to convert
        * @return a lower case version of s
        */
  @@ -112,9 +116,7 @@
       }
   
       /* ------------------------------------------------------------ */
  -    /** Remove single or double quotes. 
  -     * @param s 
  -     * @return 
  +    /** Remove single or double quotes.
        */
       public static String unquote(String s)
       {
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/TestCase.java
  
  Index: TestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/TestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestCase.java     10 Feb 2002 17:57:45 -0000      1.2
  +++ TestCase.java     20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 MortBay Consulting, Sydney
  -// $Id: TestCase.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: TestCase.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -33,7 +33,7 @@
    * </pre>
    *
    * @see org.mortbay.util.Code
  - * @version $Id: TestCase.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: TestCase.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins
    */
   public class TestCase
  
  
  
  1.3       +4 -4      contrib/jetty/src/main/org/mortbay/util/ThreadPool.java
  
  Index: ThreadPool.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/ThreadPool.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ThreadPool.java   10 Feb 2002 17:57:45 -0000      1.2
  +++ ThreadPool.java   20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: ThreadPool.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: ThreadPool.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   
   package org.mortbay.util;
  @@ -26,7 +26,7 @@
    * Derived implementations may specialize getJob(timeout) to
    * obtain jobs from other sources without queing overheads.
    *
  - * @version $Id: ThreadPool.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: ThreadPool.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Juancarlo A�ez <[EMAIL PROTECTED]>
    * @author Greg Wilkins <[EMAIL PROTECTED]>
    */
  @@ -97,7 +97,7 @@
   
       /* ------------------------------------------------------------ */
       /** 
  -     * @return 
  +     * @return The name of the ThreadPool.
        */
       public String getName()
       {
  @@ -106,7 +106,7 @@
   
       /* ------------------------------------------------------------ */
       /** 
  -     * @param name 
  +     * @param name Name of the ThreadPool to use when naming Threads.
        */
       public void setName(String name)
       {
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/ThreadedServer.java
  
  Index: ThreadedServer.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/ThreadedServer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ThreadedServer.java       10 Feb 2002 17:57:45 -0000      1.2
  +++ ThreadedServer.java       20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ===========================================================================
   // Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
  -// $Id: ThreadedServer.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: ThreadedServer.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ---------------------------------------------------------------------------
   
   package org.mortbay.util;
  @@ -26,7 +26,7 @@
    * The properties THREADED_SERVER_MIN_THREADS and THREADED_SERVER_MAX_THREADS
    * can be set to control the number of threads created.
    * <P>
  - * @version $Id: ThreadedServer.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: ThreadedServer.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins
    */
   abstract public class ThreadedServer extends ThreadPool
  
  
  
  1.3       +26 -12    contrib/jetty/src/main/org/mortbay/util/URI.java
  
  Index: URI.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/URI.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- URI.java  10 Feb 2002 17:57:45 -0000      1.2
  +++ URI.java  20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 1997 Mort Bay Consulting, Sydney
  -// $Id: URI.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: URI.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   // ========================================================================
   package org.mortbay.util;
   
  @@ -20,7 +20,7 @@
    * <P>UTF8 encoding is used by default for % encoded characters. This
    * may be overridden with the org.mortbay.util.URI.encoding system property.
    * @see UrlEncoded
  - * @version $Id: URI.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: URI.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class URI
  @@ -35,6 +35,7 @@
       private String _host;
       private int _port;
       private String _path;
  +    private String _encodedPath;
       private String _query;
       private UrlEncoded _parameters = new UrlEncoded();
       private boolean _dirty;
  @@ -51,6 +52,7 @@
           _host=uri._host;
           _port=uri._port;
           _path=uri._path;
  +        _encodedPath=uri._encodedPath;
           _query=uri._query;
           _parameters=(UrlEncoded)uri._parameters.clone();
           _dirty=false;
  @@ -99,6 +101,7 @@
                         {
                             state=5;
                             _path="*";
  +                          _encodedPath="*";
                             break;
                         }
                         continue;
  @@ -133,7 +136,8 @@
                         if (c=='?')
                         {
                             // Found query
  -                          _path=decodePath(uri.substring(mark,i));
  +                          _encodedPath=uri.substring(mark,i);
  +                          _path=decodePath(_encodedPath);
                             mark=i+1;
                             state=4;
                             break;
  @@ -147,23 +151,27 @@
               {
                 case 0:
                     _dirty=false;
  -                  _path=_uri;
  +                  _encodedPath=_uri;
  +                  _path=decodePath(_encodedPath);
                     break;
                     
                 case 1:
                     _dirty=true;
  -                  _path="/";
  +                  _encodedPath="/";
  +                  _path=_encodedPath;
                     _host=uri.substring(mark);
                     break;
                     
                 case 2:
                     _dirty=true;
  -                  _path="/";
  +                  _encodedPath="/";
  +                  _path=_encodedPath;
                     _port=Integer.parseInt(uri.substring(mark));
                     break;
                 case 3:
                     _dirty=(mark==maxi);
  -                  _path=decodePath(uri.substring(mark));
  +                  _encodedPath=uri.substring(mark);
  +                  _path=decodePath(_encodedPath);
                     break;
                     
                 case 4:
  @@ -266,12 +274,22 @@
       }
       
       /* ------------------------------------------------------------ */
  +    /** Get the encoded uri path.
  +     * @return the URI path
  +     */
  +    public String getEncodedPath()
  +    {
  +        return _encodedPath;
  +    }
  +    
  +    /* ------------------------------------------------------------ */
       /** Set the uri path.
        * @param path the URI path
        */
       public void setPath(String path)
       {
           _path=path;
  +        _encodedPath=encodePath(_path);
           _dirty=true;
       }
       
  @@ -429,7 +447,7 @@
                           buf.append(_port);
                       }
                   }
  -                encodePath(buf,_path);
  +                buf.append(_encodedPath);
   
                   if (_query!=null && _query.length()>0)
                   {
  @@ -646,8 +664,6 @@
       /* ------------------------------------------------------------ */
       /** Return the parent Path.
        * Treat a URI like a directory path and return the parent directory.
  -     * @param p 
  -     * @return 
        */
       public static String parentPath(String p)
       {
  @@ -662,8 +678,6 @@
       /* ------------------------------------------------------------ */
       /** Strip parameters from a path.
        * Return path upto any semicolon parameters.
  -     * @param path 
  -     * @return 
        */
       public static String stripPath(String path)
       {
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/UnixCrypt.java
  
  Index: UnixCrypt.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/UnixCrypt.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UnixCrypt.java    10 Feb 2002 17:57:45 -0000      1.2
  +++ UnixCrypt.java    20 Feb 2002 05:33:45 -0000      1.3
  @@ -27,7 +27,7 @@
   /** Unix Crypt.
    * Implements the one way cryptography used by Unix systems for
    * simple password protection.
  - * @version $Id: UnixCrypt.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: UnixCrypt.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class UnixCrypt extends Object
  
  
  
  1.3       +0 -0      contrib/jetty/src/main/org/mortbay/util/UrlEncoded.java
  
  Index: UrlEncoded.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/UrlEncoded.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UrlEncoded.java   10 Feb 2002 17:57:45 -0000      1.2
  +++ UrlEncoded.java   20 Feb 2002 05:33:45 -0000      1.3
  @@ -1,5 +1,5 @@
   // =========================================================================== 
  -// $Id: UrlEncoded.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  +// $Id: UrlEncoded.java,v 1.3 2002/02/20 05:33:45 janb Exp $
   package org.mortbay.util;
   
   import java.io.PrintStream;
  @@ -26,7 +26,7 @@
    * get operations are not protected from concurrent updates.
    *
    * @see java.net.URLEncoder
  - * @version $Id: UrlEncoded.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
  + * @version $Id: UrlEncoded.java,v 1.3 2002/02/20 05:33:45 janb Exp $
    * @author Greg Wilkins (gregw)
    */
   public class UrlEncoded extends MultiMap
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to