--- a/buildframework/helium/config/signaling_config_default.ant.xml	Wed Oct 13 16:27:55 2010 +0800
+++ b/buildframework/helium/config/signaling_config_default.ant.xml	Wed Oct 13 16:31:27 2010 +0800
@@ -159,8 +159,8 @@
 
     <hlm:signalInput id="testAlertsSignalInput" failbuild="now" />
 
-    <hlm:signalInput id="fotaSignalInput" failbuild="never">
-        <hlm:notifierListRef refid="fotaSignalInput" />
+    <hlm:signalInput id="fotaSignalInput" failbuild="defer">
+        <hlm:notifierListRef refid="defaultFailNotifier" />
     </hlm:signalInput>
 
     <hlm:signalInput id="archivePolicyErrorSignalInput" failbuild="never">
@@ -185,6 +185,21 @@
             </notifierInput>
         </signalNotifierInput>
     </hlm:signalListenerConfig>
+    
+    <hlm:signalListenerConfig id="prepWorkAreaSignal2" target="cleanup-work-area" message="Errors during Preparing Work Area">
+        <hlm:targetCondition>
+            <hlm:hasSeverity severity="error" file="${build.cache.log.dir}/signals/${build.id}_cleanup_work_area.log.status.xml" />
+        </hlm:targetCondition>
+        <signalNotifierInput>
+            <signalInput refid="prepWorkAreaSignalInput" />
+            <notifierInput>
+                <fileset dir="${build.cache.log.dir}" >
+                    <include name="signals/${build.id}_cleanup_work_area*" />
+                    <include name="${build.id}_cleanup_work_area*" />
+                </fileset>
+            </notifierInput>
+        </signalNotifierInput>
+    </hlm:signalListenerConfig>
 
     <hlm:signalListenerConfig id="preparationSignal" target="prep-fail" message="Errors during preparation">
         <targetCondition>
@@ -290,15 +305,15 @@
         </signalNotifierInput>
     </hlm:signalListenerConfig>
 
-    <hlm:signalListenerConfig id="mattiSignal" target="matti-test" message="ATS MATTI creation had errors">
+    <hlm:signalListenerConfig id="tDriverSignal" target="tdriver-test" message="ATS TDRIVER creation had errors">
         <targetCondition>
-            <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_matti.log.status.xml" />
+            <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_tdriver.log.status.xml" />
         </targetCondition>
         <signalNotifierInput>
             <signalInput refid="atsSignalInput" />
             <notifierInput>
                 <fileset dir="${build.log.dir}" >
-                    <include name="**/${build.id}_matti*" />
+                    <include name="**/${build.id}_tdriver*" />
                 </fileset>
             </notifierInput>
         </signalNotifierInput>
@@ -322,7 +337,7 @@
 
     <hlm:signalListenerConfig id="signalValidatePolicyInvalidOrMissing" target="render-validate-policy" message="Policy file validation had errors">
         <targetCondition>
-            <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_validate-policy.summary.status.xml" />
+            <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_validate-policy.summary.xml.status.xml" />
         </targetCondition>
         <signalNotifierInput>
             <signalInput refid="signalValidatePolicyInvalidOrMissingInput" />