--- a/buildframework/helium/tools/logging/logging.ant.xml	Mon Sep 06 09:57:24 2010 +0100
+++ b/buildframework/helium/tools/logging/logging.ant.xml	Mon Sep 13 13:11:19 2010 +0800
@@ -23,10 +23,9 @@
 <!--* @package framework -->
 <project name="logging" xmlns:hlm="http://www.nokia.com/helium">
     <description>
-        Targets related to log parsing, rendaring, upload to diamonds etc.
+        Targets related to log parsing, rendering, upload to diamonds etc.
     </description>
     
-    
     <!-- This is where the preparation build logs are stored.
     @type string
     @scope private
@@ -63,7 +62,6 @@
     -->
     <property name="localisation.log.dir" location="${build.log.dir}/localisation"/>    
     
-    
     <!-- Macro to record content to a separate log file without recording in the main log. -->
     <macrodef name="recordStartMacro" uri="http://www.nokia.com/helium">
         <attribute name="name"/>
@@ -117,7 +115,6 @@
                 <filelist dir="${build.cache.log.dir}" files="temp_ant_build.log"/>                        
             </concat>
             <delete file="${build.cache.log.dir}/temp_ant_build.log" failonerror="false"/>
-            <echo>End of filtering @{log} for passwords</echo>
         </sequential>
     </macrodef>
     
@@ -221,7 +218,7 @@
                     <metadatafilterset refid="@{filterref}" />
                 </hlm:antmetadatainput>
             </hlm:metadatarecord>
-            <hlm:generateBuildStatus dbfile="@{database}" output-dir="${build.cache.log.dir}/signals" file="@{name}" />
+            <hlm:generateBuildStatus dbfile="@{database}" output-dir="${build.cache.log.dir}/signals" file="${build.cache.log.dir}/@{name}" />
             <if>
                 <isset property="@{phase}.log.dir" />
                 <then>
@@ -305,7 +302,7 @@
     
     <!-- Merges all XML log files ending in ".log2.xml" in the build log directory
     into a single summary log file. -->
-    <target name="log-merge"  unless="metadata.enable">
+    <target name="log-merge">
         <mkdir dir="${build.log.dir}"/>
         <dependset>
             <srcfileset dir="${build.log.dir}" includes="**/${build.id}*.log.xml"/>