[releng] corrected left over 4.6 repo and formated.

Change-Id: I81cc72c7e0e2678b236ad82253d1a05439543ded

1 files changed, 56 insertions, 34 deletions

diff --git a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
index be32c69cf..64a8871e3 100644
--- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
+++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  Copyright (c) 2016 IBM Corporation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+
+  Contributors:
+  David Williams - initial API and implementation
+-->
+
+<!--
   A utility ant script which gets the Eclipse Platform binary from 'archive' server then uses it to
-  install additional tools and utilities from several p2 repositories: from 'downloads', the 'build' machine, 
-  and one that is on an 'external' site, to actually test that proxies work. (The external one is a "real" project, 
+  install additional tools and utilities from several p2 repositories: from 'downloads', the 'build' machine,
+  and one that is on an 'external' site, to actually test that proxies work. (The external one is a "real" project,
   so this script should not be ran so often to "stress" that site, or throw off their download statistics.)
 
   Hudson jobs (or builds) can call a script like this one from generic ant
@@ -19,9 +30,9 @@
     unless="getBaseBuilderInitialized">
 
     <property environment="env" />
-    
-    <!-- this property file is optional. It's primarily used to set 
-         the "proxy setting preferences" for Eclpse. -->
+
+    <!-- this property file is optional. It's primarily used to set
+      the "proxy setting preferences" for Eclpse. -->
     <property file="platformSpecific.properties" />
 
     <!-- jvm usually set in the platformSpecific.properties file, but if not, we
@@ -77,13 +88,17 @@
       (and make "version" variable)
     -->
     <!-- example of typical value, when "directory" and "label" are different
-    <property name="eclipseBaseDir" value="S-4.6M3-201510291100"/>
-    <property name="eclispeBaseLabel" value="4.6M3"/>
+      <property name="eclipseBaseDir" value="S-4.6M3-201510291100"/>
+      <property name="eclispeBaseLabel" value="4.6M3"/>
     -->
     <!-- for I or M build (which is the unusual case) the build directory and label are the same -->
-    <property name="eclipseBaseDir" value="R-4.6-201606061100"/>
-    <property name="eclispeBaseLabel" value="4.6"/>
-    
+    <property
+      name="eclipseBaseDir"
+      value="R-4.6-201606061100" />
+    <property
+      name="eclispeBaseLabel"
+      value="4.6" />
+
     <property
       name="platformURL"
       value="http://${basedownloadHost}/eclipse/downloads/drops4/${eclipseBaseDir}" />
@@ -96,31 +111,36 @@
       name="platformFile"
       value="eclipse-platform-${eclispeBaseLabel}-linux-gtk-x86_64.tar.gz" />
 
-    <!-- 
-    mavenproperties.properties is produced during the build and contains
-    significant variables (and values) that control the build. In this context, 
-    'eclipserun-repo' is the one we want, so we only have to set it one place.
-    In "post-build" work, WORKSPACE is passed in as the "drop directory" on 
-    the build machine, which is where the properties are written.
+    <!--
+      mavenproperties.properties is produced during the build and contains
+      significant variables (and values) that control the build. In this context,
+      'eclipserun-repo' is the one we want, so we only have to set it one place.
+      In "post-build" work, WORKSPACE is passed in as the "drop directory" on
+      the build machine, which is where the properties are written.
     -->
-    <property file="${WORKSPACE}/mavenproperties.properties"/>
+    <property file="${WORKSPACE}/mavenproperties.properties" />
 
     <echo message="eclipserun-repo: ${eclipserun-repo}" />
-    <!-- 
+    <!--
       just in case mavenproperties.properties did not exist, we also
-      set a default value here. And, for now, at least, we have some 
-      special logic to provide clear message "it was not set". We can 
-      remove that, or change to a "fail" if we find it is always set 
-      as expected in the ways we use it. (such as, may not exist yet, 
-      if this is called too early?) 
+      set a default value here. And, for now, at least, we have some
+      special logic to provide clear message "it was not set". We can
+      remove that, or change to a "fail" if we find it is always set
+      as expected in the ways we use it. (such as, may not exist yet,
+      if this is called too early?)
     -->
-    
-    <condition property="eclipserun-repo-is-set" value="${eclipserun-repo}" else="not set">
-        <isset property="eclipserun-repo" />
+
+    <condition
+      property="eclipserun-repo-is-set"
+      value="${eclipserun-repo}"
+      else="not set">
+      <isset property="eclipserun-repo" />
     </condition>
     <echo message="DEBUG: Before setting default, eclisperun-repo was found to be ${eclipserun-repo-is-set}" />
-    <!-- the following setting is just to make sure "its right" on the next run. Eventually, we'll change this 
-         to a "<fail" element, once confident all paths lead to a correct value -->
+    <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when
+      using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version,
+      such as updates/4.6/ once it is ready.
+    -->
     <property
       name="eclipserun-repo"
       value="http://download.eclipse.org/eclipse/updates/4.7-I-builds/" />
@@ -167,7 +187,7 @@
       name="webtools.feature.version"
       value="1.2.0.v201102200505-21-7w312213311616" />
 
-    <!-- 
+    <!--
       This repo ONLY used for testing proxies. Not production runs.
       Have included this "external" site, just to give a true
       test of the proxies themselves. I got this site from "marketplace"
@@ -200,7 +220,9 @@
       name="folderName"
       value="org.eclipse.releng.basebuilder" />
 
-    <property name="java8vmbindir" value="/shared/common/jdk1.8.0_x64-latest/bin/" />
+    <property
+      name="java8vmbindir"
+      value="/shared/common/jdk1.8.0_x64-latest/bin/" />
     <property
       name="getBaseBuilderInitialized"
       value="true" />
@@ -225,18 +247,18 @@
       src="${platformURL}/${platformFile}"
       usetimestamp="true" />
     <!-- untar is broken in Ant 1.9.4. See https://bz.apache.org/bugzilla/show_bug.cgi?id=56641 -->
-      <untar
+    <untar
       compression="gzip"
       src="${TMP}/${platformFile}"
       dest="${TMP}">
-      </untar>
+    </untar>
     <!-- untar is broken in Ant 1.9.4. See https://bz.apache.org/bugzilla/show_bug.cgi?id=56641
-    <exec
+      <exec
       executable="/bin/tar"
       dir="${TMP}">
       <arg value="-xf" />
       <arg value="${TMP}/${platformFile}" />
-    </exec>
+      </exec>
     -->
     <chmod perm="ugo+x">
       <fileset dir="${TMP}/eclipse">