donaldp 02/02/06 04:45:18
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec
Execute2.java
Log:
Pass in ExecManager via constructor
Revision Changes Path
1.6 +3 -11
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java
Index: Execute2.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Execute2.java 3 Feb 2002 10:26:21 -0000 1.5
+++ Execute2.java 6 Feb 2002 12:45:18 -0000 1.6
@@ -17,8 +17,6 @@
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 @@
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 @@
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 );
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
