avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pro...@apache.org
Subject cvs commit: avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty PhoenixLogSink.java
Date Thu, 13 Feb 2003 14:16:39 GMT
proyal      2003/02/13 06:16:39

  Modified:    sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty
                        PhoenixLogSink.java
  Log:
  Add full apache license
  
  Revision  Changes    Path
  1.3       +64 -23    avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty/PhoenixLogSink.java
  
  Index: PhoenixLogSink.java
  ===================================================================
  RCS file: /home/cvs/avalon-apps/sevak/src/java/org/apache/avalon/apps/sevak/blocks/jetty/PhoenixLogSink.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PhoenixLogSink.java	10 Jan 2003 00:33:32 -0000	1.2
  +++ PhoenixLogSink.java	13 Feb 2003 14:16:39 -0000	1.3
  @@ -1,16 +1,59 @@
   /*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  - *
  - * This software is published under the terms of the Apache Software License
  - * version 1.1, a copy of which has been included with this distribution in
  - * the LICENSE file.
  - */
  +
  + ============================================================================
  +                   The Apache Software License, Version 1.1
  + ============================================================================
  +
  + Copyright (C) @year@ The Apache Software Foundation. All rights reserved.
  +
  + Redistribution and use in source and binary forms, with or without modifica-
  + tion, are permitted provided that the following conditions are met:
  +
  + 1. Redistributions of  source code must  retain the above copyright  notice,
  +    this list of conditions and the following disclaimer.
  +
  + 2. Redistributions in binary form must reproduce the above copyright notice,
  +    this list of conditions and the following disclaimer in the documentation
  +    and/or other materials provided with the distribution.
  +
  + 3. The end-user documentation included with the redistribution, if any, must
  +    include  the following  acknowledgment:  "This product includes  software
  +    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  +    Alternately, this  acknowledgment may  appear in the software itself,  if
  +    and wherever such third-party acknowledgments normally appear.
  +
  + 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
  +    must not be used to endorse or promote products derived from this  software
  +    without  prior written permission. For written permission, please contact
  +    apache@apache.org.
  +
  + 5. Products  derived from this software may not  be called "Apache", nor may
  +    "Apache" appear  in their name,  without prior written permission  of the
  +    Apache Software Foundation.
  +
  + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  + FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  + APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  + INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  + DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  + OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  + ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  + (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +
  + This software  consists of voluntary contributions made  by many individuals
  + on  behalf of the Apache Software  Foundation. For more  information on the
  + Apache Software Foundation, please see <http://www.apache.org/>.
  +
  +*/
   package org.apache.avalon.apps.sevak.blocks.jetty;
   
  -import org.mortbay.util.LogSink;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +
   import org.mortbay.util.Frame;
   import org.mortbay.util.Log;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.mortbay.util.LogSink;
   
   /**
    * Jetty Log redirection
  @@ -23,7 +66,6 @@
    */
   public class PhoenixLogSink extends AbstractLogEnabled implements LogSink
   {
  -
       /**
        * Stop (unimpled)
        * @throws InterruptedException
  @@ -45,7 +87,7 @@
        * Set Options (un implemented)
        * @param s the options
        */
  -    public void setOptions(String s)
  +    public void setOptions( String s )
       {
       }
   
  @@ -65,27 +107,27 @@
        * @param frame the frame
        * @param time the time
        */
  -    public void log(String type, Object message, Frame frame, long time)
  +    public void log( String type, Object message, Frame frame, long time )
       {
  -        if (type.equals(Log.DEBUG))
  +        if( type.equals( Log.DEBUG ) )
           {
  -            getLogger().info("time=" + time + " message=" + message + " frame=" + frame);
  +            getLogger().info( "time=" + time + " message=" + message + " frame=" + frame
);
           }
  -        else if (type.equals(Log.FAIL))
  +        else if( type.equals( Log.FAIL ) )
           {
  -            getLogger().error("time=" + time + " message=" + message + " frame=" + frame);
  +            getLogger().error( "time=" + time + " message=" + message + " frame=" + frame
);
           }
  -        else if (type.equals(Log.WARN))
  +        else if( type.equals( Log.WARN ) )
           {
  -            getLogger().warn("time=" + time + " message=" + message + " frame=" + frame);
  +            getLogger().warn( "time=" + time + " message=" + message + " frame=" + frame
);
           }
  -        else if (type.equals(Log.ASSERT))
  +        else if( type.equals( Log.ASSERT ) )
           {
  -            getLogger().info("ASSERT time=" + time + " message=" + message + " frame="
+ frame);
  +            getLogger().info( "ASSERT time=" + time + " message=" + message + " frame="
+ frame );
           }
           else
           {
  -            getLogger().info("time=" + time + " message=" + message + " frame=" + frame);
  +            getLogger().info( "time=" + time + " message=" + message + " frame=" + frame
);
           }
       }
   
  @@ -93,9 +135,9 @@
        * Log a message
        * @param message the Message
        */
  -    public void log(String message)
  +    public void log( String message )
       {
  -        getLogger().info(message);
  +        getLogger().info( message );
       }
   
       /**
  @@ -105,5 +147,4 @@
       public void start() throws Exception
       {
       }
  -
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message