193051
need ability to "retest" from CruiseControl
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 2bcf898..56f11c9 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -176,6 +176,55 @@
 
     </project>
 
+    <project name="retest-wtp-R1.5-M">
+        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+        <modificationset quietperiod="120">
+            <cvs
+                tag="R1_5_maintenance"
+                module="releng" />
+
+        </modificationset>
+
+        <schedule interval="${time.VeryVeryLongTime}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_retest.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+
+                <!-- this "M" label should be changed to "R" once maintenance release
+                    is warming up for its "R"elease.
+                -->
+                <property
+                    name="buildType"
+                    value="M" />
+
+                <property
+                    name="buildId"
+                    value="1.5.5" />
+                <property
+                    name="buildBranch"
+                    value="R1.5" />
+
+                <property
+                    name="checkoutprojectname"
+                    value="${project.name}" />
+
+
+                <property
+                    name="mapVersionTag"
+                    value="R1_5_maintenance" />
+
+
+            </ant>
+        </schedule>
+
+    </project>
+
 
     <project name="wtp-R2.0-I">
         <!-- Defines where cruise looks for changes, to decide whether to run the build -->
@@ -218,7 +267,48 @@
         </schedule>
 
     </project>
+    <project name="retest-wtp-R2.0-I">
+        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+        <modificationset quietperiod="120">
+            <cvs module="releng" />
+            <cvs module="releng-jsf" />
+            <cvs module="releng.dali" />
 
+        </modificationset>
+
+        <schedule interval="${time.VeryVeryLongTime}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_retest.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+                <property
+                    name="buildType"
+                    value="I" />
+                <property
+                    name="buildBranch"
+                    value="R2.0" />
+                <property
+                    name="checkoutprojectname"
+                    value="${project.name}" />
+
+                <property
+                    name="mapVersionTag"
+                    value="HEAD" />
+                <property
+                    name="build.distribution"
+                    value="wtp" />
+
+
+            </ant>
+        </schedule>
+
+    </project>
+    
 
     <project name="wtp-R2.0-N">
 
@@ -254,7 +344,40 @@
         </schedule>
 
     </project>
+    <project name="retest-wtp-R2.0-N">
 
+        <schedule interval="${time.VeryVeryLongTime}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_retest.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+                <property
+                    name="buildType"
+                    value="N" />
+                <!-- in this context, buildBranch is simply a label -->
+                <property
+                    name="buildBranch"
+                    value="R2.0" />
+                <property
+                    name="mapVersionTag"
+                    value="HEAD" />
+                <property
+                    name="build.distribution"
+                    value="wtp" />
+                <property
+                    name="build.trial"
+                    value="true" />
+
+
+            </ant>
+        </schedule>
+
+    </project>
 
     <project name="wtp-R2.0-S">
         <!-- Defines where cruise looks for changes, to decide whether to run the build -->
@@ -304,6 +427,55 @@
 
     </project>
 
+    <project name="retest-wtp-R2.0-S">
+        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+        <modificationset quietperiod="120">
+            <cvs module="releng" />
+            <cvs module="releng-jsf" />
+            <cvs module="releng.dali" />
+
+        </modificationset>
+
+        <schedule interval="${time.VeryVeryLongTime}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_retest.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+                <property
+                    name="buildType"
+                    value="S" />
+                <property
+                    name="buildId"
+                    value="2.0RC4" />
+                <property
+                    name="buildBranch"
+                    value="R2.0" />
+                <property
+                    name="checkoutprojectname"
+                    value="${project.name}" />
+
+                <property
+                    name="mapVersionTag"
+                    value="HEAD" />
+                <property
+                    name="build.distribution"
+                    value="wtp" />
+                <property
+                    name="build.pack-all-in-one"
+                    value="true" />
+
+            </ant>
+        </schedule>
+
+
+    </project>
+
+
     <project name="wtp-buildTools-R2.0-T">
         <!-- Defines where cruise looks for changes, to decide whether to run the build -->
         <modificationset quietperiod="120">
