From 8753a9ece2273a4cdee9c35a06e8feb901279301 Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Fri, 13 Mar 2015 16:20:08 -0300 Subject: [PATCH] Move logs from java.lang.System.out to org.apache.maven.plugin.logging.Log --- .../maven/plugin/antrun/AntRunMojo.java | 4 +- .../maven/plugin/antrun/MavenLogger.java | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java diff --git a/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java b/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java index 70b7cb87e4..5405d30eef 100644 --- a/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java +++ b/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java @@ -250,9 +250,7 @@ public void execute() ProjectHelper.configureProject( antProject, antBuildFile ); antProject.init(); - DefaultLogger antLogger = new DefaultLogger(); - antLogger.setOutputPrintStream( System.out ); - antLogger.setErrorPrintStream( System.err ); + DefaultLogger antLogger = new MavenLogger( getLog() ); if ( getLog().isDebugEnabled() ) { diff --git a/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java b/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java new file mode 100644 index 0000000000..1491c57779 --- /dev/null +++ b/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java @@ -0,0 +1,65 @@ +package org.apache.maven.plugin.antrun; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.PrintStream; + +import org.apache.maven.plugin.logging.Log; +import org.apache.tools.ant.DefaultLogger; +import org.apache.tools.ant.Project; + +/** + * Redirects build events from {@link DefaultLogger} to {@link Log}. + */ +public class MavenLogger + extends DefaultLogger +{ + + private final Log log; + + public MavenLogger( Log log ) + { + this.log = log; + } + + protected void printMessage( final String message, final PrintStream stream, final int priority ) + { + switch ( priority ) + { + case Project.MSG_ERR: + log.error( message ); + break; + case Project.MSG_WARN: + log.warn( message ); + break; + case Project.MSG_INFO: + log.info( message ); + break; + case Project.MSG_DEBUG: + case Project.MSG_VERBOSE: + log.debug( message ); + break; + default: + log.info( message ); + break; + } + } + +}