--- a/common/build.test.xml	Fri Jun 11 15:01:48 2010 +0100
+++ b/common/build.test.xml	Mon Jun 14 12:36:59 2010 +0100
@@ -199,20 +199,54 @@
     </target>
     
     <target name="sf-start-ats">
-        <if><available file="${ats.drive}/start.cmd"/>        
+        <if><equals arg1="${sf.spec.ats.version}" arg2="ats3"/>
+            <then>
+                <if><available file="${ats.drive}/start.cmd"/>  
+                    <then>
+                        <forget>
+                            <exec executable="cmd" dir="${ats.drive}" failonerror="true">
+                                <arg value="/c"/>
+                                <arg value="start"/>
+                                <arg value='"ATS3 STAF"'/>
+                                <arg value="/D"/>
+                                <arg value="."/>
+                                <arg value="/MAX"/>
+                                <arg value="run.cmd"/>
+                            </exec>
+                        </forget>
+                        <echo message="Waiting for 10 seconds for the ATS Worker to start......."/>
+                        <sleep seconds="10"/>
+                    </then>
+                </if>
+            </then>
+        </if>
+        <if><equals arg1="${sf.spec.ats.version}" arg2="ats4"/>
             <then>
                 <forget>
                     <exec executable="cmd" dir="${ats.drive}" failonerror="true">
                         <arg value="/c"/>
                         <arg value="start"/>
-                        <arg value='"ATS3 STAF"'/>
+                        <arg value='"ATS4 Agent"'/>
                         <arg value="/D"/>
                         <arg value="."/>
                         <arg value="/MAX"/>
-                        <arg value="run.cmd"/>
+                        <arg value="startAgent.cmd"/>
                     </exec>
                 </forget>
-                <echo message="Waiting for 10 seconds for the ATS Worker to start......."/>
+                <echo message="Waiting for 10 seconds for the ATS4 Agent(s) to start......."/>
+                <sleep seconds="10"/>
+                <forget>
+                    <exec executable="cmd" dir="${ats.drive}" failonerror="true">
+                        <arg value="/c"/>
+                        <arg value="start"/>
+                        <arg value='"ATS4 Engine"'/>
+                        <arg value="/D"/>
+                        <arg value="."/>
+                        <arg value="/MAX"/>
+                        <arg value="startEngine.cmd"/>
+                    </exec>
+                </forget>
+                <echo message="Waiting for 10 seconds for the ATS4 Engine to start......."/>
                 <sleep seconds="10"/>
             </then>
         </if>