diff --git a/releng.control/cc_project_retest.xml b/releng.control/cc_project_retest.xml
new file mode 100644
index 0000000..0f66d4f
--- /dev/null
+++ b/releng.control/cc_project_retest.xml
@@ -0,0 +1,96 @@
+<project name="cc_project_build" default="Build" basedir=".">
+
+    
+    <!-- = = = standard properties pattern = = = -->
+    <!-- 
+    	Note to be cross-platform, "environment variables" are only appropriate for 
+        some variables, e.g. ones we set, since properties are case sensitive, even if 
+        the environment variables on your operating system are not, e.g. it will 
+        be ${env.Path} not ${env.PATH} on Windows -->
+    <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" />
+
+    <!-- load standard properties for production environment -->
+    <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+    <!-- = = = end standard properties pattern = = = -->
+
+    
+    <!-- 
+    	If not set yet, by "caller", then we set checkoutprojectname here. 
+    	Normally this is literally the project name from CruiseControl, but 
+    	if running "standalone", we make this simplifying assumption.
+    -->
+    <property name="build.distribution" value="wtp" />
+    <property name="buildBranch" value="R2.0" />
+    <property name="buildType" value="I" />
+    <property name="checkoutprojectname" value="${build.distribution}-${buildBranch}-${buildType}" />
+
+    <target name="Build">
+
+        <!-- set main builder file name, based on distribution, buildBranch and build type -->
+        <property name="wtpBuilder"
+                  value="${env.BUILD_HOME}/build-node/checkout/${checkoutprojectname}/releng.wtpbuilder/build.xml" />
+
+       
+
+        <!-- do not clean previous build for re-rest 
+        <antcall target="clean" />
+	-->
+
+
+
+        <!-- check out fresh set of appropriate files  -->
+        <!-- this is to make sure maps and builders are correct, but also to 
+			 make sure the cruisecontrol triggered "diffs" are accurate next 
+			 time around -->
+
+	<!-- do need to checkout builders for just re-test since stored in "retest-wtp" directory -->
+        <ant antfile="checkout.xml">
+            <property name="checkoutprojectname" value="${checkoutprojectname}"/>
+        </ant>
+	
+
+        <!-- no need to build, create site, or do initial upload for re-test --> 
+        <!-- build and create preliminary download site files -->
+
+        <!-- <ant antfile="${wtpBuilder}" target="build" /> -->
+
+        <!-- <ant antfile="${wtpBuilder}" target="site" /> -->
+        
+        <!-- upload what we have so far -->
+        <!-- <ant antfile="${wtpBuilder}" target="upload" /> -->
+
+
+        <!-- test and create test summary files -->
+        <ant antfile="${wtpBuilder}" target="test" />
+
+        <ant antfile="${wtpBuilder}" target="site" />
+        <!-- upload what we have so far -->
+        <ant antfile="${wtpBuilder}" target="upload" />
+
+    </target>
+
+
+
+    <target name="clean" depends="check.clean" if="doClean">
+        <delete dir="${env.BUILD_HOME}/build-${checkoutprojectname}"
+                failonerror="false" />
+        <delete dir="${env.BUILD_HOME}/test-${checkoutprojectname}"
+                failonerror="false" />
+    </target>
+
+
+    <target name="check.clean">
+        <condition property="doClean">
+            <equals arg1="${build.clean}" arg2="true" />
+        </condition>
+    </target>
+
+
+</project>
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 2a5783b..b315061 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -1,17 +1,17 @@
 <project name="checkout" default="checkout" basedir=".">
 
     <!-- = = = standard properties pattern = = = -->
-    <!-- 
-    	Note to be cross-platform, "environment variables" are only appropriate for 
-        some variables, e.g. ones we set, since properties are case sensitive, even if 
-        the environment variables on your operating system are not, e.g. it will 
+    <!--
+        Note to be cross-platform, "environment variables" are only appropriate for
+        some variables, e.g. ones we set, since properties are case sensitive, even if
+        the environment variables on your operating system are not, e.g. it will
         be ${env.Path} not ${env.PATH} on Windows -->
     <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.
+    <!--
+        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" />
 
@@ -32,7 +32,7 @@
 
 
 
