streamline build scripts
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index c619718..4ac92d3 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -37,14 +37,14 @@
         file="${logDir}/status.txt" />
     <plugin
         name="ant"
-        antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-        buildfile="${env.BUILD_HOME}/releng.control/cc_project_build.xml"
+        antscript="${env.RELENG_CONTROL}/ant.sh"
+        buildfile="${env.RELENG_CONTROL}/cc_project_build.xml"
         target="Build"
         useQuiet="${env.USE_QUIET}"
         useLogger="${env.USE_LOGGER}"
         savelogdir="${logDir}"
         usedebug="${env.USE_DEBUG}"
-        antworkingdir="${env.BUILD_HOME}/releng.control" />
+        antworkingdir="${env.RELENG_CONTROL}" />
     <plugin
         name="project"
         buildafterfailed="true">
@@ -71,14 +71,14 @@
         </modificationset>
         <publishers>
             <antpublisher
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="${env.BUILD_HOME}/releng.control/cc_copyArtifacts.xml"
+                antscript="${env.RELENG_CONTROL}/ant.sh"
+                buildfile="${env.RELENG_CONTROL}/cc_copyArtifacts.xml"
                 target="copyArtifacts"
                 useQuiet="${env.USE_QUIET}"
                 useLogger="${env.USE_LOGGER}"
                 savelogdir="${logDir}"
                 usedebug="${env.USE_DEBUG}"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
+                antworkingdir="${env.RELENG_CONTROL}">
                 <property
                     name="localArtifactsDirectory"
                     value="${env.BUILD_HOME}/artifacts/${project.name}" />
@@ -98,7 +98,7 @@
     </plugin>
     <plugin
         name="cvs"
-        cvsroot=":${env.WTP_CVS_PROTOCOL}:${env.WTP_CVS_USER}@${env.WTP_CVS_SERVER}:${env.WTP_CVS_ROOT}" />
+        cvsroot=":${env.BUILD_CVS_READ_PROTOCOL}:${env.BUILD_CVS_READ_USER}@${env.BUILD_CVS_SERVER}:${env.BUILD_CVS_ROOT}" />
 
     <!-- 
         
@@ -184,15 +184,18 @@
             <cvs
                 tag="R2_0_maintenance"
                 module="${env.RELENGMAPS}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+                quiet="${env.CVS_QUIET}"
+                reallyquiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
                 module="${env.RELENGDALI}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+                quiet="${env.CVS_QUIET}"
+                reallyquiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
                 module="${env.RELENGJSF}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+                quiet="${env.CVS_QUIET}"
+                reallyquiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
         <schedule
             interval="${time.oneHour}">
@@ -231,15 +234,18 @@
         <cvs
         tag="R2_0_maintenance"
         module="${env.RELENGMAPS}"
-        reallyQuiet="${env.CVS_REALLY_QUIET}" />
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
         <cvs
         tag="R1_0_maintenance"
         module="${env.RELENGDALI}"
-        reallyQuiet="${env.CVS_REALLY_QUIET}" />
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
         <cvs
         tag="R1_0_maintenance"
         module="${env.RELENGJSF}"
-        reallyQuiet="${env.CVS_REALLY_QUIET}" />
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}"/>
         </modificationset>
         
         <schedule interval="${time.VeryVeryLongTime}">
@@ -277,13 +283,16 @@
             quietperiod="120">
             <cvs
                 module="${env.RELENGMAPS}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+                quiet="${env.CVS_QUIET}"
+                reallyquiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 module="${env.RELENGJSF}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+                quiet="${env.CVS_QUIET}"
+                reallyquiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 module="${env.RELENGDALI}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+                quiet="${env.CVS_QUIET}"
+                reallyquiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
         <schedule
             interval="${time.VeryVeryLongTime}">
@@ -352,13 +361,16 @@
             quietperiod="120">
             <cvs
                 module="${env.RELENGMAPS}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 module="${env.RELENGJSF}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 module="${env.RELENGDALI}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
         <schedule
             interval="${time.oneHour}">
@@ -404,13 +416,16 @@
         <modificationset quietperiod="120">
         <cvs
         module="${env.RELENGMAPS}"
-        reallyQuiet="${env.CVS_REALLY_QUIET}" />
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}"/>
         <cvs
         module="${env.RELENGJSF}"
-        reallyQuiet="${env.CVS_REALLY_QUIET}" />
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
         <cvs
         module="${env.RELENGDALI}"
-        reallyQuiet="${env.CVS_REALLY_QUIET}" />
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
         
         <schedule interval="${time.oneHour}">