donaldp 01/12/22 16:10:10
Modified:
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend
JDependTask.java
Log:
Task never used watchdog so why fake it ?
Revision Changes Path
1.9 +5 -29
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JDependTask.java 2001/12/22 22:01:58 1.8
+++ JDependTask.java 2001/12/23 00:10:10 1.9
@@ -16,7 +16,7 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.ExecuteWatchdog;
+import org.apache.myrmidon.framework.exec.ExecuteWatchdog;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
@@ -265,14 +265,7 @@
}
else
{
- ExecuteWatchdog watchdog = createWatchdog();
- exitValue = executeAsForked( commandline, watchdog );
- // null watchdog means no timeout, you'd better not check with
null
- if( watchdog != null )
- {
- //info will be used in later version do nothing for now
- //wasKilled = watchdog.killedProcess();
- }
+ exitValue = executeAsForked( commandline );
}
// if there is an error/failure and that it should halt, stop
everything otherwise
@@ -302,7 +295,7 @@
* @exception TaskException Description of Exception
*/
// JL: comment extracted from JUnitTask (and slightly modified)
- public int executeAsForked( CommandlineJava commandline, ExecuteWatchdog
watchdog )
+ public int executeAsForked( CommandlineJava commandline )
throws TaskException
{
// if not set, auto-create the ClassPath from the project
@@ -336,7 +329,8 @@
commandline.createArgument().setValue( f.getPath() );
}
- Execute execute = new Execute( new LogStreamHandler( this,
Project.MSG_INFO, Project.MSG_WARN ), watchdog );
+ Execute execute =
+ new Execute( new LogStreamHandler( this, Project.MSG_INFO,
Project.MSG_WARN ) );
execute.setCommandline( commandline.getCommandline() );
if( getDir() != null )
{
@@ -421,24 +415,6 @@
}
jdepend.analyze();
return SUCCESS;
- }
-
- /**
- * @return <tt>null</tt> if there is a timeout value, otherwise the
watchdog
- * instance.
- * @exception TaskException Description of Exception
- */
- protected ExecuteWatchdog createWatchdog()
- throws TaskException
- {
-
- return null;
- /*
- * if (getTimeout() == null){
- * return null;
- * }
- * return new ExecuteWatchdog(getTimeout().intValue());
- */
}
public static class FormatAttribute extends EnumeratedAttribute
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
