slightly improved CC config file
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 7c59c35..d6a1ed4 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -43,16 +43,32 @@
         format="yyyyMMdd-HHmm z" />
 
     <plugin
+        name="ant"
+        antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+        buildfile="${env.BUILD_HOME}/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}/temp/antWorkingDir" />
+
+    <plugin
         name="project"
         buildafterfailed="true">
         <dateformat format="yyyyMMdd-HHmm z" />
         <log
             dir="${logDir}"
             encoding="ISO-8859-1">
+            <merge
+                dir="${env.BUILD_HOME}/tests/${project.name}/results/xml" />
             <delete
                 every="10"
                 unit="DAY"
                 ignoreSuffix="true" />
+            <gzip
+                every="5"
+                unit="DAY" />
         </log>
         <listeners>
             <currentbuildstatuslistener />
@@ -60,6 +76,7 @@
         <modificationset>
             <forceonly />
         </modificationset>
+
         <publishers>
             <email
                 mailhost="localhost"
@@ -88,15 +105,7 @@
         forceOnly="true">
 
         <schedule interval="${time.oneHour}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="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">
+            <ant>
 
                 <property
                     name="buildType"
@@ -127,15 +136,7 @@
         </modificationset>
 
         <schedule interval="${time.oneHour}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="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">
+            <ant>
 
                 <!-- this "M" label should be changed to "R" once maintenance release
                     is warming up for its "R"elease.
@@ -168,14 +169,7 @@
 
         <schedule interval="${time.VeryVeryLongTime}">
             <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="cc_project_retest.xml"
-                target="Build"
-                useQuiet="${env.USE_QUIET}"
-                useLogger="${env.USE_LOGGER}"
-                savelogdir="${logDir}"
-                usedebug="${env.USE_DEBUG}"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
+                buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml">
 
                 <!-- this "M" label should be changed to "R" once maintenance release
                     is warming up for its "R"elease.
@@ -217,15 +211,7 @@
         </modificationset>
 
         <schedule interval="${time.oneHour}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="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">
+            <ant>
 
                 <!-- this "M" label should be changed to "R" once maintenance release
                     is warming up for its "R"elease.
@@ -262,15 +248,7 @@
 
         <schedule interval="${time.VeryVeryLongTime}">
             <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="cc_project_retest.xml"
-                target="Build"
-                useQuiet="${env.USE_QUIET}"
-                useLogger="${env.USE_LOGGER}"
-                savelogdir="${logDir}"
-                usedebug="${env.USE_DEBUG}"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
-
+                buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml">
                 <property
                     name="buildType"
                     value="M" />
@@ -312,15 +290,8 @@
         </modificationset>
 
         <schedule interval="${time.oneHour}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="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">
+            <ant>
+
                 <property
                     name="buildType"
                     value="I" />
@@ -353,14 +324,7 @@
 
         <schedule interval="${time.VeryVeryLongTime}">
             <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="cc_project_retest.xml"
-                target="Build"
-                useQuiet="${env.USE_QUIET}"
-                useLogger="${env.USE_LOGGER}"
-                savelogdir="${logDir}"
-                usedebug="${env.USE_DEBUG}"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
+                buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml">
                 <property
                     name="buildType"
                     value="I" />
@@ -390,15 +354,7 @@
         name="wtp-R3.0-N"
         forceOnly="true">
         <schedule interval="${time.oneHour}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="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">
+            <ant>
                 <property
                     name="buildType"
                     value="N" />
@@ -430,14 +386,7 @@
         forceOnly="true">
         <schedule interval="${time.VeryVeryLongTime}">
             <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="cc_project_retest.xml"
-                target="Build"
-                useQuiet="${env.USE_QUIET}"
-                useLogger="${env.USE_LOGGER}"
-                savelogdir="${logDir}"
-                usedebug="${env.USE_DEBUG}"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
+                buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml">
                 <property
                     name="buildType"
                     value="N" />
@@ -482,15 +431,7 @@
         </modificationset>
 
         <schedule interval="${time.oneHour}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="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">
+            <ant>
                 <property
                     name="buildType"
                     value="S" />
@@ -527,14 +468,7 @@
         forceOnly="true">
         <schedule interval="${time.VeryVeryLongTime}">
             <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="cc_project_retest.xml"
-                target="Build"
-                useQuiet="${env.USE_QUIET}"
-                useLogger="${env.USE_LOGGER}"
-                savelogdir="${logDir}"
-                usedebug="${env.USE_DEBUG}"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
+                buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml">
                 <property
                     name="buildType"
                     value="S" />
@@ -584,15 +518,7 @@
         </modificationset>
 
         <schedule interval="${time.oneHour}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="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">
+            <ant>
                 <property
                     name="buildType"
                     value="R" />
@@ -627,14 +553,7 @@
 
         <schedule interval="${time.VeryVeryLongTime}">
             <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="cc_project_retest.xml"
-                target="Build"
-                useQuiet="${env.USE_QUIET}"
-                useLogger="${env.USE_LOGGER}"
-                savelogdir="${logDir}"
-                usedebug="${env.USE_DEBUG}"
-                antworkingdir="${env.BUILD_HOME}/releng.control">
+                buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml">
                 <property
                     name="buildType"
                     value="R" />
@@ -670,15 +589,7 @@
         name="wtp-buildTools-R3.0-T"
         forceOnly="true">
         <schedule interval="${time.VeryVeryLongTime}">
-            <ant
-                antscript="${env.BUILD_HOME}/releng.control/ant.sh"
-                buildfile="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">
+            <ant>
                 <property
                     name="buildType"
                     value="T" />