continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1656156 - in /continuum/trunk: continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ continuum-core/src/main/java/org/apache/maven/continuum/execution/
Date Sat, 31 Jan 2015 03:33:52 GMT
Author: batkinson
Date: Sat Jan 31 03:33:51 2015
New Revision: 1656156

URL: http://svn.apache.org/r1656156
Log:
Eliminated remaining references to CommandLineUtils outside of shell helper.

Modified:
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java?rev=1656156&r1=1656155&r2=1656156&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java
(original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java
Sat Jan 31 03:33:51 2015
@@ -37,7 +37,6 @@ import org.codehaus.plexus.commandline.E
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.CommandLineException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -275,7 +274,7 @@ public abstract class AbstractBuildExecu
 
             return new ContinuumAgentBuildExecutionResult( output, result.getExitCode() );
         }
-        catch ( CommandLineException e )
+        catch ( Exception e )
         {
             if ( e.getCause() instanceof InterruptedException )
             {
@@ -288,12 +287,6 @@ public abstract class AbstractBuildExecu
                         "is not in your path.", e );
             }
         }
-        catch ( Exception e )
-        {
-            throw new ContinuumAgentBuildExecutorException(
-                "Error while executing shell command. " + "The most common error is that
'" + executable + "' " +
-                    "is not in your path.", e );
-        }
     }
 
     protected Properties getContinuumSystemProperties( Project project )

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=1656156&r1=1656155&r2=1656156&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
Sat Jan 31 03:33:51 2015
@@ -37,7 +37,6 @@ import org.codehaus.plexus.commandline.E
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.CommandLineException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -289,7 +288,7 @@ public abstract class AbstractBuildExecu
 
             return new ContinuumBuildExecutionResult( output, result.getExitCode() );
         }
-        catch ( CommandLineException e )
+        catch ( Exception e )
         {
             if ( e.getCause() instanceof InterruptedException )
             {
@@ -302,12 +301,6 @@ public abstract class AbstractBuildExecu
                         "is not in your path.", e );
             }
         }
-        catch ( Exception e )
-        {
-            throw new ContinuumBuildExecutorException(
-                "Error while executing shell command. " + "The most common error is that
'" + executable + "' " +
-                    "is not in your path.", e );
-        }
     }
 
     private String getRelativePath( File chrootDir, File workingDirectory, String groupId
)



Mime
View raw message