svn commit: r1303573 - in /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec: AbstractMavenExecutor.java ForkedMavenExecutor.java InvokerMavenExecutor.java

[rfscholte]

Author: rfscholte
Date: Wed Mar 21 21:11:00 2012
New Revision: 1303573

URL: http://svn.apache.org/viewvc?rev=1303573&view=rev
Log:
pulling up equal executeGoals-method

Modified:
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java?rev=1303573&r1=1303572&r2=1303573&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
 Wed Mar 21 21:11:00 2012
@@ -21,6 +21,7 @@ package org.apache.maven.shared.release.
 
 import org.apache.maven.shared.release.ReleaseResult;
 import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 
@@ -36,6 +37,7 @@ public abstract class AbstractMavenExecu
     {
     }
 
+    /** {@inheritDoc} */
     public void executeGoals( File workingDirectory,
                               String goals,
                               boolean interactive,
@@ -47,6 +49,7 @@ public abstract class AbstractMavenExecu
         executeGoals( workingDirectory, goals, new 
DefaultReleaseEnvironment(), interactive, additionalArguments, pomFileName, 
result );
     }
 
+    /** {@inheritDoc} */
     public void executeGoals( File workingDirectory,
                               String goals,
                               boolean interactive,
@@ -57,14 +60,22 @@ public abstract class AbstractMavenExecu
         executeGoals( workingDirectory, goals, new 
DefaultReleaseEnvironment(), interactive, additionalArguments, result );
     }
 
+    /** {@inheritDoc} */
+    public void executeGoals( File workingDirectory, String goals, 
ReleaseEnvironment releaseEnvironment,
+                              boolean interactive, String arguments, 
ReleaseResult result )
+        throws MavenExecutorException
+    {
+        executeGoals( workingDirectory, goals, releaseEnvironment, 
interactive, arguments, null, result );
+    }
+
     protected final Logger getLogger()
     {
         return logger;
     }
 
+    /** {@inheritDoc} */
     public void enableLogging( Logger logger )
     {
         this.logger = logger;
     }
-
-}
+}
\ No newline at end of file

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java?rev=1303573&r1=1303572&r2=1303573&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
 Wed Mar 21 21:11:00 2012
@@ -176,13 +176,6 @@ public class ForkedMavenExecutor
         }
     }
 
-    public void executeGoals( File workingDirectory, String goals, 
ReleaseEnvironment releaseEnvironment,
-                              boolean interactive, String arguments, 
ReleaseResult result )
-        throws MavenExecutorException
-    {
-        executeGoals( workingDirectory, goals, releaseEnvironment, 
interactive, arguments, null, result );
-    }
-
     public void setCommandLineFactory( CommandLineFactory commandLineFactory )
     {
         this.commandLineFactory = commandLineFactory;

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=1303573&r1=1303572&r2=1303573&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
 Wed Mar 21 21:11:00 2012
@@ -427,13 +427,6 @@ public class InvokerMavenExecutor
         }
     }
 
-    public void executeGoals( File workingDirectory, String goals, 
ReleaseEnvironment releaseEnvironment,
-                              boolean interactive, String additionalArguments, 
ReleaseResult result )
-        throws MavenExecutorException
-    {
-        executeGoals( workingDirectory, goals, releaseEnvironment, 
interactive, additionalArguments, null, result );
-    }
-
     private static final class Handler
         implements InvocationOutputHandler
     {