diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index 550c5ae..6dd6709 100644
--- a/releng.control/ant.sh
+++ b/releng.control/ant.sh
@@ -1,40 +1,18 @@
 #!/bin/sh
 
-# remember to leave no slashes on filename in source command, 
-# so that users path is used to find it (first)
+# remember to leave no slashes on commonVariations in source command, 
+# so that users path is used to find it (first). But, path on 
+# commonComputedVariables means we expect to execute only our 
+# version
+
 if [ -n $BUILD_INITIALIZED ] 
 then
-   source commonVariations.sh 
+   source commonVariations.shsource 
+   source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource
 fi
 
-export LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
- 
-# for now, swithed to use Java 5 for EMF pre-req EE, 
-# but long term, each test should run according to 
-# what it needs. 
-export JAVA_HOME=${JAVA_5_HOME}
 
-
-# OS specific support.
-sunjvm=false;
-ibmjvm=false;
-javaversion="`uname -a`"
-
-case "$javaversion" in
-  *i686*) sunjvm=true;;
-  *ppc*)  ibmjvm=true;;
-esac
-
-
-
-buildPaths="-DJ2SE-1.4=${bootclasspath} -DJ2SE-1.5=${bootclasspath_15}"
-
-ANT_OPTS="-Xms128m -Xmx768m $buildPaths"
-if $sunjvm ; then
-   ANT_OPTS="-Xms128m -Xmx768m -XX:MaxPermSize=128M -XX:+UseParallelGC $buildPaths"
-fi
 ANT_CMD=${ANT_HOME}/bin/ant
 
-export ANT_OPTS
 exec "$ANT_CMD" "$@"
 
diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index 6ea9485..d7cd1c2 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -4,22 +4,22 @@
 # so that users path is used to find it (first)
 if [ -n $BUILD_INITIALIZED ] 
 then
-   source commonVariations.sh 
+   source commonVariations.shsource 
+   source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource  
 fi
 
-export LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
-
-
-# NOTE: we intentionally use Java 5 here to run Cruise Control
-export JAVA_HOME=${JAVA_5_HOME}
-
-
 port="7000"
+webport="7777"
+# its ok for these to be trivial, just used to prevent 
+# accidental use, no real security needed. 
+trivialUserName="wtp"
+trivialPw="ballad"
 
 rm -fr ./workspace
 
-
 export CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5
 
-sh $CCDIR/cruisecontrol.sh $BUILD_HOME/releng.control/config.xml -jmxport $port -webport 7777 -user wtp -password ballad -cchome $CCDIR 1>out.txt 2>err.txt &
+CCNAME="Webtools builds"
+
+sh $CCDIR/cruisecontrol.sh -configfile $BUILD_HOME/releng.control/cc_config.xml -jmxport $port -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname $CCNAME 1>out.txt 2>err.txt &
 
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
new file mode 100644
index 0000000..901ce54
--- /dev/null
+++ b/releng.control/cc_config.xml
@@ -0,0 +1,464 @@
+<cruisecontrol>
+
+    <!-- 
+        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" toupper="true" />
+
+    <!-- Note: can not quite use "standard properites" pattern, as in ant files, 
+        since for CC, it is an error if a property file does not exist. -->
+
+    <!-- remember, our logDir must be same as logdir specified in CC's web.xml file  -->
+    <property
+        name="logDir"
+        value="${env.LOG_DIR}/${project.name}" />
+
+
+    <property
+        name="time.tenMinutes"
+        value="600" />
+
+    <property
+        name="time.oneHour"
+        value="3600" />
+
+    <property
+        name="time.VeryVeryLongTime"
+        value="31536000" />
+
+    <plugin
+        name="log"
+        dir="${logDir}"
+        encoding="ISO-8859-1" />
+
+    <plugin
+        name="currentbuildstatuslistener"
+        file="${logDir}/buildstatus.html" />
+
+    <plugin
+        name="project"
+        buildafterfailed="true">
+        <dateformat format="yyyyMMdd-HHmm z" />
+        <log
+            dir="${logDir}"
+            encoding="ISO-8859-1" />
+        <schedule interval="${time.VeryVeryLongTime}" />
+        <listeners>
+            <currentbuildstatuslistener />
+        </listeners>
+        <modificationset>
+            <forceonly />
+        </modificationset>
+        <publishers>
+            <email
+                mailhost="localhost"
+                returnaddress="${env.BUILD_BUILDMASTER_EMAIL}"
+                skipusers="false"
+                subjectprefix="[${project.name}]"
+                spamwhilebroken="false"
+                buildresultsurl="${env.BUILD_RESULT_URL}/${project.name}">
+                <always address="${env.BUILD_TOADDRESS}" />
+            </email>
+        </publishers>
+    </plugin>
+
+    <plugin
+        name="cvs"
+        cvsroot="${env.CVS_MAIN_REPO}" />
+
+    <!-- 
+        Note: projects should normally be named in the form 
+        ${build.distribution}-${buildBranch}-${buildType}
+    -->
+
+    <project name="wtp-R1.5-P">
+
+        <schedule>
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+
+                <property
+                    name="buildType"
+                    value="P" />
+
+                <!-- need to make this build ID a better variable, 
+                    especially for this 'patch' case -->
+                <property
+                    name="buildId"
+                    value="B163391" />
+                <property
+                    name="buildBranch"
+                    value="R1.5" />
+                <property
+                    name="checkoutprojectname"
+                    value="${project.name}" />
+
+                <property
+                    name="mapVersionTag"
+                    value="R1_5_maintenance_patches" />
+
+                <property
+                    name="build.distribution"
+                    value="patches" />
+
+
+            </ant>
+        </schedule>
+
+    </project>
+
+
+    <!-- ++++++++++++++++ -->
+    <!-- R1.0 MAINTENANCE -->
+    <!-- ++++++++++++++++ -->
+    <project name="wtp-R1.0-M">
+
+        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+        <modificationset quietperiod="120">
+            <cvs
+                tag="R1_0_maintenance"
+                module="releng" />
+            <cvs
+                tag="R1_0_maintenance"
+                module="releng.wtpbuilder" />
+        </modificationset>
+
+        <schedule interval="${time.VeryVeryLongTime}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.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="R" />
+                <!-- should comment out pre-spec'd coded buildId, once R-1.0.2 is declared -->
+
+                <property
+                    name="buildId"
+                    value="1.0.3" />
+                <property
+                    name="buildBranch"
+                    value="R1.0" />
+
+                <property
+                    name="checkoutprojectname"
+                    value="${project.name}" />
+
+                <property
+                    name="mapVersionTag"
+                    value="R1_0_maintenance" />
+                <property
+                    name="build.distribution"
+                    value="wtp" />
+
+
+            </ant>
+        </schedule>
+
+    </project>
+
+    <!-- ++++++++++++++++ -->
+    <!-- R1.5 MAINTENANCE -->
+    <!-- ++++++++++++++++ -->
+    <project name="wtp-R1.5-M">
+        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+        <modificationset quietperiod="120">
+            <cvs
+                tag="R1_0_maintenance"
+                module="releng" />
+            <cvs
+                tag="R1_0_maintenance"
+                module="releng.wtpbuilder" />
+        </modificationset>
+
+        <schedule interval="${time.oneHour}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.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.3" />
+                <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 -->
+        <modificationset quietperiod="120">
+            <cvs module="releng" />
+            <cvs module="releng-jsf" />
+            <cvs module="releng.dali" />
+            <cvs module="releng.wtpbuilder" />
+        </modificationset>
+
+        <schedule interval="${time.oneHour}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.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">
+
+        <schedule>
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.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 -->
+        <modificationset quietperiod="120">
+            <cvs module="releng" />
+            <cvs module="releng-jsf" />
+            <cvs module="releng.dali" />
+            <cvs module="releng.wtpbuilder" />
+        </modificationset>
+
+        <schedule interval="${time.VeryVeryLongTime}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.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.0M3" />
+                <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-thirdparty-R2.0-T">
+        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+        <modificationset quietperiod="120">
+            <cvs module="releng-thirdparty" />
+        </modificationset>
+
+        <schedule interval="${time.tenMinutes}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+                <property
+                    name="buildType"
+                    value="T" />
+                <property
+                    name="checkoutprojectname"
+                    value="${project.name}" />
+
+                <property
+                    name="buildBranch"
+                    value="R2.0" />
+
+                <property
+                    name="mapVersionTag"
+                    value="HEAD" />
+                <property
+                    name="build.distribution"
+                    value="wtp-thirdparty" />
+
+
+            </ant>
+        </schedule>
+ 
+    </project>
+
+
+    <project name="wtp-R2.0-R">
+        <!-- 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" />
+            <cvs module="releng.wtpbuilder" />
+        </modificationset>
+
+        <schedule interval="${time.VeryVeryLongTime}">
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="cc_project_build.xml"
+                target="Build"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+                <property
+                    name="buildType"
+                    value="R" />
+                <property
+                    name="buildId"
+                    value="2.0" />
+                <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-whatisfixed">
+        <schedule>
+            <ant
+                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+                buildfile="whatisfixed.xml"
+                target="whatisfixed"
+                useQuiet="false"
+                useLogger="false"
+                savelogdir="${logDir}"
+                usedebug="false"
+                antworkingdir="${env.BUILD_HOME}/releng.control">
+
+            </ant>
+        </schedule>
+ 
+    </project>
+
+
+</cruisecontrol>
+
diff --git a/releng.control/cc_project_build.xml b/releng.control/cc_project_build.xml
new file mode 100644
index 0000000..ab34af4
--- /dev/null
+++ b/releng.control/cc_project_build.xml
@@ -0,0 +1,93 @@
+<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="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" />
+
+
+
+        <!-- clean previous build -->
+        <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 -->
+        <ant antfile="checkout.xml">
+            <property name="checkoutprojectname" value="${checkoutprojectname}"/>
+
+        </ant>
+
+
+
+        <!-- build and create preliminary download site files -->
+        <ant antfile="${wtpBuilder}" target="build">
+
+        </ant>
+
+        <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-dw.properties b/releng.control/checkout-dw.properties
deleted file mode 100644
index 731fc09..0000000
--- a/releng.control/checkout-dw.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# some constants controling some common check out tasks
-
-
-# its handy to set this value to false, when 
-# doing local builds to test new versions of wtpbuilder
-# so that your local edits are not over written each time
-# normally always 'true' for "production" builds
-checkout.wtpbuilder.clean=false
-
-
-# handy constant to avoid hard coding
-mapCvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
-
-
-
-# these are some not currently important constants to avoid hard coding, 
-# and allowing easier expansion in future
-releng=releng
-releng.wtpbuilder=releng.wtpbuilder
-wst=wst
-jst=jst
-
diff --git a/releng.control/checkout.properties b/releng.control/checkout.properties
deleted file mode 100644
index 2c30c54..0000000
--- a/releng.control/checkout.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# some constants controling some common check out tasks
-
-
-# its handy to set this value to false, when 
-# doing local builds to test new versions of wtpbuilder
-# so that your local edits are not over written each time
-# normally always 'true' for "production" builds
-checkout.wtpbuilder.clean=true
-
-
-# handy constant to avoid hard coding
-mapCvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
-
-
-
-# these are some not currently important constants to avoid hard coding, 
-# and allowing easier expansion in future
-releng=releng
-releng.wtpbuilder=releng.wtpbuilder
-wst=wst
-jst=jst
-
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 9705f3e..bf1f296 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -1,81 +1,151 @@
-<project default="all">
+<project name="checkout" default="checkout" basedir=".">
 
