svn commit: r1682432 - in /maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun: AntRunMojo.java MavenLogger.java

[ol...@apache.org]

Author: olamy
Date: Fri May 29 11:54:16 2015
New Revision: 1682432

URL: http://svn.apache.org/r1682432
Log:
Move logs from java.lang.System.out to org.apache.maven.plugin.logging.Log

Added:
    maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java   (with props)
Modified:
    maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java

Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=1682432&r1=1682431&r2=1682432&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Fri May 29 11:54:16 2015
@@ -250,9 +250,7 @@ public class AntRunMojo
             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() )
             {

Added: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java?rev=1682432&view=auto
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java (added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java Fri May 29 11:54:16 2015
@@ -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;
+        }
+    }
+
+}

Propchange: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenLogger.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision