improve daily cleanup scripts
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 8849dfd..9da4e03 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -12,15 +12,13 @@
         on your operating system are not, e.g. it will be ${env.Path}
         not ${env.PATH} on Windows
     -->
-    <property
-        environment="env"/>
+    <property environment="env"/>
     <!--
         Let users override standard properties, if desired. If
         directory, file, or some properties do not exist, then standard
         properties will be used.
     -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
+    <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
 
     <!-- = = = end standard properties pattern = = = -->
     <fail
@@ -33,8 +31,7 @@
     <echo
         level="debug"
         message="keyCfgFile: ${keyCfgFile}"/>
-    <property
-        file="${keyCfgFile}"/>
+    <property file="${keyCfgFile}"/>
     <fail
         unless="builderVersion"
         message="Could not get builderVersion. Probably could not checkout build.cfg?"/>
@@ -73,8 +70,7 @@
         value="false"/>
 
     <!-- main -->
-    <target
-        name="runbuild">
+    <target name="runbuild">
         <dirname
             file="${ant.file}"
             property="scripts.build.dir"/>
@@ -83,8 +79,7 @@
             value="${scripts.build.dir}/../../.."/>
 
         <!-- invoke runEclipseBuild to build -->
-        <antcall
-            target="runEclipseBuild"/>
+        <antcall target="runEclipseBuild"/>
     </target>
     <target
         name="build"
@@ -138,13 +133,11 @@
                   ${eclipse.pdebuild.templates} points to the templates folder. You can use this
                   instead of the more error prone manual "pde.build.scripts"
               -->
-        <echo
-            message="eclipse.pdebuild.scripts: ${eclipse.pdebuild.scripts}"/>
+        <echo message="eclipse.pdebuild.scripts: ${eclipse.pdebuild.scripts}"/>
         <echo
             level="debug"
             message="buildBranch: ${buildBranch}"/>
-        <fail
-            unless="buildBranch"/>
+        <fail unless="buildBranch"/>
         <ant
             antfile="build.xml"
             dir="${eclipse.pdebuild.scripts}">
@@ -183,24 +176,19 @@
             we just check if both base, and our wtp specific one are
             current, if either is not, we'll get them both
         -->
-        <condition
-            property="basebuilderlocal">
+        <condition property="basebuilderlocal">
             <and>
-                <available
-                    file="${pde.builder.path}"/>
+                <available file="${pde.builder.path}"/>
                 <!--
                     should we check explicitly for "true" instead of
                     just isset? either should work for this case, but
                     which is better ant style?
                 -->
-                <isset
-                    property="wtpBuilderPresent"/>
+                <isset property="wtpBuilderPresent"/>
             </and>
         </condition>
-        <echo
-            message="basebuilderlocal: ${basebuilderlocal}"/>
-        <echo
-            message="wtpBuilderPresent: ${wtpBuilderPresent}"/>
+        <echo message="basebuilderlocal: ${basebuilderlocal}"/>
+        <echo message="wtpBuilderPresent: ${wtpBuilderPresent}"/>
     </target>
     <!--
         1)init -> set buildBranch, and create label.properties
@@ -212,7 +200,7 @@
     -->
     <target
         name="getBaseBuilder"
-        depends="init,checkBaseBuilder"
+        depends="init,checkBaseBuilder,touchBaseBuilder"
         unless="basebuilderlocal">
         <!-- ***  change the repo info -->
         <property
@@ -224,10 +212,8 @@
             best of cases, will simply be unstable, so we'll fail if we
             forgot to specify it
         -->
-        <fail
-            unless="eclipse.builder.version"/>
-        <mkdir
-            dir="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
+        <fail unless="eclipse.builder.version"/>
+        <mkdir dir="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
         <cvs
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -235,13 +221,23 @@
             package="${eclipse.builder}"
             dest="${basebuilder.path}"
             tag="${eclipse.builder.version}"/>
-        <fail
-            unless="wtpBuildTools.url"/>
+        <fail unless="wtpBuildTools.url"/>
 
         <!-- now add our WTP base builder if not there -->
-        <antcall
-            target="getWTPBaseBuilder"/>
+        <antcall target="getWTPBaseBuilder"/>
     </target>
+
+	<!-- 
+	touch base builder when used (but not fetched), so cleanup scripts that 
+	look for "modified time" will know it is still being used. Modified times are sometimes 
+	used instead of access times in scripts since even ls or find will change access times 
+	-->
+    <target
+        name="touchBaseBuilder"
+        if="basebuilderlocal">
+        <touch file="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
+    </target>
+	
     <!--
         check wtpBulderPresent property if false, download WTP builder
         file org.eclipse.wtp.releng.tools_version.jar into baseBuiders
@@ -260,18 +256,14 @@
         org.eclipse.wtp.releng.tools_version.jar exist in basebuilder
         set wtpBuilderPresent property
     -->
-    <target
-        name="checkWTPBaseBuilder">
-        <condition
-            property="wtpBuilderPresent">
-            <available
-                file="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"/>
+    <target name="checkWTPBaseBuilder">
+        <condition property="wtpBuilderPresent">
+            <available file="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"/>
         </condition>
     </target>
 
     <!-- set buildBranch, and create label.properties-->
-    <target
-        name="init">
+    <target name="init">
         <condition
             property="buildBranch"
             value="R3.0.1">
@@ -349,12 +341,9 @@
             file="${wtp.builder.home}/build.properties"
             match=" *$"
             replace=""/>
-        <property
-            file="${wtp.builder.home}/build.properties"/>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <property
-            file="${buildDirectory}/label.properties"/>
+        <property file="${wtp.builder.home}/build.properties"/>
+        <ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
+        <property file="${buildDirectory}/label.properties"/>
         <!--
             fetch the HEAD stream of all projects if build type
             specified as N
@@ -371,8 +360,7 @@
             may not always be an "sdk" component, but we often generate
             calls to it)
         -->
-        <condition
-            property="doBuild">
+        <condition property="doBuild">
             <available
                 file="${wtp.builder.home}/components/${component}"
                 type="dir"/>
@@ -381,8 +369,7 @@
     <target
         name="runEclipseBuild"
         if="buildId">
-        <fail
-            unless="eclipse.builder.version"/>
+        <fail unless="eclipse.builder.version"/>
         <fail
             message="dependency.properties must be specified by distribution script"
             unless="dependency.properties"/>
@@ -423,98 +410,55 @@
             we convert them to system (environment) properties, which is
             where PDE expects to find them
         -->
-        <echo
-            message="JavaSE-1.6=${JavaSE-1.6}"/>
-        <echo
-            message="J2SE-1.5=${J2SE-1.5}"/>
-        <echo
-            message="J2SE-1.4=${J2SE-1.4}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}"/>
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/buildworkspaces"/>
+        <echo message="JavaSE-1.6=${JavaSE-1.6}"/>
+        <echo message="J2SE-1.5=${J2SE-1.5}"/>
+        <echo message="J2SE-1.4=${J2SE-1.4}"/>
+        <mkdir dir="${buildDirectory}/${buildLabel}"/>
+        <mkdir dir="${buildDirectory}/${buildLabel}/buildworkspaces"/>
         <java
             taskname="build-${build.distribution}-${component}"
             jar="${eclipse.launcher}"
             fork="true"
             failonerror="${eclipseBuildFailOnError}">
-            <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-            <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromcodebuild.log"/>
-            <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}"/>
-            <jvmarg
-                value="-Dosgi.os=${env.BASEOS}"/>
-            <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}"/>
-            <jvmarg
-                value="-Dbuild.home=${env.BUILD_HOME}"/>
-            <jvmarg
-                value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
-            <jvmarg
-                value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
-            <jvmarg
-                value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
-            <jvmarg
-                value="-DJavaSE-1.6=${JavaSE-1.6}"/>
-            <jvmarg
-                value="-DJ2SE-1.5=${J2SE-1.5}"/>
-            <jvmarg
-                value="-DJ2SE-1.4=${J2SE-1.4}"/>
-            <jvmarg
-                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
-            <jvmarg
-                value="-DbuildType=${buildType}"/>
-            <jvmarg
-                value="-DdependencyFileLocation=${dependencyFileLocation}"/>
+            <jvmarg value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
+            <jvmarg value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromcodebuild.log"/>
+            <jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
+            <jvmarg value="-Dosgi.os=${env.BASEOS}"/>
+            <jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
+            <jvmarg value="-Dbuild.home=${env.BUILD_HOME}"/>
+            <jvmarg value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
+            <jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
+            <jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
+            <jvmarg value="-DJavaSE-1.6=${JavaSE-1.6}"/>
+            <jvmarg value="-DJ2SE-1.5=${J2SE-1.5}"/>
+            <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}"/>
+            <jvmarg value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
+            <jvmarg value="-DbuildType=${buildType}"/>
+            <jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/>
 
-            <jvmarg
-                value="-DbuildId=${buildId}"/>
-            <jvmarg
-                value="-DmapVersionTag=${mapVersionTag}"/>
-            <jvmarg
-                value="-Declipse.builder.version=${eclipse.builder.version}"/>
-            <jvmarg
-                value="-Declipse.builder=${eclipse.builder}"/>
-            <jvmarg
-                value="-Dprojectname=${projectname}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}"/>
-            <jvmarg
-                value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}"/>
-            <jvmarg
-                value="-Dreleng.jsdt-mapVersionTag=${releng.jsdt-mapVersionTag}"/>
-            <jvmarg
-                value="-Dwtp.builder.home=${wtp.builder.home}"/>
-            <jvmarg
-                value="-Dbuild.distribution=${build.distribution}"/>
-            <jvmarg
-                value="-Dcomponent=${component}"/>
-            <jvmarg
-                value="-Ddependency.properties=${dependency.properties}"/>
-            <jvmarg
-                value="-DwtpBuildTools.file=${wtpBuildTools.file}"/>
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <jvmarg
-                value="-DSKIP_JAR_SIGNING=${SKIP_JAR_SIGNING}"/>
-            <jvmarg
-                value="-DnormalizeJarFiles=${normalizeJarFiles}"/>
-            <jvmarg
-                value="-Dosgi.instance.area=${buildDirectory}/${buildLabel}/buildworkspaces/workspace-runbuild-${component}"/>
-            <arg
-                value="-application"/>
-            <arg
-                value="org.eclipse.ant.core.antRunner"/>
-            <arg
-                value="-buildfile"/>
-            <arg
-                value="${ant.file}"/>
-            <arg
-                value="build"/>
+            <jvmarg value="-DbuildId=${buildId}"/>
+            <jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
+            <jvmarg value="-Declipse.builder.version=${eclipse.builder.version}"/>
+            <jvmarg value="-Declipse.builder=${eclipse.builder}"/>
+            <jvmarg value="-Dprojectname=${projectname}"/>
+            <jvmarg value="-DbuildLabel=${buildLabel}"/>
+            <jvmarg value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}"/>
+            <jvmarg value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}"/>
+            <jvmarg value="-Dreleng.jsdt-mapVersionTag=${releng.jsdt-mapVersionTag}"/>
+            <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}"/>
+            <jvmarg value="-Dbuild.distribution=${build.distribution}"/>
+            <jvmarg value="-Dcomponent=${component}"/>
+            <jvmarg value="-Ddependency.properties=${dependency.properties}"/>
+            <jvmarg value="-DwtpBuildTools.file=${wtpBuildTools.file}"/>
+            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
+            <jvmarg value="-DSKIP_JAR_SIGNING=${SKIP_JAR_SIGNING}"/>
+            <jvmarg value="-DnormalizeJarFiles=${normalizeJarFiles}"/>
+            <jvmarg value="-Dosgi.instance.area=${buildDirectory}/${buildLabel}/buildworkspaces/workspace-runbuild-${component}"/>
+            <arg value="-application"/>
+            <arg value="org.eclipse.ant.core.antRunner"/>
+            <arg value="-buildfile"/>
+            <arg value="${ant.file}"/>
+            <arg value="build"/>
         </java>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/dependency/build.xml b/releng.wtpbuilder/scripts/dependency/build.xml
index 7f9bea0..18f83dc 100644
--- a/releng.wtpbuilder/scripts/dependency/build.xml
+++ b/releng.wtpbuilder/scripts/dependency/build.xml
@@ -48,26 +48,21 @@
     <target
         name="default"
         description="This script get a library from a remote repository and stores it in a local cache.">
-        <condition
-            property="dependency.download.file">
+        <condition property="dependency.download.file">
             <or>
                 <not>
-                    <isset
-                        property="dependency.autodownload"/>
+                    <isset property="dependency.autodownload"/>
                 </not>
                 <and>
-                    <isset
-                        property="dependency.autodownload"/>
+                    <isset property="dependency.autodownload"/>
                     <equals
                         arg1="${dependency.autodownload}"
                         arg2="true"/>
                 </and>
             </or>
         </condition>
-        <antcall
-            target="get"/>
-        <antcall
-            target="checkAutoDownload"/>
+        <antcall target="get"/>
+        <antcall target="checkAutoDownload"/>
     </target>
 
 	<!-- - - - - - - - - - - - - - - - - - 
@@ -76,18 +71,37 @@
     <target
         name="get"
         if="dependency.download.file">
-        <mkdir
-            dir="${local.cache.dir}"/>
+        <mkdir dir="${local.cache.dir}"/>
         <available
             file="${local.cache.dir}/${dependency.file}"
             property="local.cache.file.exists"/>
         <available
             file="${local.cache.dir}/${dependency.repo}"
             property="local.cache.repo.exists"/>
-        <antcall
-            target="download"/>
-        <antcall
-            target="downloadrepo"/>
+        <antcall target="download"/>
+        <antcall target="downloadrepo"/>
+    </target>
+
+       <!-- 
+       touch prereq when used (but not fetched), so cleanup scripts that 
+       look for "modified time" will know it is still being used. Modified times are sometimes 
+       used instead of access times in scripts since even ls or find will change access times 
+       -->
+    <target
+        name="touchDownload"
+        if="local.cache.file.exists">
+        <touch file="${local.cache.dir}/${dependency.file}"/>
+    </target>
+
+       <!-- 
+       touch prereq when used (but not fetched), so cleanup scripts that 
+       look for "modified time" will know it is still being used. Modified times are sometimes 
+       used instead of access times in scripts since even ls or find will change access times 
+       -->
+    <target
+        name="touchRepo"
+        if="local.cache.repo.exists">
+        <touch file="${local.cache.dir}/${dependency.repo}"/>
     </target>
 
     <target
@@ -108,14 +122,11 @@
             dest="${local.cache.dir}/${dependency.file}"
             ignoreerrors="true"/>
 
-        <condition
-            property="download.from.mirror">
+        <condition property="download.from.mirror">
             <and>
-                <isset
-                    property="dependency.releng.url"/>
+                <isset property="dependency.releng.url"/>
                 <not>
-                    <available
-                        file="${local.cache.dir}/${dependency.file}"/>
+                    <available file="${local.cache.dir}/${dependency.file}"/>
                 </not>
             </and>
         </condition>
@@ -132,14 +143,11 @@
             dest="${local.cache.dir}/${dependency.repo}"
             ignoreerrors="true"/>
 
-        <condition
-            property="download.from.mirror">
+        <condition property="download.from.mirror">
             <and>
-                <isset
-                    property="dependency.releng.url"/>
+                <isset property="dependency.releng.url"/>
                 <not>
-                    <available
-                        file="${local.cache.dir}/${dependency.repo}"/>
+                    <available file="${local.cache.dir}/${dependency.repo}"/>
                 </not>
             </and>
         </condition>
@@ -151,10 +159,8 @@
     <target
         name="downloadMirror"
         if="download.from.mirror">
-        <echo
-            message="Using mirror repository: ${main.url.file.exists}"/>
-        <echo
-            message="Using mirror repository: ${dependency.releng.url}"/>
+        <echo message="Using mirror repository: ${main.url.file.exists}"/>
+        <echo message="Using mirror repository: ${dependency.releng.url}"/>
         <get
             verbose="true"
             src="${dependency.releng.url}/${dependency.file}"
@@ -165,108 +171,89 @@
 	<!-- ================================= 
         target: install              
         ================================= -->
-    <target
-        name="install">
+    <target name="install">
         <condition
             property="file.type"
             value="zip">
-            <isfileselected
-                file="${dependency.file}">
+            <isfileselected file="${dependency.file}">
                 <selector>
-                    <filename
-                        name="**/*.zip"/>
+                    <filename name="**/*.zip"/>
                 </selector>
             </isfileselected>
         </condition>
         <condition
             property="file.type"
             value="tgz">
-            <isfileselected
-                file="${dependency.file}">
+            <isfileselected file="${dependency.file}">
                 <selector>
-                    <filename
-                        name="**/*.tar.gz"/>
+                    <filename name="**/*.tar.gz"/>
                 </selector>
             </isfileselected>
         </condition>
         <condition
             property="file.type"
             value="tgz">
-            <isfileselected
-                file="${dependency.file}">
+            <isfileselected file="${dependency.file}">
                 <selector>
-                    <filename
-                        name="**/*.tgz"/>
+                    <filename name="**/*.tgz"/>
                 </selector>
             </isfileselected>
         </condition>
         <condition
             property="file.type"
             value="tar">
-            <isfileselected
-                file="${dependency.file}">
+            <isfileselected file="${dependency.file}">
                 <selector>
-                    <filename
-                        name="**/*.tar"/>
+                    <filename name="**/*.tar"/>
                 </selector>
             </isfileselected>
         </condition>
         <condition
             property="file.type"
             value="map">
-            <isfileselected
-                file="${dependency.file}">
+            <isfileselected file="${dependency.file}">
                 <selector>
-                    <filename
-                        name="**/*.map"/>
+                    <filename name="**/*.map"/>
                 </selector>
             </isfileselected>
         </condition>
         <condition
             property="file.type"
             value="jar">
-            <isfileselected
-                file="${dependency.file}">
+            <isfileselected file="${dependency.file}">
                 <selector>
-                    <filename
-                        name="**/*.jar"/>
+                    <filename name="**/*.jar"/>
                 </selector>
             </isfileselected>
         </condition>
 
-        <antcall
-            target="install-${file.type}"/>
+        <antcall target="install-${file.type}"/>
     </target>
 
-    <target
-        name="install-tar">
+    <target name="install-tar">
         <untar
             dest="${install.destination}"
             src="${local.cache.dir}/${dependency.file}"
             overwrite="true"/>
     </target>
-    <target
-        name="install-tgz">
+    <target name="install-tgz">
         <untar
             dest="${install.destination}"
             src="${local.cache.dir}/${dependency.file}"
             compression="gzip"
             overwrite="true"/>
     </target>
-    <target
-        name="install-zip">
+    <target name="install-zip">
 		<!--
     	     We use the exec method for unzip, so we won't fail if a 
     	     prereq can not be unzipped for some reason. See 
     	     https://bugs.eclipse.org/bugs/show_bug.cgi?id=283968 
     	-->
-        <mkdir
-            dir="${install.destination}"/>
+        <mkdir dir="${install.destination}"/>
         <exec
             dir="."
             executable="unzip">
-            <arg
-                line="-o -qq ${local.cache.dir}/${dependency.file} -d ${install.destination}"/>
+            <arg line="-o -qq ${local.cache.dir}/${dependency.file} -d ${install.destination}"/>
         </exec>
 		<!--
         <unzip
@@ -275,23 +262,20 @@
             overwrite="true" />
        -->
     </target>
-    <target
-        name="install-map">
+    <target name="install-map">
         <copy
             todir="${install.destination}"
             file="${local.cache.dir}/${dependency.file}"
             overwrite="true"/>
     </target>
-    <target
-        name="install-jar">
+    <target name="install-jar">
         <copy
             todir="${install.destination}"
             file="${local.cache.dir}/${dependency.file}"
             overwrite="true"/>
     </target>
 
-    <target
-        name="checkDependency">
+    <target name="checkDependency">
         <dirname
             file="${ant.file}"
             property="dependency.dir"/>
@@ -299,14 +283,11 @@
         <copy
             tofile="${installWorkingDirectory}/dependency.${groupId}.xml"
             overwrite="true">
-            <fileset
-                dir="${dependency.dir}">
-                <include
-                    name="template.xml"/>
+            <fileset dir="${dependency.dir}">
+                <include name="template.xml"/>
             </fileset>
         </copy>
-        <echo
-            message="Creating dependency script: ${installWorkingDirectory}/dependency.${groupId}.xml "/>
+        <echo message="Creating dependency script: ${installWorkingDirectory}/dependency.${groupId}.xml "/>
         <replace
             file="${installWorkingDirectory}/dependency.${groupId}.xml"
             value="${groupId}.">
@@ -337,22 +318,16 @@
 
     </target>
 
-    <target
-        name="installDependency">
-        <echo
-            message="grouopId: ${groupId}"/>
-        <echo
-            message="install.destination: ${install.destination}"/>
+    <target name="installDependency">
+        <echo message="grouopId: ${groupId}"/>
+        <echo message="install.destination: ${install.destination}"/>
         <dirname
             file="${ant.file}"
             property="dependency.dir"/>
 
-        <copy
-            tofile="${installWorkingDirectory}/dependency.${groupId}.xml">
-            <fileset
-                dir="${dependency.dir}">
-                <include
-                    name="template.xml"/>
+        <copy tofile="${installWorkingDirectory}/dependency.${groupId}.xml">
+            <fileset dir="${dependency.dir}">
+                <include name="template.xml"/>
             </fileset>
         </copy>
         <replace
@@ -387,18 +362,14 @@
         -->
     </target>
 
-    <target
-        name="installRepo">
+    <target name="installRepo">
         <dirname
             file="${ant.file}"
             property="dependency.dir"/>
 
-        <copy
-            tofile="${installWorkingDirectory}/dependency.${groupId}.xml">
-            <fileset
-                dir="${dependency.dir}">
-                <include
-                    name="template.xml"/>
+        <copy tofile="${installWorkingDirectory}/dependency.${groupId}.xml">
+            <fileset dir="${dependency.dir}">
+                <include name="template.xml"/>
             </fileset>
         </copy>
         <replace