-    <echo message="checkoutprojectname: ${checkoutprojectname}" />
+        <echo message="checkoutprojectname: ${checkoutprojectname}" />
     <target name="checkout" if="checkoutprojectname">
         <!-- we always check and init the builder -->
         <antcall target="getwtpbuilder" />
@@ -42,13 +42,16 @@
 
     <target name="wtp-R2.0-N">
 
-        <!-- 
-        	do not need, since we do nightly builds "on demand" only
+        <!--
+                do not need, since we do nightly builds "on demand" only
             <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${wst}" dest="${codir}" />
             <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${jst}" dest="${codir}" />
         -->
 
     </target>
+  <target name="retest-wtp-R2.0-N">
+     <antcall target="wtp-wtp-R2.0-N" />  
+  </target>
 
     <target name="wtp-R2.0-S">
         <cvs quiet="true"
@@ -62,7 +65,10 @@
              dest="${codir}"
              tag="HEAD" />
     </target>
-
+  <target name="retest-wtp-R2.0-S">
+     <antcall target="wtp-R2.0-S" />  
+  </target>
+	
     <target name="wtp-R2.0-I">
         <cvs quiet="true"
              cvsRoot="${mapCvsRoot}"
@@ -75,7 +81,10 @@
              dest="${codir}"
              tag="HEAD" />
     </target>
-
+  <target name="retest-wtp-R2.0-I">
+     <antcall target="wtp-R2.0-I" />  
+  </target>
+	
     <target name="wtp-R2.0-R">
         <cvs quiet="true"
              cvsRoot="${mapCvsRoot}"
@@ -88,6 +97,10 @@
              dest="${codir}"
              tag="HEAD" />
     </target>
+    <target name="retest-wtp-R2.0-R">
+    	 <antcall target="wtp-R2.0-R" />  
+    </target>
+
 
     <target name="wtp-R1.5-M">
         <cvs quiet="true"
@@ -96,6 +109,10 @@
              dest="${codir}"
              tag="R1_5_maintenance" />
     </target>
+  <target name="retest-wtp-R1.5-M">
+     <antcall target="wtp-R1.5-M" />  
+  </target>	
+	
     <target name="jem-R1.5-M">
         <cvs quiet="true"
              cvsRoot="${mapCvsRoot}"
@@ -111,13 +128,6 @@
              tag="R1_5_maintenance_patches" />
     </target>
 
-    <target name="wtp-thirdparty-R2.0-T">
-        <cvs quiet="true"
-             cvsRoot="${mapCvsRoot}"
-             package="releng-thirdparty"
-             dest="${codir}"
-             tag="HEAD" />
-    </target>
     <target name="wtp-buildTools-R2.0-T">
         <cvs quiet="true"
              cvsRoot="${mapCvsRoot}"
@@ -126,6 +136,7 @@
              tag="HEAD" />
     </target>
 
+
     <target name="wst-R2.0-I">
         <cvs quiet="true"
              cvsRoot="${mapCvsRoot}"
@@ -134,16 +145,19 @@
              tag="HEAD" />
     </target>
 
-    <!-- 
+
+
+
+    <!--
         The order of execution of these three worker targets
-        is critical, check.clean, initBuilders, and 
+        is critical, check.clean, initBuilders, and
         then getwtpbuilder.
     -->
     <target name="getwtpbuilder"
             depends="check.clean,initBuilders"
             if="doClean">
-        <!-- This is a special property file, that contains (only) the 
-        value of wtpBuilderVersion. Then, that version of the builder 
+        <!-- This is a special property file, that contains (only) the
+        value of wtpBuilderVersion. Then, that version of the builder
         is fetched to control the rest of the build -->
         <property file="${codir}/${releng}/maps/build.cfg" />
         <delete dir="${codir}/releng.wtpbuilder"
@@ -166,7 +180,7 @@
         </condition>
     </target>
 
-    <target name="initBuilders" if="doClean">
+    <target name="initBuilders" depends="check.clean" if="doClean">
         <echo message="Version tag for ${releng}: ${mapVersionTag}" />
         <cvs quiet="true"
              cvsRoot="${mapCvsRoot}"