--- a/buildframework/helium/tools/preparation/password.ant.xml	Wed Oct 28 14:39:48 2009 +0000
+++ b/buildframework/helium/tools/preparation/password.ant.xml	Wed Dec 23 19:29:07 2009 +0200
@@ -28,6 +28,7 @@
     <!-- Retrieve the ATS password from the .netrc file and store it into ats.password property. -->
     <target name="ats-password">
         <hlm:netrcPasswordMacro output-prop="ats.password" result-prop="ats.password.available" type="ats"/>
+        <hlm:logreplace regexp="ats.password"/>
     </target>
     
     <!-- Retrieve the ATS username from the .netrc file and store it into ats.username property. -->
@@ -38,6 +39,7 @@
     <!-- Retrieve the unix password from the .netrc file and store it into unix.password property. -->
     <target name="unix-password">
         <hlm:netrcPasswordMacro output-prop="unix.password" result-prop="unix.password.available" type="synergy"/>
+        <hlm:logreplace regexp="${unix.password}"/>
     </target>
     
     <!-- Retrieve the unix username from the .netrc file and store it into unix.username property. -->
@@ -47,7 +49,7 @@
     
     <!-- Ask for unix login using UI. -->
     <target name="get-unix-password" depends="unix-username,unix-password">
-        <hlm:filterRecordStartMacro/>
+        <hlm:filterRecordStartMacro pattern="${unix.password}" category="unix"/>
         <if>
             <not>
                 <equals arg1="${unix.password.available}" arg2="0"/>
@@ -61,17 +63,19 @@
                 <property name="unix.password.available" value="1"/>
             </then>
         </if>
-        <hlm:filterRecordStopMacro pattern="${unix.password}"/>
+        <hlm:filterRecordStopMacro/>
     </target>
     
     <!-- Retrieve the GRACE password from the .netrc file and store it into release.grace.password property. -->
     <target name="grace-password" if="release.grace">
         <hlm:netrcPasswordMacro output-prop="release.grace.password" result-prop="grace.password.available" type="grace"/>
+        <hlm:logreplace regexp="${release.grace.password}"/>
     </target>
     
     <!-- Retrieve the NOE password from the .netrc file and store it into noe.password property. -->
     <target name="noe-password">
         <hlm:netrcPasswordMacro output-prop="noe.password" result-prop="noe.password.available" type="noe"/>
+        <hlm:logreplace regexp="${noe.password}"/>
         <if>
             <not>
                 <isset property="noe.password"/>
@@ -88,28 +92,19 @@
     <!-- Retrieve the notes password from the .netrc file and store it into notes.password property. -->    
     <target name="notes-password">
         <hlm:netrcPasswordMacro output-prop="release.notes.password" result-prop="notes.password.available" type="notes"/>
+        <hlm:logreplace regexp="${release.notes.password}" />
     </target>
 
     <!-- Retrieve the ccm password from the .netrc file and store it into ccm.password property. 
     Requires ccm.enabled tobe set to 'true' to work.-->
-    <target name="ccm-password">
-        <if>
-            <isset property="run.ccm"/>
-            <then>
-                <hlm:netrcPasswordMacro output-prop="ccm.password.rc" result-prop="ccm.password.available" type="synergy"/>
-            </then>
-        </if>
+    <target name="ccm-password" if="run.ccm">
+        <hlm:netrcPasswordMacro output-prop="ccm.password.rc" result-prop="ccm.password.available" type="synergy"/>
     </target>
     
     <!-- Retrieve the ccm username from the .netrc file and store it into ccm.username property.
     Requires ccm.enabled tobe set to 'true' to work. -->
-    <target name="ccm-username">
-        <if>
-            <isset property="run.ccm"/>
-            <then>
-                <hlm:netrcUsernameMacro output-prop="ccm.login.rc" result-prop="ccm.username.available" type="synergy"/>
-            </then>
-        </if>
+    <target name="ccm-username" if="run.ccm">
+        <hlm:netrcUsernameMacro output-prop="ccm.login.rc" result-prop="ccm.username.available" type="synergy"/>
     </target>
     
     <!--
@@ -124,7 +119,7 @@
         <if>
             <isset property="run.ccm"/>
             <then>
-                <hlm:filterRecordStartMacro/>
+                <hlm:filterRecordStartMacro pattern="${ccm.password.rc}" category="ccm"/>
                 <if>
                     <not>
                         <and>
@@ -158,9 +153,8 @@
                         <property name="ccm.user.password" value="${ccm.password.rc}"/>
                     </else>
                 </if>
-        
                 <antcall target="ccm-check"/>
-                <hlm:filterRecordStopMacro pattern="${ccm.user.password}"/>
+                <hlm:filterRecordStopMacro/>
             </then>
             <!--echo> ccm not enabled so not get password</echo-->
         </if>