streamline build scripts
diff --git a/releng.control/ b/releng.control/
index b11b188..129e4b2 100644
--- a/releng.control/
+++ b/releng.control/
@@ -24,21 +24,21 @@
-echo "	saving serialized CC state ..."
+echo "    saving serialized CC state ..."
 cp ${RELENG_CONTROL}/*.ser . >/dev/null 2>/dev/null
-echo "	removing all of ${RELENG_CONTROL} ..."
+echo "    removing all of ${RELENG_CONTROL} ..."
 rm -fr ${RELENG_CONTROL}/*
 rm -fr ${RELENG_CONTROL}/.project
 mkdir -p ${RELENG_CONTROL}
-echo "	checking out head of ${RELENG_CONTROL} from cvs ..."
+echo "    checking out head of ${RELENG_CONTROL} from cvs ..."
 cvs -Q -f -d  export -d ${RELENG_CONTROL} -r HEAD webtools.releng/${RELENG_CONTROL}
-echo "    restore serialized CC state"
+echo "    restoreing serialized CC state ..."
 mv *.ser ${RELENG_CONTROL} >/dev/null 2>/dev/null
-echo "    make sure releng control files are executable and have proper EOL"
+echo "    making sure releng control files are executable and have proper EOL"
 dos2unix ${RELENG_CONTROL}/*.sh* ${RELENG_CONTROL}/*.properties ${RELENG_CONTROL}/*.xml >/dev/null 2>>/dev/null
 chmod +x ${RELENG_CONTROL}/*.sh > /dev/null
diff --git a/releng.control/ b/releng.control/
new file mode 100644
index 0000000..17f3898
--- /dev/null
+++ b/releng.control/
@@ -0,0 +1,18 @@
+if [ -f ${PIDFILE} ] ; then
+  echo "    Killing CC process from PID file";
+  PID=`cat ${PIDFILE}`
+  kill -3 $PID
+  if kill -9 $PID ; then
+    echo "    CC process stopped";
+  else
+    echo "    CC process could not be stopped";
+  fi
+  rm -f ${PIDFILE}
+	echo "    PID file (${PIDFILE}) does not exist.";
+	echo "        Either CC not running, or PID file deleted";  
\ No newline at end of file
diff --git a/releng.control/localBuildExample/ b/releng.control/localBuildExample/
index a192443..83e7f5e 100644
--- a/releng.control/localBuildExample/
+++ b/releng.control/localBuildExample/
@@ -47,7 +47,7 @@
diff --git a/releng.control/releng.control cc_project_build.xml.launch b/releng.control/releng.control cc_project_build.xml.launch
index 856c6a1..491d970 100644
--- a/releng.control/releng.control cc_project_build.xml.launch
+++ b/releng.control/releng.control cc_project_build.xml.launch
@@ -16,20 +16,20 @@
 <mapEntry key="LOCAL_PREREQS_CACHE" value="/home/shared/workbenchbuild/prereqcache"/>
 <mapEntry key="USE_LOCAL_MAPS" value="false"/>
 <mapEntry key="BASEWS" value="gtk"/>
-<mapEntry key="WTP_CVS_SERVER" value=""/>
+<mapEntry key="BUILD_CVS_SERVER" value=""/>
 <mapEntry key="JAVA_5_HOME" value="/home/shared/webtools/apps/jdk1.5.0_12"/>
 <mapEntry key="RELENG" value="webtools.maps/releng"/>
 <mapEntry key="BASEOS" value="linux"/>
 <mapEntry key="LOCAL_BUILD_PROPERTIES_DIR" value="/home/shared/workbenchbuild/localBuildProperties"/>
 <mapEntry key="RELENGDALI" value="webtools.maps/releng.dali"/>
 <mapEntry key="CVS_RSH" value="ssh"/>
-<mapEntry key="WTP_CVS_PROTOCOL" value="ext"/>
+<mapEntry key="BUILD_CVS_WRITE_PROTOCOL" value="ext"/>
 <mapEntry key="BUILD_HOME" value="/home/shared/workbenchbuild/"/>
-<mapEntry key="WTP_CVS_USER" value="david_williams"/>
+<mapEntry key="BUILD_CVS_WRITE_USER" value="david_williams"/>
 <mapEntry key="BASEARCH" value="x86"/>
 <mapEntry key="JAVA_4_HOME" value="/home/shared/webtools/apps/j2sdk1.4.2_14"/>
-<mapEntry key="RELENGWTPBUILDER" value="webtools.releng/releng.wtpbuilder"/>
-<mapEntry key="WTP_CVS_ROOT" value="/cvsroot/webtools"/>
+<mapEntry key="RELENG_BUILDER" value="webtools.releng/releng.wtpbuilder"/>
+<mapEntry key="BUILD_CVS_ROOT" value="/cvsroot/webtools"/>
 <mapEntry key="RELENGJSF" value="webtools.maps/releng.jsf"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
diff --git a/releng.control/ b/releng.control/
deleted file mode 100644
index 28492c1..0000000
--- a/releng.control/
+++ /dev/null
@@ -1,17 +0,0 @@
-# now, restart CC's
-echo "restarting CruiseControl"
-# and list our processes for a warm fuzzy, we pause briefly, since in some
-# error conditions, they will start, but then shutdown a few seconds later
-sleep 10s
-echo "current java processes"
-ps x ww  | grep java
diff --git a/releng.control/somePathDirectory/commonVariations.shsource b/releng.control/somePathDirectory/commonVariations.shsource
index 2bad7b4..71d096b 100644
--- a/releng.control/somePathDirectory/commonVariations.shsource
+++ b/releng.control/somePathDirectory/commonVariations.shsource
@@ -13,19 +13,26 @@
 # be included in other sh files, with "source" command, not 
 # executed on its own. 
+# Some things _have_ to go in this file, instead of being an ant property, 
+# since they may be used outside the contect of ant (or, before ant get's started). 
+# as one example, anything used directly in the cc_config.xml file has to be 
+# provided as environment variable, since it can not import ant property files 
+# like most ant project files can.
 export BUILD_HOME=/home/shared/webtools
-export DISPLAY=
+# the following does not really vary, but must be specified "early" 
+export RELENG_CONTROL=${BUILD_HOME}/releng.control
-echo "remember to check X virtual frame buffer is running for headless JUnit testing";
-ps -ef | grep Xvfb
+export DISPLAY=
 # these should be full, abosolute path to the respective home directories
 # on this particular build machine
-export ANT_HOME=/shared/webtools/apps/apache-ant-1.7.0
-export JAVA_4_HOME=/shared/webtools/apps/IBMJava2-ppc-142
-export JAVA_5_HOME=/shared/webtools/apps/ibm-java2-ppc-50
-export CCDIR=/shared/webtools/apps/cruisecontrol-bin-2.7.1
+export ANT_HOME=/home/shared/webtools/apps/apache-ant-1.7.0
+export JAVA_4_HOME=/home/shared/webtools/apps/j2sdk1.4.2_11
+export JAVA_5_HOME=/home/shared/webtools/apps/jdk1.5.0_12
+export CCDIR=/home/shared/webtools/apps/cruisecontrol-bin-2.7.1
 export BASEOS=linux
 export BASEWS=gtk
@@ -37,39 +44,47 @@
 # See the 'localBuildExample' directory for a starting example
 export LOCAL_BUILD_PROPERTIES_DIR=${BUILD_HOME}/localBuildProperties
-export BUILD_RETURN_NAME=davidwAtWork
+# note: buildmaster email address should be "real" address 
+# that is subscribed to the mailing list, if you want to send 
+# mail to mailing list. 
-# for  builds on local machines, SKIPUSERS should be 'true' to avoid 
-# notifying users about those builds on your local machine
-export SKIPUSERS=true
 # controls quietness of logging to console
 # false means more output to console, true uses ant's logger
-export USE_LOGGER=false
+export USE_LOGGER=true
 # contols ANT's quietness level
 # true logs error and warnings only 
-export USE_QUIET=false
+export USE_QUIET=true
 # controls ANT's debug level
 # setting to true will result in TONS of ouput
 export USE_DEBUG=false
-# should be true for production, false for local
+# should be true for production, false for local. 
+# it can be set to true for local builds, but then the 
+# properties in need to be set to valid values.
+export BUILD_UPLOAD=true
+# if true, locally existing maps will be used as is, instead of being 
+# checked out afresh. Set to false for production builds, so maps are 
+# always fresh.
+export USE_LOCAL_MAPS=false
 # normally, cvs logging output can be "really quiet", but if problems, then it can be turned back on 
 # to get more potentially diagnostic information
 # TODO: if both of these are 'true' and error is generated by cvs ...
 # saying you can't set both to true.  
 # we could put in some logic to prevent that, someday. 
-export CVS_QUIET=false
-export CVS_REALLY_QUIET=false
+export CVS_QUIET=true
+export CVS_REALLY_QUIET=true
 #   these cvs values need to have write access if 
-#   build.trial is false, as on production machine. 
+#   tag.maps is true, as on production machine. 
 #   This is the ID used to both read, and 
 #   to tag releng map files.
@@ -80,7 +95,14 @@
 #   if protocol was pserver, but could be removed in that 
 #   case, if desired. 
 export CVS_RSH=ssh 
-export WTP_CVS_PROTOCOL=ext
-export WTP_CVS_USER=david_williams
-export WTP_CVS_ROOT=/cvsroot/webtools
+export BUILD_CVS_READ_USER=anonymous
+export BUILD_CVS_WRITE_USER=david_williams
+export BUILD_CVS_ROOT=/cvsroot/webtools
+# for  builds on local machines, SKIPUSERS should be 'true' to avoid 
+# notifying users about those builds on your local machine
+export SKIPUSERS=true
diff --git a/releng.control/ b/releng.control/
deleted file mode 100644
index 3783043..0000000
--- a/releng.control/
+++ /dev/null
@@ -1,15 +0,0 @@
-# remember to leave no slashes on filename in source command, 
-# so that users path is used to find it (first)
-   source commonVariations.shsource
-#   source computeCommon.shsource
-cd ${BUILD_HOME}/releng.control
-sh ${BUILD_HOME}/releng.control/
diff --git a/releng.control/ b/releng.control/
deleted file mode 100644
index 6e969eb..0000000
--- a/releng.control/
+++ /dev/null
@@ -1,21 +0,0 @@
-# remember to leave no slashes on filename in source command, 
-# so that users path is used to find it (first)
-   source commonVariations.shsource
-   source computeCommon.shsource   
-# allow to terminate themselves, if they will
-echo "Attempting normal terminate of all java processes"
-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 ${JAVA_HOME}/jre/bin/java/jre/bin/java
-#    pause briefly to allow ports to free up, etc.
-sleep 10s
diff --git a/releng.control/whatisfixed.xml b/releng.control/whatisfixed.xml
index 1a83fa6..334d208 100644
--- a/releng.control/whatisfixed.xml
+++ b/releng.control/whatisfixed.xml
@@ -34,7 +34,7 @@
         <ant antfile="${wtpBuilder}">
-                value="${whatisfixed.workdir}/${env.RELENGWTPBUILDER}" />
+                value="${whatisfixed.workdir}/${env.RELENG_BUILDER}" />
                 value="${buildBranch}" />
@@ -53,7 +53,7 @@
             property="map.exists" />
-            file="${whatisfixed.workdir}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml"
+            file="${whatisfixed.workdir}/${env.RELENG_BUILDER}/scripts/dependency/build.xml"
             property="releng.exists" />
         <antcall target="checkout-maps" />
         <antcall target="getwtpbuilder" />
@@ -76,15 +76,15 @@
         <property file="${whatisfixed.workdir}/${env.RELENG}/maps/build.cfg" />
-            dir="${whatisfixed.workdir}/${env.RELENGWTPBUILDER}"
+            dir="${whatisfixed.workdir}/${env.RELENG_BUILDER}"
             failonerror="false" />
-            message="Version tag for ${env.RELENGWTPBUILDER} is: ${wtpBuilderVersion}" />
+            message="Version tag for ${env.RELENG_BUILDER} is: ${wtpBuilderVersion}" />
-            package="${env.RELENGWTPBUILDER}"
+            package="${env.RELENG_BUILDER}"
             tag="${wtpBuilderVersion}" />