Closer

BruceEckel · BruceEckel · commit da9b88f2c63b · 2015-04-28T23:58:26.000-07:00
diff --git a/Ant-Common.xml b/Ant-Common.xml
@@ -19,41 +19,23 @@
      <attribute name="dirpath" default=""/>
      <attribute name="arguments" default=""/>
      <attribute name="failOnError" default="true"/>
+     <attribute name="timeOut" default="15000"/>
      <sequential>
         <echo>Running: ${chapter} @{cls}</echo>
         <java
           classname="@{cls}"
           classpath="${java.class.path};${basedir};${basedir}/.."
           dir="@{dirpath}"
           failonerror="@{failOnError}"
-          fork="true">
+          fork="true"
+          timeout="@{timeOut}">
             <arg line="@{arguments}"/>
         </java>
         <echo>Finished: ${chapter} @{cls}</echo>
         <echo>--------------------------------</echo>
      </sequential>
   </macrodef>
 
-  <macrodef name="jrunp">
-     <attribute name="cls" default="NOT SET"/>
-     <attribute name="dirpath" default="NOT SET"/>
-     <attribute name="arguments" default=""/>
-     <attribute name="failOnError" default="true"/>
-     <sequential>
-        <echo>Running: ${chapter} @{cls}</echo>
-        <java
-         classname="@{cls}"
-         classpath="${java.class.path};${basedir};${basedir}/.."
-         dir="@{dirpath}"
-         failonerror="@{failOnError}"
-         fork="true">
-          <arg value="@{arguments}"/>
-       </java>
-        <echo>Finished: ${chapter} @{cls}</echo>
-        <echo>--------------------------------</echo>
-     </sequential>
-  </macrodef>
-
   <condition property="version1.8">
     <equals arg1="1.8" arg2="${ant.java.version}"/>
   </condition>