-	<!-- requires following to be passed in
-		buildType
-		build.home (env.BUILD_HOME)
-		codir
-		mapVersionTag
-	 -->
+    <!-- = = = 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" />
 
-	<property file="checkout.properties" />
+    <!-- load standard properties for production environment -->
+    <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+    <!-- = = = end standard properties pattern = = = -->
+
+
+    <property name="codir"
+              value="${env.BUILD_HOME}/build-node/checkout/${checkoutprojectname}" />
 
 
 
-	<target name="all">
-		<antcall target="${buildType}" />
-	</target>
+	<echo message="checkoutprojectname: ${checkoutprojectname}" />
+    <target name="checkout" if="${checkoutprojectname}">
+        <!-- we always check and init the builder -->
+        <antcall target="getwtpbuilder" />
+        <!-- and projects can do more if needed. -->
+        <antcall target="${checkoutprojectname}" />
+    </target>
 
-	<target name="N">
+    <target name="wtp-R2.0-N">
 
-		<antcall target="initBuilders"/>
-		<cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${wst}" dest="${codir}" />
-		<cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${jst}" dest="${codir}" />
-		<antcall target="getwtpbuilder" />
+        <!-- 
+        	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>
 
-	<target name="S">
-		<antcall target="initBuilders"/>
-		<antcall target="getwtpbuilder" />
-	</target>
+    <target name="wtp-R2.0-S">
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="releng-jsf"
+             dest="${codir}"
+             tag="HEAD" />
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="releng.dali"
+             dest="${codir}"
+             tag="HEAD" />
+    </target>
 
-	<target name="I">
-		<antcall target="initBuilders"/>
-		<antcall target="getwtpbuilder" />
-	</target>
+    <target name="wtp-R2.0-I">
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="releng-jsf"
+             dest="${codir}"
+             tag="HEAD" />
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="releng.dali"
+             dest="${codir}"
+             tag="HEAD" />
+    </target>
 
-	<target name="M">
-		<antcall target="initBuilders"/>
-		<antcall target="getwtpbuilder" />
-	</target>
-    
-	<target name="P">
-		<antcall target="initBuilders"/>
-		<antcall target="getwtpbuilder" />
-	</target>
-	<target name="R">
-		<antcall target="initBuilders"/>
-		<antcall target="getwtpbuilder" />
-	</target>
-	
-	
+    <target name="wtp-R2.0-R">
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="releng-jsf"
+             dest="${codir}"
+             tag="HEAD" />
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="releng.dali"
+             dest="${codir}"
+             tag="HEAD" />
+    </target>
+
+    <target name="wtp-R1.5-M">
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="${releng}"
+             dest="${codir}"
+             tag="R1_5_maintenance" />
+    </target>
+
+    <target name="wtp-patches-P">
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="${releng}"
+             dest="${codir}"
+             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="getwtpbuilder" depends="check.clean" if="doClean">
-		<property file="${codir}/releng/maps/build.cfg" />
-		<delete dir="${codir}/releng.wtpbuilder" failonerror="false" />
-		<echo message="Version tag for ${releng.wtpbuilder} is: ${wtpBuilderVersion}" />
-		<cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${releng.wtpbuilder}" dest="${codir}" tag="${wtpBuilderVersion}" />
-
-	</target>
 
 
-	<target name="check.clean">
-		<condition property="doClean">
-			<equals arg1="${checkout.wtpbuilder.clean}" arg2="true" />
-		</condition>
-	</target>
+    <!-- 
+        The order of execution of these three worker targets
+        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 
+        is fetched to control the rest of the build -->
+        <property file="${codir}/${releng}/maps/build.cfg" />
+        <delete dir="${codir}/releng.wtpbuilder"
+                failonerror="false" />
+        <echo message="Version tag for ${releng.builder} is: ${wtpBuilderVersion}" />
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="${releng.builder}"
+             dest="${codir}"
+             tag="${wtpBuilderVersion}" />
+    </target>
 
-	<target name="initBuilders">
-		<echo message="Version tag for ${releng}: ${mapVersionTag}" />
-		<cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" tag="${mapVersionTag}" />
+    <target name="check.clean">
+        <condition property="doClean">
+            <equals arg1="${checkout.wtpbuilder.clean}"
+                    arg2="true" />
+        </condition>
+    </target>
 
-<!--		<delete dir="${codir}/releng.control/workspace" failonerror="false" /> -->
-		<!-- issue, we should probably not always use 'head' ... perhaps eliminate altogether 
-		     and just check out when ever server is (re) started? -->
-<!--		<cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${releng.control}" dest="${codir}" tag="HEAD" />
--->
-	</target>
+    <target name="initBuilders" if="doClean">
+        <echo message="Version tag for ${releng}: ${mapVersionTag}" />
+        <cvs quiet="true"
+             cvsRoot="${mapCvsRoot}"
+             package="${releng}"
+             dest="${codir}"
+             tag="${mapVersionTag}" />
+    </target>
 
 
 </project>
