cvs commit: xml-cocoon/src/org/apache/cocoon/servlet CocoonServlet.java ServletLogTarget.java

[bloritsch]

bloritsch    01/03/07 07:53:53

  Modified:    src/org/apache/cocoon/servlet Tag: xml-cocoon2
                        CocoonServlet.java
  Removed:     src/org/apache/cocoon/servlet Tag: xml-cocoon2
                        ServletLogTarget.java
  Log:
  Since LogKit officially has a ServletOutputLogTarget, the
  existence of this one is redundant.  I made sure the functionality
  is the same.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.69  +4 -3      
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
  retrieving revision 1.1.4.68
  retrieving revision 1.1.4.69
  diff -u -r1.1.4.68 -r1.1.4.69
  --- CocoonServlet.java        2001/02/27 15:57:10     1.1.4.68
  +++ CocoonServlet.java        2001/03/07 15:53:50     1.1.4.69
  @@ -51,6 +51,7 @@
   import org.apache.log.Priority;
   import org.apache.log.Category;
   import org.apache.log.output.FileOutputLogTarget;
  +import org.apache.log.output.ServletOutputLogTarget;
   import org.apache.log.LogTarget;
   
   /**
  @@ -61,7 +62,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.4.68 $ $Date: 2001/02/27 15:57:10 $
  + * @version CVS $Revision: 1.1.4.69 $ $Date: 2001/03/07 15:53:50 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -182,7 +183,7 @@
        *
        * @throws ServletException
        */
  -     protected String getExtraClassPath(final ServletContext context) 
  +     protected String getExtraClassPath(final ServletContext context)
        throws ServletException {
            String extraClassPath = getInitParameter("extra-classpath");
            if ((extraClassPath != null) && (extraClassPath.trim().equals("") 
== false)) {
  @@ -233,7 +234,7 @@
               final Category cocoonCategory = LogKit.createCategory("cocoon", 
logPriority);
               this.log = LogKit.createLogger(cocoonCategory, new LogTarget[] {
                          new FileOutputLogTarget(path),
  -                       new ServletLogTarget(context, Priority.ERROR)
  +                       new ServletOutputLogTarget(context, Priority.ERROR)
                   });
           } catch (Exception e) {
               LogKit.log("Could not set up Cocoon Logger, will use screen 
instead", e);