- * - * Constants for the message levels are in Project.java. The order of the - * levels, from least to most verbose, is MSG_ERR, MSG_WARN, MSG_INFO, - * MSG_VERBOSE, MSG_DEBUG. The default message level for DefaultLogger is - * Project.MSG_ERR. - * - * @param level the logging level for the logger. - */ - public void setMessageOutputLevel( int level ) - { - this.msgOutputLevel = level; - } - - /** - * Set the output stream to which this logger is to send its output. - * - * @param output the output stream for the logger. - */ - public void setOutputPrintStream( PrintStream output ) - { - this.out = new PrintStream( output, true ); - } - - /** - * Prints whether the build succeeded or failed, and any errors the occured - * during the build. - * - * @param event Description of Parameter - */ - public void buildFinished( BuildEvent event ) - { - Throwable error = event.getException(); - StringBuffer message = new StringBuffer(); - - if( error == null ) - { - message.append( StringUtils.LINE_SEP ); - message.append( "BUILD SUCCESSFUL" ); - } - else - { - message.append( StringUtils.LINE_SEP ); - message.append( "BUILD FAILED" ); - message.append( StringUtils.LINE_SEP ); - - if( Project.MSG_VERBOSE <= msgOutputLevel || - !( error instanceof TaskException ) ) - { - message.append( StringUtils.getStackTrace( error ) ); - } - else - { - if( error instanceof TaskException ) - { - message.append( error.toString() ).append( StringUtils.LINE_SEP ); - } - else - { - message.append( error.getMessage() ).append( StringUtils.LINE_SEP ); - } - } - } - message.append( StringUtils.LINE_SEP ); - message.append( "Total time: " - + formatTime( System.currentTimeMillis() - startTime ) ); - - String msg = message.toString(); - if( error == null ) - { - out.println( msg ); - } - else - { - err.println( msg ); - } - log( msg ); - } - - public void buildStarted( BuildEvent event ) - { - startTime = System.currentTimeMillis(); - } - - public void messageLogged( BuildEvent event ) - { - // Filter out messages based on priority - if( event.getPriority() <= msgOutputLevel ) - { - - StringBuffer message = new StringBuffer(); - // Print out the name of the task if we're in one - if( event.getTask() != null ) - { - String name = event.getTask().getName(); - - if( !emacsMode ) - { - String label = "[" + name + "] "; - for( int i = 0; i < ( LEFT_COLUMN_SIZE - label.length() ); i++ ) - { - message.append( " " ); - } - message.append( label ); - } - } - - message.append( event.getMessage() ); - String msg = message.toString(); - if( event.getPriority() != Project.MSG_ERR ) - { - out.println( msg ); - } - else - { - err.println( msg ); - } - log( msg ); - } - } - - public void targetFinished( BuildEvent event ) - { - } - - public void targetStarted( BuildEvent event ) - { - if( Project.MSG_INFO <= msgOutputLevel ) - { - String msg = StringUtils.LINE_SEP + event.getTarget().getName() + ":"; - out.println( msg ); - log( msg ); - } - } - - public void taskFinished( BuildEvent event ) - { - } - - public void taskStarted( BuildEvent event ) - { - } - - /** - * Empty implementation which allows subclasses to receive the same output - * that is generated here. - * - * @param message Description of Parameter - */ - protected void log( String message ) - { - } - -} diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/NoBannerLogger.java b/proposal/myrmidon/src/main/org/apache/tools/ant/NoBannerLogger.java deleted file mode 100644 index 341e953f0..000000000 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/NoBannerLogger.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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. - */ -package org.apache.tools.ant; - -/** - * Extends DefaultLogger to strip out empty targets. - * - * @author Peter Donald - */ -public class NoBannerLogger extends DefaultLogger -{ - private final static String lSep = System.getProperty( "line.separator" ); - - protected String targetName; - - public void messageLogged( BuildEvent event ) - { - - if( event.getPriority() > msgOutputLevel || - null == event.getMessage() || - "".equals( event.getMessage().trim() ) ) - { - return; - } - - if( null != targetName ) - { - out.println( lSep + targetName + ":" ); - targetName = null; - } - - super.messageLogged( event ); - } - - public void targetFinished( BuildEvent event ) - { - targetName = null; - } - - public void targetStarted( BuildEvent event ) - { - targetName = event.getTarget().getName(); - } -} diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/DefaultLogger.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/DefaultLogger.java deleted file mode 100644 index 05ebd2154..000000000 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/DefaultLogger.java +++ /dev/null @@ -1,228 +0,0 @@ -/* - * 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. - */ -package org.apache.tools.ant; - -import java.io.PrintStream; -import org.apache.tools.ant.util.StringUtils; -import org.apache.myrmidon.api.TaskException; - -/** - * Writes build event to a PrintStream. Currently, it only writes which targets - * are being executed, and any messages that get logged. - * - * @author RT - */ -public class DefaultLogger implements BuildLogger -{ - private static int LEFT_COLUMN_SIZE = 12; - protected int msgOutputLevel = Project.MSG_ERR; - private long startTime = System.currentTimeMillis(); - - protected boolean emacsMode = false; - protected PrintStream err; - - protected PrintStream out; - - protected static String formatTime( long millis ) - { - long seconds = millis / 1000; - long minutes = seconds / 60; - - if( minutes > 0 ) - { - return Long.toString( minutes ) + " minute" - + ( minutes == 1 ? " " : "s " ) - + Long.toString( seconds % 60 ) + " second" - + ( seconds % 60 == 1 ? "" : "s" ); - } - else - { - return Long.toString( seconds ) + " second" - + ( seconds % 60 == 1 ? "" : "s" ); - } - - } - - /** - * Set this logger to produce emacs (and other editor) friendly output. - * - * @param emacsMode true if output is to be unadorned so that emacs and - * other editors can parse files names, etc. - */ - public void setEmacsMode( boolean emacsMode ) - { - this.emacsMode = emacsMode; - } - - /** - * Set the output stream to which this logger is to send error messages. - * - * @param err the error stream for the logger. - */ - public void setErrorPrintStream( PrintStream err ) - { - this.err = new PrintStream( err, true ); - } - - /** - * Set the msgOutputLevel this logger is to respond to. Only messages with a - * message level lower than or equal to the given level are output to the - * log.
- * - * Constants for the message levels are in Project.java. The order of the - * levels, from least to most verbose, is MSG_ERR, MSG_WARN, MSG_INFO, - * MSG_VERBOSE, MSG_DEBUG. The default message level for DefaultLogger is - * Project.MSG_ERR. - * - * @param level the logging level for the logger. - */ - public void setMessageOutputLevel( int level ) - { - this.msgOutputLevel = level; - } - - /** - * Set the output stream to which this logger is to send its output. - * - * @param output the output stream for the logger. - */ - public void setOutputPrintStream( PrintStream output ) - { - this.out = new PrintStream( output, true ); - } - - /** - * Prints whether the build succeeded or failed, and any errors the occured - * during the build. - * - * @param event Description of Parameter - */ - public void buildFinished( BuildEvent event ) - { - Throwable error = event.getException(); - StringBuffer message = new StringBuffer(); - - if( error == null ) - { - message.append( StringUtils.LINE_SEP ); - message.append( "BUILD SUCCESSFUL" ); - } - else - { - message.append( StringUtils.LINE_SEP ); - message.append( "BUILD FAILED" ); - message.append( StringUtils.LINE_SEP ); - - if( Project.MSG_VERBOSE <= msgOutputLevel || - !( error instanceof TaskException ) ) - { - message.append( StringUtils.getStackTrace( error ) ); - } - else - { - if( error instanceof TaskException ) - { - message.append( error.toString() ).append( StringUtils.LINE_SEP ); - } - else - { - message.append( error.getMessage() ).append( StringUtils.LINE_SEP ); - } - } - } - message.append( StringUtils.LINE_SEP ); - message.append( "Total time: " - + formatTime( System.currentTimeMillis() - startTime ) ); - - String msg = message.toString(); - if( error == null ) - { - out.println( msg ); - } - else - { - err.println( msg ); - } - log( msg ); - } - - public void buildStarted( BuildEvent event ) - { - startTime = System.currentTimeMillis(); - } - - public void messageLogged( BuildEvent event ) - { - // Filter out messages based on priority - if( event.getPriority() <= msgOutputLevel ) - { - - StringBuffer message = new StringBuffer(); - // Print out the name of the task if we're in one - if( event.getTask() != null ) - { - String name = event.getTask().getName(); - - if( !emacsMode ) - { - String label = "[" + name + "] "; - for( int i = 0; i < ( LEFT_COLUMN_SIZE - label.length() ); i++ ) - { - message.append( " " ); - } - message.append( label ); - } - } - - message.append( event.getMessage() ); - String msg = message.toString(); - if( event.getPriority() != Project.MSG_ERR ) - { - out.println( msg ); - } - else - { - err.println( msg ); - } - log( msg ); - } - } - - public void targetFinished( BuildEvent event ) - { - } - - public void targetStarted( BuildEvent event ) - { - if( Project.MSG_INFO <= msgOutputLevel ) - { - String msg = StringUtils.LINE_SEP + event.getTarget().getName() + ":"; - out.println( msg ); - log( msg ); - } - } - - public void taskFinished( BuildEvent event ) - { - } - - public void taskStarted( BuildEvent event ) - { - } - - /** - * Empty implementation which allows subclasses to receive the same output - * that is generated here. - * - * @param message Description of Parameter - */ - protected void log( String message ) - { - } - -} diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/NoBannerLogger.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/NoBannerLogger.java deleted file mode 100644 index 341e953f0..000000000 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/NoBannerLogger.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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. - */ -package org.apache.tools.ant; - -/** - * Extends DefaultLogger to strip out empty targets. - * - * @author Peter Donald - */ -public class NoBannerLogger extends DefaultLogger -{ - private final static String lSep = System.getProperty( "line.separator" ); - - protected String targetName; - - public void messageLogged( BuildEvent event ) - { - - if( event.getPriority() > msgOutputLevel || - null == event.getMessage() || - "".equals( event.getMessage().trim() ) ) - { - return; - } - - if( null != targetName ) - { - out.println( lSep + targetName + ":" ); - targetName = null; - } - - super.messageLogged( event ); - } - - public void targetFinished( BuildEvent event ) - { - targetName = null; - } - - public void targetStarted( BuildEvent event ) - { - targetName = event.getTarget().getName(); - } -}