diff --git a/releng.control/committer-dw.properties b/releng.control/committer-dw.properties
deleted file mode 100644
index 73863b1..0000000
--- a/releng.control/committer-dw.properties
+++ /dev/null
@@ -1,22 +0,0 @@
- 
- 
-
-mapVersionTag=HEAD
-buildType=I
-buildBranch=R2.0
-build.distribution=wtp
-
-cvsUser=david_williams
-# ext typically requires CVS_RSH=ssh 
-cvsProtocol=ext
-
-build.trial=false
-build.drivers=downloads
-
-baseos=linux
-basews=gtk
-basearch=x86
-
-build.clean=true
-build.pack-all-in-one=false
-
diff --git a/releng.control/committer.properties b/releng.control/committer.properties
deleted file mode 100644
index c5a0c72..0000000
--- a/releng.control/committer.properties
+++ /dev/null
@@ -1,20 +0,0 @@
- 
-
-mapVersionTag=HEAD
-buildType=I
-buildBranch=R2.0
-build.distribution=wtp
-
-cvsUser=david_williams
-# ext typically requires CVS_RSH=ssh 
-cvsProtocol=ext
-
-build.trial=false
-build.drivers=downloads
-
-baseos=linux
-basews=gtk
-basearch=ppc
-
-build.clean=true
-build.pack-all-in-one=false
diff --git a/releng.control/committer.xml b/releng.control/committer.xml
deleted file mode 100644
index e729ff5..0000000
--- a/releng.control/committer.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<project default="Build" basedir=".">
-
-    <!-- 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" />
-    
-    <property file="committer.properties" />
-
-    <target name="Build">
-
-        <!-- set main builder file name, based on distribution and build type -->
-        <property name="wtpBuilder"
-                  value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml" />
-
-
-
-        <!-- clean previous build -->
-        <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 -->
-        <ant antfile="checkout.xml"
-             target="all"
-             dir="."
-             inheritall="false">
-            <property name="codir"
-                      value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}" />
-            <property name="buildType"
-                      value="${buildType}" />
-            <property name="buildBranch"
-                      value="${buildBranch}" />
-            <property name="mapVersionTag"
-                      value="${mapVersionTag}" />
-        </ant>
-
-
-
-        <!-- build and create preliminary download site files -->
-        <ant antfile="${wtpBuilder}" target="build">
-            <property name="baseos" value="${baseos}" />
-            <property name="basews" value="${basews}" />
-            <property name="basearch" value="${basearch}" />
-        </ant>
-
-        <ant antfile="${wtpBuilder}" target="site" />
-        <!-- upload what we have so far -->
-        <ant antfile="${wtpBuilder}" target="upload">
-            <property name="wtpbuilder.upload.properties.file"
-                      value="${basedir}/upload.properties" />
-        </ant>
-
-
-        <!-- 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">
-            <property name="wtpbuilder.upload.properties.file"
-                      value="${basedir}/upload.properties" />
-        </ant>
-
-    </target>
-
-
-
-    <target name="clean" depends="check.clean" if="doClean">
-        <delete dir="${env.BUILD_HOME}/build-${build.distribution}-${buildBranch}-${buildType}"
-                failonerror="false" />
-        <delete dir="${env.BUILD_HOME}/test-${build.distribution}-${buildBranch}-${buildType}"
-                failonerror="false" />
-    </target>
-
-
-    <target name="check.clean">
-        <condition property="doClean">
-            <equals arg1="${build.clean}" arg2="true" />
-        </condition>
-    </target>
-
-
-</project>
diff --git a/releng.control/commonComputedVariables.shsource b/releng.control/commonComputedVariables.shsource
new file mode 100644
index 0000000..4fd3912
--- /dev/null
+++ b/releng.control/commonComputedVariables.shsource
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# intentionally named "shsource" to denote this is intended to 
+# be included in other sh files, with "source" command, not 
+# executed on its own. 
+
+########################################################
+
+export PROJECT_HOME=`dirname "$0"`
+
+export ANT_HOME=${BUILD_HOME}/apps/${ANT_DIR}
+
+export JAVA_4_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
+export JAVA_5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
+
+export PATH=${PATH}:${HOME}/bin:${ANT_HOME}/bin:${JAVA_HOME}/bin
+
+# project name is resolved dynamically, as CC runs
+export LOG_DIR=${BUILD_HOME}/cruise-project-logs
+
+# need for some PPC or Linux issues? 
+export JAVA_HIGH_ZIPFDS=500
+
+# for now, always use Java 5 as native "home", but 
+# scripts and paths may still use java 1.4
+export JAVA_HOME=${JAVA_5_HOME}
+
+# values of the bootclasspath attribute used in ant javac calls.
+# the names of these jars are VM vendor specific. the first set
+# below, commented out, are typical for sun VM's. The 
+# second set are for IBM's VM's ... which is what we use 
+# on the PPC machine, so we'll leave that as the defaults 
+# in this file. 
+
+
+export bootclasspath="${JAVA_4_HOME}/jre/lib/core.jar:${JAVA_4_HOME}/jre/lib/ibmjsseprovider.jar:${JAVA_4_HOME}/jre/lib/xml.jar"
+export bootclasspath_15="${JAVA_5_HOME}/jre/lib/core.jar:${JAVA_5_HOME}/jre/lib/vm.jar:${JAVA_5_HOME}/jre/lib/xml.jar"
+
+
+# OS specific support.
+sunjvm=false;
+ibmjvm=false;
+javaversion="`uname -a`"
+
+case "$javaversion" in
+  *i686*) sunjvm=true;;
+  *ppc*)  ibmjvm=true;;
+esac
+
+# set initial values as if for IBM's PPC VM
+export bootclasspath="${JAVA_4_HOME}/jre/lib/core.jar:${JAVA_4_HOME}/jre/lib/ibmjsseprovider.jar:${JAVA_4_HOME}/jre/lib/xml.jar"
+export bootclasspath_15="${JAVA_5_HOME}/jre/lib/core.jar:${JAVA_5_HOME}/jre/lib/vm.jar:${JAVA_5_HOME}/jre/lib/xml.jar"
+export ANT_OPTS="-Xms128m -Xmx512m"
+
+# and change them if Sun's VM is being used
+if $sunjvm ; then
+	export bootclasspath="${JAVA_4_HOME}/jre/lib/rt.jar:${JAVA_4_HOME}/jre/lib/jsse.jar"
+	export bootclasspath_15="${JAVA_5_HOME}/jre/lib/rt.jar"
+	export ANT_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=128M -XX:+UseParallelGC"
+fi
+
+
+export CVS_RSH=ssh
+export CVS_MAIN_REPO=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
+
+export J2SE14=${bootclasspath} 
+export J2SE15=${bootclasspath_15}
+
+
+# 	Set this to the relative path for the 
+# 	directory that keeps the downloaded drivers 
+#   and pre-reqs
+export LOCAL_PREREQS_CACHE=${BUILD_HOME}/downloads
+
+
+export BUILD_INITIALIZED="true"
+
+echo " "
+echo "    Project Home: ${PROJECT_HOME}"
+echo "    Build Home: ${BUILD_HOME}"
+echo "    DISPLAY: ${DISPLAY}"
+echo " "
+echo "    JAVA_4_HOME: ${JAVA_4_HOME}"
+echo "        ${bootclasspath}"
+echo " "
+echo "    JAVA_5_HOME: ${JAVA_5_HOME}"
+echo "        ${bootclasspath_15}"
+echo " "
+echo "     ANT_HOME: ${ANT_HOME}"
+echo " "
+echo "     PATH: ${PATH}"
+echo " "
+echo "      BASEOS: ${BASEOS}"
+echo "      BASEWS: ${BASEWS}"
+echo "    BASEARCH: ${BASEARCH}"
+echo " "
+echo "   LOCAL_BUILD_PROPERTIES_DIR: ${LOCAL_BUILD_PROPERTIES_DIR}" 
+echo "   STANDARD_PROPERTIES_DIR: ${STANDARD_PROPERTIES_DIR}"
+echo " "
diff --git a/releng.control/commonVariations.sh b/releng.control/commonVariations.sh
deleted file mode 100644
index 9e27703..0000000
--- a/releng.control/commonVariations.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# Note: if "local" users have this file on their path, then 
-# the bash "include source" function will find that path version 
-# first, instead of this "standard" eclipse ppc one.
-
-export BUILD_HOME=/shared/webtools
-
-export DISPLAY=127.0.0.1:1.0
-
-JAVA_4_DIR="IBMJava2-ppc-142"
-JAVA_5_DIR="ibm-java2-ppc-50"
-
-export ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
-
-########################################################
-
-export PROJECT_HOME=`dirname "$0"`
-
-export JAVA_4_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
-export JAVA_5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
-
-# values of the bootclasspath attribute used in ant javac calls.
-# the names of these jars are VM vendor specific. the first set
-# below, commented out, are typical for sun VM's. The 
-# second set are for IBM's VM's ... which is what we use 
-# on the PPC machine, so we'll leave that as the defaults 
-# in this file. 
-
-#export bootclasspath="${JAVA_4_HOME}/jre/lib/rt.jar:${JAVA_4_HOME}/jre/lib/jsse.jar"
-#export bootclasspath_15="${JAVA_5_HOME}/jre/lib/rt.jar"
-
-export bootclasspath="${JAVA_4_HOME}/jre/lib/core.jar:${JAVA_4_HOME}/jre/lib/ibmjsseprovider.jar:${JAVA_4_HOME}/jre/lib/xml.jar"
-export bootclasspath_15="${JAVA_5_HOME}/jre/lib/core.jar:${JAVA_5_HOME}/jre/lib/vm.jar:${JAVA_5_HOME}/jre/lib/xml.jar"
-
-export PATH=$PATH:$HOME/bin:$ANT_HOME/bin:$JAVA_HOME/bin
-
-export JAVA_HIGH_ZIPFDS=500
-
-export BUILD_INITIALIZED="true"
-
-echo " "
-echo "    Project Home: ${PROJECT_HOME}"
-echo "    Build Home: ${BUILD_HOME}"
-echo "    DISPLAY: ${DISPLAY}"
-echo " "
-echo "    JAVA_4_HOME: ${JAVA_4_HOME}"
-echo "        ${bootclasspath}"
-echo " "
-echo "    JAVA_5_HOME: ${JAVA_5_HOME}"
-echo "        ${bootclasspath_15}"
-echo " "
-echo "     ANT_HOME: ${ANT_HOME}"
-echo " "
-echo "     PATH: ${PATH}"
-echo " "
diff --git a/releng.control/commonVariations.shsource b/releng.control/commonVariations.shsource
new file mode 100644
index 0000000..d6603c7
--- /dev/null
+++ b/releng.control/commonVariations.shsource
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Note: if "local" users have this file first in their path, then 
+# the bash shell's "include source" function will find that paths version 
+# first, instead of this "standard" eclipse ppc one.
+
+# this file is intentionally named "shsource" to denote this is intended to 
+# be included in other sh files, with "source" command, not 
+# executed on its own. 
+
+
+export BUILD_HOME=/shared/webtools
+
+export DISPLAY=127.0.0.1:1.0
+
+export JAVA_4_DIR="IBMJava2-ppc-142"
+export JAVA_5_DIR="ibm-java2-ppc-50"
+export ANT_DIR="apache-ant-1.6.5"
+
+export BASEOS=linux
+export BASEWS=gtk
+export BASEARCH=ppc
+
+# no local build properties, for production builds
+export LOCAL_BUILD_PROPERTIES_DIR=
+
+export STANDARD_PROPERTIES_DIR=${BUILD_HOME}/releng.control/standardMachineProperties
+
+export BUILD_BUILDMASTER_EMAIL=wtpBuild@eclipse.org
+export BUILD_RESULT_URL/cruisecontrol/buildresults=http://build.eclipse.org:7777/cruisecontrol/buildresults
+export BUILD_TOADDRESS=david_williams@us.ibm.com
+
diff --git a/releng.control/config.xml b/releng.control/config.xml
deleted file mode 100644
index 82e70ba..0000000
--- a/releng.control/config.xml
+++ /dev/null
@@ -1,702 +0,0 @@
-<cruisecontrol>
-
-    <property file="cruise.properties" />
-    
-    <!-- note: cc allows to force upper case, but ant does not -->
-    <property
-        environment="env"
-        toupper="true" />
-
-    <property
-        name="logDir"
-        value="${env.BUILD_HOME}/cruise-project-logs/${project.name}" />
-
-    <property
-        name="time.tenMinutes"
-        value="600" />
-
-    <property
-        name="time.oneHour"
-        value="3600" />
-
-    <property
-        name="time.OnRequestOnly"
-        value="31536000" />
-
-    <plugin
-        name="log"
-        dir="${logDir}" />
-    <plugin
-        name="currentbuildstatuslistener"
-        file="${logDir}/buildstatus.html" />
-
-    <project
-        name="wtp-R1.5-P"
-        buildafterfailed="true">
-        <dateformat format="yyyyMMdd-HHmm z" />
-        <listeners>
-            <currentbuildstatuslistener />
-        </listeners>
-        <log
-            dir="${logDir}"
-            encoding="ISO-8859-1" />
-        <modificationset>
-            <forceonly />
-        </modificationset>
-
-        <schedule interval="${time.OnRequestOnly}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="committer.xml"
-                target="Build"
-                useQuiet="false"
-                useLogger="false"
-                savelogdir="${logDir}"
-                usedebug="false"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
-
-                <property
-                    name="buildType"
-                    value="P" />
-
-                <!-- need to make this build ID a better variable, 
-                    especially for this 'patch' case -->
-                <property
-                    name="buildId"
-                    value="B163391" />
-                <property
-                    name="buildBranch"
-                    value="R1.5" />
-
-
-
-                <property
-                    name="mapVersionTag"
-                    value="R1_5_maintenance_patches" />
-
-                <property
-                    name="build.component"
-                    value="wtp-patches" />
-
-                <property
-                    name="build.distribution"
-                    value="patches" />
-
-                <property
-                    name="build.home"
-                    value="${env.BUILD_HOME}" />
-
-                <property
-                    name="sub-home"
-                    value="patches" />
-
-            </ant>
-        </schedule>
-
-
-
-
-        <!-- Publishers are run *after* a build completes -->
-        <publishers>
-            <email
-                mailhost="localhost"
-                returnaddress="${build.buildmaster.email}"
-                skipusers="false"
-                subjectprefix="[wtp-R1.5-P-Bbuild]"
-                spamwhilebroken="false"
-                buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R1.5-P">
-            </email>
-        </publishers>
-    </project>
-
-
-    <!-- ++++++++++++++++ -->
-    <!-- R1.0 MAINTENANCE -->
-    <!-- ++++++++++++++++ -->
-    <project
-        name="wtp-R1.0-M"
-        buildafterfailed="true">
-        <dateformat format="yyyyMMdd-HHmm z" />
-        <listeners>
-            <currentbuildstatuslistener />
-        </listeners>
-        <log
-            dir="${logDir}"
-            encoding="ISO-8859-1" />
-        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
-        <modificationset quietperiod="120">
-            <cvs
-                tag="R1_0_maintenance"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.0-M/releng" />
-            <cvs
-                tag="R1_0_maintenance"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.0-M/releng.wtpbuilder" />
-        </modificationset>
-
-        <schedule interval="${time.OnRequestOnly}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="committer.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="R" />
-                <!-- should comment out pre-spec'd coded buildId, once R-1.0.2 is declared -->
-
-                <property
-                    name="buildId"
-                    value="1.0.3" />
-                <property
-                    name="buildBranch"
-                    value="R1.0" />
-
-
-
-                <property
-                    name="mapVersionTag"
-                    value="R1_0_maintenance" />
-                <property
-                    name="build.component"
-                    value="wtp" />
-                <property
-                    name="build.home"
-                    value="${env.BUILD_HOME}" />
-
-                <property
-                    name="sub-home"
-                    value="committers" />
-
-            </ant>
-        </schedule>
-
-        <!-- Publishers are run *after* a build completes -->
-        <publishers>
-            <email
-                mailhost="localhost"
-                returnaddress="${build.buildmaster.email}"
-                skipusers="false"
-                subjectprefix="[wtp-R1.0-M-build]"
-                spamwhilebroken="false"
-                buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R1.0-M">
-            </email>
-        </publishers>
-    </project>
-
-    <!-- ++++++++++++++++ -->
-    <!-- R1.5 MAINTENANCE -->
-    <!-- ++++++++++++++++ -->
-    <project
-        name="wtp-R1.5-M"
-        buildafterfailed="true">
-        <dateformat format="yyyyMMdd-HHmm z" />
-        <listeners>
-            <currentbuildstatuslistener />
-        </listeners>
-        <log
-            dir="${logDir}"
-            encoding="ISO-8859-1" />
-        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
-        <modificationset quietperiod="120">
-            <cvs
-                tag="R1_5_maintenance"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.5-M/releng" />
-            <cvs
-                tag="R1_5_maintenance"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.5-M/releng.wtpbuilder" />
-        </modificationset>
-
-        <schedule interval="${time.oneHour}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="committer.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.3" />
-                <property
-                    name="buildBranch"
-                    value="R1.5" />
-
-
-
-                <property
-                    name="mapVersionTag"
-                    value="R1_5_maintenance" />
-                <property
-                    name="build.component"
-                    value="wtp" />
-                <property
-                    name="build.home"
-                    value="${env.BUILD_HOME}" />
-
-                <property
-                    name="sub-home"
-                    value="committers" />
-
-            </ant>
-        </schedule>
-
-
-
-
-        <!-- Publishers are run *after* a build completes -->
-        <publishers>
-            <email
-                mailhost="localhost"
-                returnaddress="${build.buildmaster.email}"
-                skipusers="false"
-                subjectprefix="[wtp-R1.5-M-build]"
-                spamwhilebroken="false"
-                buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R1.5-M">
-            </email>
-        </publishers>
-    </project>
-
-
-    <project
-        name="wtp-R2.0-I"
-        buildafterfailed="true">
-        <dateformat format="yyyyMMdd-HHmm z" />
-        <listeners>
-            <currentbuildstatuslistener />
-        </listeners>
-        <log
-            dir="${logDir}"
-            encoding="ISO-8859-1" />
-
-        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
-        <modificationset quietperiod="120">
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng" />
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng-jsf" />
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng.dali" />
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng.wtpbuilder" />
-        </modificationset>
-
-        <schedule interval="${time.oneHour}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="committer.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="mapVersionTag"
-                    value="HEAD" />
-                <property
-                    name="build.distribution"
-                    value="wtp" />
-                <property
-                    name="build.home"
-                    value="${env.BUILD_HOME}" />
-                <property
-                    name="sub-home"
-                    value="committers" />
-
-            </ant>
-        </schedule>
-
-        <!-- Publishers are run *after* a build completes -->
-        <publishers>
-            <email
-                mailhost="localhost"
-                returnaddress="${build.buildmaster.email}"
-                skipusers="false"
-                subjectprefix="[wtp-R2.0-I-build]"
-                spamwhilebroken="false"
-                buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-I">
-            </email>
-        </publishers>
-    </project>
-
-
-    <project
-        name="wtp-R2.0-N"
-        buildafterfailed="true">
-
-        <dateformat format="yyyyMMdd-HHmm z" />
-        <listeners>
-            <currentbuildstatuslistener />
-        </listeners>
-        <log
-            dir="${logDir}"
-            encoding="ISO-8859-1" />
-
-        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
-        <modificationset quietperiod="120">
-            <forceonly />
-        </modificationset>
-
-        <schedule interval="${time.OnRequestOnly}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="committer.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" />
-                <property
-                    name="build.home"
-                    value="${env.BUILD_HOME}" />
-                <property
-                    name="sub-home"
-                    value="committers" />
-
-            </ant>
-        </schedule>
-
-
-
-
-        <!-- Publishers are run *after* a build completes -->
-        <publishers>
-            <email
-                mailhost="localhost"
-                returnaddress="${build.buildmaster.email}"
-                skipusers="true"
-                subjectprefix="[wtp-R2.0-N-build]"
-                spamwhilebroken="false"
-                buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-N">
-            </email>
-        </publishers>
-    </project>
-
-
-    <project
-        name="wtp-R2.0-S"
-        buildafterfailed="true">
-
-        <dateformat format="yyyyMMdd-HHmm z" />
-        <listeners>
-            <currentbuildstatuslistener />
-        </listeners>
-        <log
-            dir="${logDir}"
-            encoding="ISO-8859-1" />
-
-        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
-        <modificationset quietperiod="120">
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng" />
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng-jsf" />
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng.dali" />
-
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng.wtpbuilder" />
-        </modificationset>
-
-        <schedule interval="${time.OnRequestOnly}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="committer.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.0M3" />
-                <property
-                    name="buildBranch"
-                    value="R2.0" />
-
-                <property
-                    name="mapVersionTag"
-                    value="HEAD" />
-                <property
-                    name="build.distribution"
-                    value="wtp" />
-                <property
-                    name="build.home"
-                    value="${env.BUILD_HOME}" />
-                <property
-                    name="sub-home"
-                    value="committers" />
-
-            </ant>
-        </schedule>
-
-
-        <!-- Publishers are run *after* a build completes -->
-        <publishers>
-            <email
-                mailhost="localhost"
-                returnaddress="${build.buildmaster.email}"
-                skipusers="false"
-                subjectprefix="[wtp-R2.0-S-build]"
-                spamwhilebroken="false"
-                buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-S">
-            </email>
-        </publishers>
-    </project>
-
-
-    <project
-        name="wtp-thirdparty"
-        buildafterfailed="true">
-
-        <dateformat format="yyyyMMdd-HHmm z" />
-        <listeners>
-            <currentbuildstatuslistener />
-        </listeners>
-        <log
-            dir="${logDir}"
-            encoding="ISO-8859-1" />
-
-        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
-        <modificationset quietperiod="120">
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng-thirdparty" />
-            <!-- usually no need to rebuild third party, if builder changes, since the 
-                 third party build is more of a copy  -->
-            <!-- 
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng.wtpbuilder" />
-             -->
-        </modificationset>
-
-        <schedule interval="${time.tenMinutes}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="committer.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.0thirdparty" />
-                <property
-                    name="buildBranch"
-                    value="R2.0" />
-
-                <property
-                    name="mapVersionTag"
-                    value="HEAD" />
-                <property
-                    name="build.distribution"
-                    value="wtp-thirdparty" />
-                <property
-                    name="build.home"
-                    value="${env.BUILD_HOME}" />
-                <property
-                    name="sub-home"
-                    value="committers" />
-
-            </ant>
-        </schedule>
-
-
-        <!-- Publishers are run *after* a build completes -->
-        <publishers>
-            <email
-                mailhost="localhost"
-                returnaddress="${build.buildmaster.email}"
-                skipusers="false"
-                subjectprefix="[wtp-R2.0-S-build]"
-                spamwhilebroken="false"
-                buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-S">
-            </email>
-        </publishers>
-    </project>
-
-
-    <project
-        name="wtp-R2.0-R"
-        buildafterfailed="true">
-
-        <dateformat format="yyyyMMdd-HHmm z" />
-        <listeners>
-            <currentbuildstatuslistener />
-        </listeners>
-        <log
-            dir="${logDir}"
-            encoding="ISO-8859-1" />
-
-        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
-        <modificationset quietperiod="120">
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-R/releng" />
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng-jsf" />
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng.dali" />
-            <cvs
-                tag="HEAD"
-                localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-R/releng.wtpbuilder" />
-        </modificationset>
-
-        <schedule interval="${time.OnRequestOnly}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="committer.xml"
-                target="Build"
-                useQuiet="false"
-                useLogger="false"
-                savelogdir="${logDir}"
-                usedebug="false"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
-                <property
-                    name="buildType"
-                    value="R" />
-                <property
-                    name="buildId"
-                    value="2.0" />
-                <property
-                    name="buildBranch"
-                    value="R2.0" />
-
-                <property
-                    name="mapVersionTag"
-                    value="HEAD" />
-                <property
-                    name="build.distribution"
-                    value="wtp" />
-                <property
-                    name="build.home"
-                    value="${env.BUILD_HOME}" />
-                <property
-                    name="sub-home"
-                    value="committers" />
-
-            </ant>
-        </schedule>
-
-
-        <!-- Publishers are run *after* a build completes -->
-        <publishers>
-            <email
-                mailhost="localhost"
-                returnaddress="${build.buildmaster.email}"
-                skipusers="false"
-                subjectprefix="[wtp-R2.0-R-build]"
-                spamwhilebroken="false"
-                buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R">
-            </email>
-        </publishers>
-    </project>
-
-    <project
-        name="wtp-whatisfixed"
-        buildafterfailed="true">
-
-        <dateformat format="yyyyMMdd-HHmm z" />
-        <listeners>
-            <currentbuildstatuslistener />
-        </listeners>
-        <log
-            dir="${logDir}"
-            encoding="ISO-8859-1" />
-
-
-        <schedule interval="${time.OnRequestOnly}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="whatisfixed.xml"
-                target="whatisfixed"
-                useQuiet="false"
-                useLogger="false"
-                savelogdir="${logDir}"
-                usedebug="false"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
-
-            </ant>
-        </schedule>
-
-
-
-
-        <!-- Publishers are run *after* a build completes -->
-        <publishers>
-            <email
-                mailhost="localhost"
-                returnaddress="${build.buildmaster.email}"
-                skipusers="true"
-                subjectprefix="[wtp-whatisfixed-build]"
-                spamwhilebroken="false"
-                buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-whatisfixed">
-            </email>
-        </publishers>
-    </project>
-
-
-</cruisecontrol>
-
diff --git a/releng.control/cruise-dw.properties b/releng.control/cruise-dw.properties
deleted file mode 100644
index fceeee2..0000000
--- a/releng.control/cruise-dw.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# values for the ppc eclipse.org server
-# should be renamed cruise.properties when deployed
-
-
-build.result.url=http://localhost:7777
-build.buildmaster.email=david_williams@eclipse.org
-build.toaddress=david_williams@mindspring.com
-logdir=${env.BUILD_HOME}/cruise-project-logs
-
diff --git a/releng.control/cruise-eclipse.properties b/releng.control/cruise-eclipse.properties
deleted file mode 100644
index acaa1d9..0000000
--- a/releng.control/cruise-eclipse.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# values for the ppc eclipse.org server
-# should be renamed cruise.properties when deployed
-
-
-build.result.url=http://build.eclipse.org:7777
-build.buildmaster.email=wtpBuild@eclipse.org
-build.toaddress=wtp-releng@eclipse.org
diff --git a/releng.control/cruise-lomboz.properties b/releng.control/cruise-lomboz.properties
deleted file mode 100644
index b2d7848..0000000
--- a/releng.control/cruise-lomboz.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# values for the x86 lomboz server
-# should be renamed cruise.properties when deployed
-
-
-build.result.url=http://buildserver.lomboz.org:8080
-build.buildmaster.email=buildmaster@lomboz.org
\ No newline at end of file
diff --git a/releng.control/cruise.properties b/releng.control/cruise.properties
deleted file mode 100644
index ffddf21..0000000
--- a/releng.control/cruise.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# values for the ppc eclipse.org server
-# should be renamed cruise.properties when deployed
-
-
-build.result.url=http://build.eclipse.org:7777
-build.buildmaster.email=wtpBuild@eclipse.org
-build.toaddress=wtp-releng@eclipse.org
-logdir=${env.BUILD_HOME}/cruise-project-logs
\ No newline at end of file
diff --git a/releng.control/drivers.xml b/releng.control/drivers.xml
deleted file mode 100644
index 2677d3c..0000000
--- a/releng.control/drivers.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<project default="all">
-	<property file="trigger.properties" />
-	<property file="../maps/build.cfg" />
-
-	<target name="all">
-		<antcall target="getDrivers" />
-		<copy todir="${env.BUILD_HOME}/${localDrivers}" overwrite="true">
-			<fileset dir="${env.BUILD_HOME}/${build.drivers}" >
-			    <include name="**/GEF*.*"/>
-			    <include name="**/emf*.*"/>
-			    <include name="**/JEM*.*"/>
-			</fileset>
-		</copy>
-		
-		<echo message="RSYNC TO: ${ftpUser}@${ftpServer}:${remoteDrivers}" />
-		<exec executable="rsync">
-			<arg line="-e ssh -Cavz ${env.BUILD_HOME}/${localDrivers} ${ftpUser}@${ftpServer}:${remoteDrivers}" />
-		</exec>
-
-	</target>
-
-	<target name="getDrivers">
-		<available file="${env.BUILD_HOME}/${build.drivers}/${emfFile}" property="emf.exists" />
-		<available file="${env.BUILD_HOME}/${build.drivers}/${gefFile}" property="gef.exists" />
-		<available file="${env.BUILD_HOME}/${build.drivers}/${jemFile}" property="jem.exists" />
-		<antcall target="getEmf" />
-		<antcall target="getGef" />
-		<antcall target="getJem" />
-	</target>
-	<target name="getEmf" unless="emf.exists">
-		<get src="${emfURL.primary}" dest="${env.BUILD_HOME}/${build.drivers}/${emfFile}" />
-	</target>
-	<target name="getGef" unless="gef.exists">
-		<get src="${gefURL.primary}" dest="${env.BUILD_HOME}/${build.drivers}/${gefFile}" />
-	</target>
-	<target name="getJem" unless="jem.exists">
-		<get src="${jemURL.primary}" dest="${env.BUILD_HOME}/${build.drivers}/${jemFile}" />
-	</target>
-	
-</project>
diff --git a/releng.control/getFromCVS-relengControl.sh b/releng.control/getFromCVS-relengControl.sh
index 34473a0..ad6cef7 100644
--- a/releng.control/getFromCVS-relengControl.sh
+++ b/releng.control/getFromCVS-relengControl.sh
@@ -1,6 +1,10 @@
+#!/bin/sh
 
