From 06ea1d271a3c3557c120e36c2df913050317cb53 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Wed, 6 Feb 2002 12:45:18 +0000 Subject: [PATCH] Pass in ExecManager via constructor git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271177 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/exec/Execute2.java | 14 +++----------- .../apache/tools/ant/taskdefs/exec/Execute2.java | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java index 5827961b7..c35b9237c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java @@ -17,8 +17,6 @@ import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.factorys.ExecManagerFactory; -import org.apache.myrmidon.services.ServiceException; import org.apache.tools.ant.types.Commandline; /** @@ -37,8 +35,9 @@ public class Execute2 private long m_timeout; private ExecManager m_execManager; - public Execute2( ExecManager execManager ) + public Execute2( final ExecManager execManager ) { + m_execManager = execManager; } public void setTimeout( final long timeout ) @@ -107,24 +106,17 @@ public class Execute2 try { - final ExecManagerFactory factory = new ExecManagerFactory(); - final ExecManager manager = (ExecManager)factory.createService(); - final String[] command = m_command.getCommandline(); final ExecMetaData metaData = new ExecMetaData( command, m_environment, m_workingDirectory, m_newEnvironment ); - return manager.execute( metaData, m_handler, m_timeout ); + return m_execManager.execute( metaData, m_handler, m_timeout ); } catch( final ExecException ee ) { throw new TaskException( ee.getMessage(), ee ); } - catch( final ServiceException se ) - { - throw new TaskException( se.getMessage(), se ); - } } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute2.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute2.java index 5827961b7..c35b9237c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute2.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute2.java @@ -17,8 +17,6 @@ import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.factorys.ExecManagerFactory; -import org.apache.myrmidon.services.ServiceException; import org.apache.tools.ant.types.Commandline; /** @@ -37,8 +35,9 @@ public class Execute2 private long m_timeout; private ExecManager m_execManager; - public Execute2( ExecManager execManager ) + public Execute2( final ExecManager execManager ) { + m_execManager = execManager; } public void setTimeout( final long timeout ) @@ -107,24 +106,17 @@ public class Execute2 try { - final ExecManagerFactory factory = new ExecManagerFactory(); - final ExecManager manager = (ExecManager)factory.createService(); - final String[] command = m_command.getCommandline(); final ExecMetaData metaData = new ExecMetaData( command, m_environment, m_workingDirectory, m_newEnvironment ); - return manager.execute( metaData, m_handler, m_timeout ); + return m_execManager.execute( metaData, m_handler, m_timeout ); } catch( final ExecException ee ) { throw new TaskException( ee.getMessage(), ee ); } - catch( final ServiceException se ) - { - throw new TaskException( se.getMessage(), se ); - } } }