-# This bat file is to help get builds started "fresh". 
-# The -f means do not use ~/.cvsrc file -- this is just to ensure no "hidden options"
+# This script file is to help get builds started "fresh", when 
+# the releng.control directory already exists on local file system.
+# While it is in the cvs repository in releng.control, it is 
+# meant to be executed from the parent directory
+# of releng.control on the file system. 
 
 # export is used, instead of checkout, just to avoid the CVS directories and since this code
 # for a local build, there should never be a need to check it back in to CVS.
@@ -11,11 +15,12 @@
 
 rm -fr releng.control
 
-cvs -f -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools  export  -r HEAD releng.control
+cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools  export  -r HEAD releng.control
 
 restore serialized state
 mv *.ser releng.control
 
-dos2unix releng.control/*.sh
+# make sure releng.control files are executable and in proper format
+dos2unix releng.control/*.sh* releng.control/*.properties releng.control/*.xml
 chmod +x releng.control/*.sh
 
diff --git a/releng.control/justtest.xml b/releng.control/justtest.xml
deleted file mode 100644
index 1692ed8..0000000
--- a/releng.control/justtest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<project default="Build">
-
-    
-	<property file="committer.properties" />
-
-    <property environment="env" />
-
-    
-	<target name="Build">
-		
-		<property name="wtpBuilder" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml"/>
-
-		
-		<ant antfile="checkout.xml" target="all" dir="." inheritall="false">
-			<property name="codir" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}" />
-			<property name="buildType" value="${buildType}" />
-			<property name="mapVersionTag" value="${mapVersionTag}" />
-		</ant>
-
-                <ant antfile="${wtpBuilder}" target="site" />
-                <ant antfile="${wtpBuilder}" target="upload" />
-                <ant antfile="${wtpBuilder}" target="test" />
-                <ant antfile="${wtpBuilder}" target="site" />
-                <ant antfile="${wtpBuilder}" target="upload" />
-        </target>
-
-        <target name="JustBuild">
-
-                <property name="wtpBuilder" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml"/>
-
-
-                <ant antfile="${wtpBuilder}" target="build" />
-        </target>
-
-
-
-	<target name="clean" if="build.clean">
-		<delete dir="${env.BUILD_HOME}/build-${build.distribution}-${buildBranch}-${buildType}" failonerror="false" />
-		<delete dir="${env.BUILD_HOME}/test-${build.distribution}-${buildBranch}-${buildType}" failonerror="false" />
-	</target>
-
-
-</project>
diff --git a/releng.control/localBuildExample/buildutilities.properties b/releng.control/localBuildExample/buildutilities.properties
new file mode 100644
index 0000000..d26fc1c
--- /dev/null
+++ b/releng.control/localBuildExample/buildutilities.properties
@@ -0,0 +1,2 @@
+
+#noralizeJarFiles=true
diff --git a/releng.control/localBuildExample/cc_project_build.properties b/releng.control/localBuildExample/cc_project_build.properties
new file mode 100644
index 0000000..c1bc73d
--- /dev/null
+++ b/releng.control/localBuildExample/cc_project_build.properties
@@ -0,0 +1,35 @@
+# 	committer.properties
+
+# mapVersionTag=HEAD
+buildType=N
+# buildBranch=R2.0
+# build.distribution=wtp
+
+
+# 	build.trial is always false for production 
+# 	builds. 
+build.trial=true
+
+#   these cvs values need to be "real" if 
+#   build.trial is false. This is the ID used
+#   to tag releng map files per build.
+# cvsUser=david_williams
+#   'ext' protocol typically requires 
+#   environment variable CVS_RSH to be set to ssh
+#   that is, CVS_RSH=ssh 
+# cvsProtocol=ext
+
+
+
+
+# 		This controls whether java files are re-fetched 
+# 		clean according to releng tags, or simply the 
+# 		local versions used. Note: this only works if 
+# 		its "gone though" a build already, where some 
+# 		infrastructure files (e.g. "fetch") have already 
+# 		been created. 
+# build.clean=true
+
+
+# build.pack-all-in-one=false
+
diff --git a/releng.control/localBuildExample/checkout.properties b/releng.control/localBuildExample/checkout.properties
new file mode 100644
index 0000000..1ed43e7
--- /dev/null
+++ b/releng.control/localBuildExample/checkout.properties
@@ -0,0 +1,28 @@
+# 		checkout.propererties
+
+# 		Its handy to set this value to false, 
+# 		to test new versions of releng.wtpbuilder
+# 		If set to false, local edits to wtpbuilder files
+# 		are not over written each time a 
+# 		build starts. 
+# 		Normally always 'true' for "production" builds, 
+# 		in which case the version of releng.wtpbuilder 
+# 		specificed in releng/build.cfg is used for the build.
+
+#  checkout.wtpbuilder.clean=true
+
+
+
+#  	Following are just handy constants, too avoid
+#   	hard coding in the scripts, but they are not often used
+
+# mapCvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
+
+
+# 		these are some not currently important constants to avoid hard coding, 
+# 		and allowing easier expansion in future
+# releng=releng
+# releng.wtpbuilder=releng.wtpbuilder
+# wst=wst
+# jst=jst
+
diff --git a/releng.control/localBuildExample/description.txt b/releng.control/localBuildExample/description.txt
new file mode 100644
index 0000000..126b475
--- /dev/null
+++ b/releng.control/localBuildExample/description.txt
@@ -0,0 +1,11 @@
+
+The files in this directory are not used 
+in production builds. 
+
+The are given here as examples of how someone might
+override various build properties on their own machine, 
+to do "local builds".  
+
+These files, if used, should be in the directory named in 
+the LOCAL_BUILD_PROPERTIES_DIR environment variable, which 
+is set in the "commonVariations" file.  
diff --git a/releng.control/localBuildExample/upload.properties b/releng.control/localBuildExample/upload.properties
new file mode 100644
index 0000000..bf1fc81
--- /dev/null
+++ b/releng.control/localBuildExample/upload.properties
@@ -0,0 +1,22 @@
+#  	upload.properties
+
+# 		These are some properties needed to upload builds from the build machine to the download machine. 
+# 		The actual task that does that is in wtp.upload in releng.wtpBuidler. 
+# 		Its better to set here, "outside" of wtpBuilder, since it can be machine and user specific
+
+
+# 		Use care with "true" unless you really 
+# 		have a place for the builds to go. You 
+# 		would not want them to accidently go to eclipse.org
+build.upload=false
+ 
+# uploadUser=davidw
+# uploadPassword="This is not really used since ssh login is assumed (required)"
+# uploadServer=localhost
+# uploadRemoteDirectory=/usr/local/apache2/htdocs/webtools/${site-sub-dir}/drops/${buildBranch}
+
+# 		rsyncRootPrefix should be empty for Linux machines.
+# 		But, Windows using cygwin will needs something like /cygdrive/G/
+# 		for what ever drive or directory is parent of build home
+# rsyncRootPrefix=
+
diff --git a/releng.control/restart.sh b/releng.control/restart.sh
index 3867874..28492c1 100644
--- a/releng.control/restart.sh
+++ b/releng.control/restart.sh
@@ -12,6 +12,6 @@
 # error conditions, they will start, but then shutdown a few seconds later
 sleep 10s
 echo "current java processes"
-ps -u wtpBuild -f -w -w  | grep java
+ps x ww  | grep java
 
 
diff --git a/releng.control/restoreStateSnapshot.sh b/releng.control/restoreStateSnapshot.sh
new file mode 100644
index 0000000..ad4c56e
--- /dev/null
+++ b/releng.control/restoreStateSnapshot.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# This file is to "copy up" the state saved in cvs, 
+# in stateSnapshot directory. Since the snapshot is 
+# only taken occasionally, the best procedure is to 
+# save the state locally and restore each time releng.control 
+# is deleted and restored ... but, in case that is not 
+# possible, this this the second best alternative. 
+# If the state files do not exists at all, cruise control 
+# will lose track of their status and state and attempt to 
+# build every project. 
+
+mv stateSnapshot/*.ser . 
+
diff --git a/releng.control/somePathDirectory/commonVariations.shsource b/releng.control/somePathDirectory/commonVariations.shsource
new file mode 100644
index 0000000..d07e045
--- /dev/null
+++ b/releng.control/somePathDirectory/commonVariations.shsource
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# This particular file is not used in production builds, 
+# though there is a similar one (with same name) in main 
+# directory that is. 
+
+# If "local" users have this file on their path, 
+# that is, in "someDirectory" on the users local path, 
+# then the bash "include source" function will find that version
+# first, instead of the "standard" eclipse ppc one.
+
+export BUILD_HOME=/home/shared/webtools
+
+#export DISPLAY=127.0.0.1:1.
+
+JAVA_4_DIR="j2sdk1.4.2_11"
+JAVA_5_DIR="jdk1.5.0_09"
+ANT_DIR="apache-ant-1.7.0RC1"
+
+export BASEOS=linux
+export BASEWS=gtk
+export BASEARCH=x86
+
+
+export LOCAL_BUILD_PROPERTIES_DIR=${BUILD_HOME}/localBuildProperties
+
+# technically should not be needed for "local builds" ... but ... just in case. 
+export STANDARD_PROPERTIES_DIR=${BUILD_HOME}/releng.control/standardMachineProperties
+
+export BUILD_BUILDMASTER_EMAIL=davidw@davidw.com
+export BUILD_RESULT_URL=http://davidw.com:7777/cruisecontrol/buildresults
+export BUILD_TOADDRESS=david_williams@us.ibm.com
+
diff --git a/releng.control/standardMachineProperties/buildutilities.properties b/releng.control/standardMachineProperties/buildutilities.properties
new file mode 100644
index 0000000..304ba4f
--- /dev/null
+++ b/releng.control/standardMachineProperties/buildutilities.properties
@@ -0,0 +1,2 @@
+
+noralizeJarFiles=true
diff --git a/releng.control/standardMachineProperties/cc_project_build.properties b/releng.control/standardMachineProperties/cc_project_build.properties
new file mode 100644
index 0000000..0308667
--- /dev/null
+++ b/releng.control/standardMachineProperties/cc_project_build.properties
@@ -0,0 +1,37 @@
+# 	committer.properties
+
+mapVersionTag=HEAD
+buildType=I
+buildBranch=R2.0
+build.distribution=wtp
+
+
+# 	build.trial is always false for production 
+# 	builds. 
+build.trial=true
+
+#   these cvs values need to be "real" if 
+#   build.trial is false. This is the ID used
+#   to tag releng map files per build.
+cvsUser=david_williams
+#   'ext' protocol typically requires 
+#   environment variable CVS_RSH to be set to ssh
+#   that is, CVS_RSH=ssh 
+cvsProtocol=ext
+
+
+
+
+# 	This controls whether java files are re-fetched 
+# 	clean according to releng tags, or simply the 
+# 	local versions used. Note: this only works if 
+# 	its "gone though" a build already, where some 
+# 	infrastructure files (e.g. "fetch") have already 
+# 	been created. 
+build.clean=true
+
+
+build.pack-all-in-one=false
+
+
+
diff --git a/releng.control/standardMachineProperties/checkout.properties b/releng.control/standardMachineProperties/checkout.properties
new file mode 100644
index 0000000..067164a
--- /dev/null
+++ b/releng.control/standardMachineProperties/checkout.properties
@@ -0,0 +1,28 @@
+# 		checkout.propererties
+
+# 		Its handy to set this value to false, 
+# 		to test new versions of releng.wtpbuilder
+# 		If set to false, local edits to wtpbuilder files
+# 		are not over written each time a 
+# 		build starts. 
+# 		Normally always 'true' for "production" builds, 
+# 		in which case the version of releng.wtpbuilder 
+# 		specificed in releng/build.cfg is used for the build.
+
+checkout.wtpbuilder.clean=true
+
+
+
+#  	Following are just handy constants, too avoid
+#   	hard coding in the scripts, but they are not often used
+
+mapCvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
+
+
+# 		these are some not currently too important constants to avoid hard coding, 
+# 		and allowing easier expansion in future
+releng=releng
+releng.builder=releng.wtpbuilder
+wst=wst
+jst=jst
+
diff --git a/releng.control/standardMachineProperties/description.txt b/releng.control/standardMachineProperties/description.txt
new file mode 100644
index 0000000..3557ec5
--- /dev/null
+++ b/releng.control/standardMachineProperties/description.txt
@@ -0,0 +1,24 @@
+
+The files in this directory, in theory, are not used
+in production builds on build.eclipse.org. 
+
+They are provided as "default values" that may need 
+to be changed on other machines. 
+
+The are given here as examples of how someone might
+override various build properties on their own machine.
+
+These files, if used, should be in the directory named in 
+the STANDARD_PROPERTIES_DIR environment variable, which 
+is set in the "commonVariations" file.  
+
+Note to build developers: the "defaults" here, in the 
+CVS version, should "written in" as default values in build 
+scripts, so the eclipse build.eclipse "official builds" are 
+always correct, even without these files. It is best to keep 
+these files "up to date", though, as a means of documenting 
+what can be varied from machine to machine. 
+
+Individual "local builds" should use the LOCAL_BUILD_PROPERTIES_DIR
+mechanism to provide their own "local" parameters. See the 
+localBuildExample directory. 
diff --git a/releng.control/standardMachineProperties/upload.properties b/releng.control/standardMachineProperties/upload.properties
new file mode 100644
index 0000000..63cff8b
--- /dev/null
+++ b/releng.control/standardMachineProperties/upload.properties
@@ -0,0 +1,22 @@
+#  	upload.properties
+
+# 		These are some properties needed to upload builds from the build machine to the download machine. 
+# 		The actual task that does that is in wtp.upload in releng.wtpBuidler. 
+# 		Its better to set here, "outside" of wtpBuilder, since it can be machine and user specific
+
+
+# 		Use care with "true" unless you really 
+# 		have a place for the builds to go. You 
+# 		would not want them to accidently go to eclipse.org
+build.upload=true
+ 
+uploadUser=david_williams
+uploadPassword="This is not really used since ssh login is assumed (required)"
+uploadServer=download.eclipse.org
+uploadRemoteDirectory=/home/data/users/${uploadUser}/downloads/webtools/${site-sub-dir}/drops/${buildBranch}
+
+# 		rsyncRootPrefix should be empty for Linux machines.
+# 		But, Windows using cygwin will needs something like /cygdrive/G/
+# 		for what ever drive or directory is parent of build home
+rsyncRootPrefix=
+
diff --git a/releng.control/whatisfixed.properties b/releng.control/standardMachineProperties/whatisfixed.properties
similarity index 100%
rename from releng.control/whatisfixed.properties
rename to releng.control/standardMachineProperties/whatisfixed.properties
diff --git a/releng.control/startbuild.sh b/releng.control/startbuild.sh
index 8b9510c..a78b245 100644
--- a/releng.control/startbuild.sh
+++ b/releng.control/startbuild.sh
@@ -1,8 +1,15 @@
 #!/bin/sh
 
+# remember to leave no slashes on filename in source command, 
+# so that users path is used to find it (first)
+if [ -n $BUILD_INITIALIZED ] 
+then
+   source commonVariations.sh 
+#   source computeCommon.sh   
+fi
 
-cd /shared/webtools/releng.control
-sh /shared/webtools/releng.control/cc.sh
+cd ${BUILD_HOME}/releng.control
+sh ${BUILD_HOME}/releng.control/cc.sh
 
 
 
diff --git a/releng.control/wtp-R1.0-M.ser b/releng.control/stateSnapshot/wtp-R1.0-M.ser
similarity index 100%
rename from releng.control/wtp-R1.0-M.ser
rename to releng.control/stateSnapshot/wtp-R1.0-M.ser
Binary files differ
diff --git a/releng.control/wtp-R1.5-M.ser b/releng.control/stateSnapshot/wtp-R1.5-M.ser
similarity index 75%
rename from releng.control/wtp-R1.5-M.ser
rename to releng.control/stateSnapshot/wtp-R1.5-M.ser
index 47a5873..610dcec 100644
--- a/releng.control/wtp-R1.5-M.ser
+++ b/releng.control/stateSnapshot/wtp-R1.5-M.ser
Binary files differ
diff --git a/releng.control/wtp-R1.5-P.ser b/releng.control/stateSnapshot/wtp-R1.5-P.ser
similarity index 100%
rename from releng.control/wtp-R1.5-P.ser
rename to releng.control/stateSnapshot/wtp-R1.5-P.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-I.ser b/releng.control/stateSnapshot/wtp-R2.0-I.ser
similarity index 75%
rename from releng.control/wtp-R2.0-I.ser
rename to releng.control/stateSnapshot/wtp-R2.0-I.ser
index 730516f..5d8521a 100644
--- a/releng.control/wtp-R2.0-I.ser
+++ b/releng.control/stateSnapshot/wtp-R2.0-I.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-N.ser b/releng.control/stateSnapshot/wtp-R2.0-N.ser
similarity index 75%
rename from releng.control/wtp-R2.0-N.ser
rename to releng.control/stateSnapshot/wtp-R2.0-N.ser
index 58712ff..982dbc6 100644
--- a/releng.control/wtp-R2.0-N.ser
+++ b/releng.control/stateSnapshot/wtp-R2.0-N.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-R.ser b/releng.control/stateSnapshot/wtp-R2.0-R.ser
similarity index 100%
rename from releng.control/wtp-R2.0-R.ser
rename to releng.control/stateSnapshot/wtp-R2.0-R.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-S.ser b/releng.control/stateSnapshot/wtp-R2.0-S.ser
similarity index 75%
rename from releng.control/wtp-R2.0-S.ser
rename to releng.control/stateSnapshot/wtp-R2.0-S.ser
index 637f68a..689854d 100644
--- a/releng.control/wtp-R2.0-S.ser
+++ b/releng.control/stateSnapshot/wtp-R2.0-S.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-N.ser b/releng.control/stateSnapshot/wtp-thirdparty-R2.0-T.ser
similarity index 70%
copy from releng.control/wtp-R2.0-N.ser
copy to releng.control/stateSnapshot/wtp-thirdparty-R2.0-T.ser
index 58712ff..6d48200 100644
--- a/releng.control/wtp-R2.0-N.ser
+++ b/releng.control/stateSnapshot/wtp-thirdparty-R2.0-T.ser
Binary files differ
diff --git a/releng.control/wtp-whatisfixed.ser b/releng.control/stateSnapshot/wtp-whatisfixed.ser
similarity index 100%
rename from releng.control/wtp-whatisfixed.ser
rename to releng.control/stateSnapshot/wtp-whatisfixed.ser
Binary files differ
diff --git a/releng.control/stopBuilds.sh b/releng.control/stopBuilds.sh
index c979fe3..34af31a 100644
--- a/releng.control/stopBuilds.sh
+++ b/releng.control/stopBuilds.sh
@@ -1,14 +1,21 @@
 #!/bin/sh
+# remember to leave no slashes on filename in source command, 
+# so that users path is used to find it (first)
+if [ -n $BUILD_INITIALIZED ] 
+then
+   source commonVariations.sh 
+   source computeCommon.sh   
+fi
 
 # allow to terminate themselves, if they will
 echo "Attempting normal terminate of all java processes"
-killall /opt/public/webtools/apps/IBMJava2-ppc-142/jre/bin/java
+killall ${JAVA_HOME}/jre/bin/java
 #   pause briefly to allow shutdown to finish
 sleep 10s
 
 # but if the do not terminate themselves, we can safely force them down
 echo "forcing termination of any remaing java processes"
-killall -9 /opt/public/webtools/apps/IBMJava2-ppc-142/jre/bin/java
+killall -9 ${JAVA_HOME}/jre/bin/java/jre/bin/java
 #    pause briefly to allow ports to free up, etc.
 sleep 10s
 
diff --git a/releng.control/testb.xml b/releng.control/testb.xml
deleted file mode 100644
index d1b22f0..0000000
--- a/releng.control/testb.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<project default="Build">
-
-	<property file="committer.properties" />
-    <property environment="env" />
-
-	<target name="Build">
-		
-		<property name="wtpBuilder" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml"/>
-
-		
-		<ant antfile="checkout.xml" target="all" dir="." inheritall="false">
-			<property name="codir" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}" />
-			<property name="buildType" value="${buildType}" />
-			<property name="mapVersionTag" value="${mapVersionTag}" />
-		</ant>
-
-                <ant antfile="${wtpBuilder}" target="build" />
-                <ant antfile="${wtpBuilder}" target="upload" />
-                <ant antfile="${wtpBuilder}" target="test" />
-                <ant antfile="${wtpBuilder}" target="site" />
-                <ant antfile="${wtpBuilder}" target="upload" />
-        </target>
-
-        <target name="JustBuild">
-
-                <property name="wtpBuilder" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml"/>
-
-
-                <ant antfile="${wtpBuilder}" target="build" />
-        </target>
-
-
-
-	<target name="clean" if="build.clean">
-		<delete dir="${env.BUILD_HOME}/build-${build.distribution}-${buildBranch}-${buildType}" failonerror="false" />
-		<delete dir="${env.BUILD_HOME}/test-${build.distribution}-${buildBranch}-${buildType}" failonerror="false" />
-	</target>
-
-
-</project>
diff --git a/releng.control/trigger.properties b/releng.control/trigger.properties
deleted file mode 100644
index b8808fb..0000000
--- a/releng.control/trigger.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-ftpUser=david_williams
-ftpPassword=xxxxxxx
-ftpServer=download.eclipse.org
-ftpRemoteDirectory=/home/data/users/david_williams/downloads/webtools/downloads/drops
-ftpDocsRemoteDirectory=/home/data/users/david_williams/downloads/webtools/docs/drops
-remoteDrivers=/home/data/users/david_williams/downloads/webtools/downloads
diff --git a/releng.control/trigger.xml b/releng.control/trigger.xml
deleted file mode 100644
index 192bb70..0000000
--- a/releng.control/trigger.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<project default="Build">
-
-	<property file="trigger.properties" />
-    <property environment="env" />
-
-	<target name="Build">
-		<property name="buildTarget" value="all" />
-		<property name="removeBuildDir" value="true" />
-		<antcall target="startBuild">
-		</antcall>
-	</target>
-
-	<target name="Repeat">
-		<property name="buildTarget" value="all" />
-		<antcall target="startBuild">
-		</antcall>
-	</target>
-
-	<target name="Test">
-		<delete dir="${env.BUILD_HOME}/test-${build.component}-${buildType}" failonerror="false" />
-		<property name="buildTarget" value="test" />
-		<antcall target="startBuild">
-		</antcall>
-	</target>
-
-	<target name="Publish">
-		<property name="buildTarget" value="justPublish" />
-		<antcall target="startBuild">
-		</antcall>
-	</target>
-
-	<target name="Push">
-		<property name="buildTarget" value="justPush" />
-		<antcall target="startBuild">
-		</antcall>
-	</target>
-
-	<target name="startBuild" depends="clean">
-		<antcall target="clean" />
-		<echo message="Component is: ${build.component}" />
-		<echo message="Build type is: ${buildType}" />
-		<echo message="Branch : ${mapVersionTag}" />
-		<echo message="Trial : ${build.trial}" />
-		<echo message="ftpRemoteDirectory : ${ftpRemoteDirectory}" />
-
-		<ant antfile="checkout.xml" target="all" dir="." inheritall="false">
-			<property name="codir" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}" />
-			<property name="buildType" value="${buildType}" />
-			<property name="mapVersionTag" value="${mapVersionTag}" />
-		</ant>
-
-		<!-- TODO: this appears obsolete? And should be removed? -->
-		<ant antfile="cruise.xml" target="${buildTarget}" dir="${env.BUILD_HOME}/build-node/checkout/${build.component}-${buildType}/releng.builder/scripts" inheritall="false">
-			<!-- PUBLISH TO eclipse.org  -->
-
-			<property name="baseos" value="${baseos}" />
-			<property name="basews" value="${basews}" />
-			<property name="basearch" value="${basearch}" />
-			<property name="build.home" value="${env.BUILD_HOME}" />
-			<property name="build.trial" value="${build.trial}" />
-			<property name="build.component" value="${build.component}" />
-
-			<property name="mapVersionTag" value="${mapVersionTag}" />
-			<property name="buildType" value="${buildType}" />
-			<property name="ftpUser" value="${ftpUser}" />
-			<property name="ftpPassword" value="${ftpPassword}" />
-			<property name="ftpServer" value="${ftpServer}" />
-			<property name="ftpRemoteDirectory" value="${ftpRemoteDirectory}" />
-
-		</ant>
-	</target>
-
-
-
-	<target name="Driver">
-		<ant antfile="checkout.xml" target="all" dir="." inheritall="false">
-			<property name="build.home" value="${env.BUILD_HOME}" />
-			<property name="codir" value="${env.BUILD_HOME}/build-node/checkout/wtp-driver" />
-			<property name="buildType" value="I" />
-			<property name="mapVersionTag" value="${mapVersionTag}" />
-		</ant>
-		<ant antfile="drivers.xml" target="all" dir="${env.BUILD_HOME}/build-node/checkout/wtp-driver/releng.builder/tools/cruise" inheritall="false">
-		</ant>
-	</target>
-
-	<target name="docs">
-		<property name="build.component" value="docs" />
-		<property name="buildTarget" value="buildDoc" />
-		<antcall target="Build">
-			<param name="ftpRemoteDirectory" value="${ftpDocsRemoteDirectory}"/>
-		</antcall>
-	</target>
-
-
-	<target name="clean" if="removeBuildDir">
-		<delete dir="${env.BUILD_HOME}/build-${build.component}-${buildType}" failonerror="false" />
-		<delete dir="${env.BUILD_HOME}/test-${build.component}-${buildType}" failonerror="false" />
-		<delete dir="${env.BUILD_HOME}/build-node/checkout/${build.component}-${buildType}/build/test-results" failonerror="false" />
-		<delete dir="${env.BUILD_HOME}/workspace" failonerror="false" />
-	</target>
-
-</project>
diff --git a/releng.control/upload-dw.properties b/releng.control/upload-dw.properties
deleted file mode 100644
index ae243a6..0000000
--- a/releng.control/upload-dw.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# These are some properties needed to upload builds from the build machine to the download machine. 
-# The actual task that does that is in wtp.upload in releng.wtpBuidler. 
-# Its better to set here, "outside" of wtpBuilder, since it can be machine and user specific
-# 
-
-build.upload=true
- 
-uploadUser=davidw
-uploadPassword="This is not really used since ssh login is assumed (required)"
-uploadServer=localhost
-uploadRemoteDirectory=/usr/local/apache2/htdocs/webtools/${sub-home}/drops/${buildBranch}
-
-# rsyncRootPrefix should be empty for Linux machines.
-# But, Windows using cygwin will needs something like /cygdrive/G/
-# for what ever drive or directory is parent of build home
-rsyncRootPrefix=
-
diff --git a/releng.control/upload.properties b/releng.control/upload.properties
deleted file mode 100644
index 05c59f7..0000000
--- a/releng.control/upload.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# These are some properties needed to upload builds from the build machine to the download machine. 
-# The actual task that does that is in wtp.upload in releng.wtpBuidler. 
-# Its better to set here, "outside" of wtpBuilder, since it can be machine and user specific
-# 
-buildBranch=R2.0
- 
-uploadUser=david_williams
-uploadPassword="This is not really used since ssh login is assumed (required)"
-uploadServer=download.eclipse.org
-uploadRemoteDirectory=/home/data/users/${uploadUser}/downloads/webtools/${sub-home}/drops/${buildBranch}
-
-# rsyncRootPrefix should be empty for Linux machines.
-# But, Windows using cygwin will needs something like /cygdrive/G/
-# for what ever drive or directory is parent of build home
-rsyncRootPrefix=
-
-build.upload=true
diff --git a/releng.control/whatisfixed.xml b/releng.control/whatisfixed.xml
index baa849c..002a1db 100644
--- a/releng.control/whatisfixed.xml
+++ b/releng.control/whatisfixed.xml
@@ -1,7 +1,23 @@
-<project default="whatisfixed" basedir=".">
+<project name="whatisfixed" default="whatisfixed" basedir=".">
 
-	<property file="whatisfixed.properties" />
+    <!-- = = = 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 = = = -->
 
 	<target name="whatisfixed" depends="clean">