prep for 304 update patches
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 6f2164d..bf0c476 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -1,9 +1,10 @@
 <cruisecontrol>
-   <system>
-      <configuration>
-         <threads count="4"/>
-      </configuration>
-   </system>
+    <system>
+        <configuration>
+            <threads
+                count="4"/>
+        </configuration>
+    </system>
     <!--
         Note to be cross-platform, "environment variables" are only
         appropriate for some variables, e.g. ones we set, since
@@ -13,7 +14,7 @@
     -->
     <property
         environment="env"
-        toupper="true" />
+        toupper="true"/>
     <!--
         Note: can not quite use "standard properties" pattern, as in ant
         files, since for CC, it is an error if a property file does not
@@ -21,29 +22,29 @@
     -->
     <property
         name="time.tenMinutes"
-        value="600" />
+        value="600"/>
     <property
         name="time.oneHour"
-        value="3600" />
-     <property
+        value="3600"/>
+    <property
         name="time.twoHours"
-        value="7200" />
+        value="7200"/>
     <property
         name="time.fourHours"
-        value="14400" />        
+        value="14400"/>
     <property
         name="time.twentyFourHours"
-        value="86400" />
+        value="86400"/>
     <property
         name="time.veryLongTime"
-        value="31536000" />
+        value="31536000"/>
     <plugin
         name="log"
         dir="${env.LOG_DIR}/${project.name}"
-        encoding="ISO-8859-1" />
+        encoding="ISO-8859-1"/>
     <plugin
         name="currentbuildstatuslistener"
-        file="${env.LOG_DIR}/${project.name}/status.txt" />
+        file="${env.LOG_DIR}/${project.name}/status.txt"/>
     <!--
         remember, our logDir must be same as logdir specified in CC's
         web.xml file
@@ -56,7 +57,7 @@
         uselogger="${env.USE_LOGGER}"
         usequiet="${env.USE_QUIET}"
         savelogdir="${env.LOG_DIR}/${project.name}"
-        antworkingdir="${env.ANT_WORKING}/${project.name}" />
+        antworkingdir="${env.ANT_WORKING}/${project.name}"/>
     <plugin
         name="htmlemail"
         mailhost="localhost"
@@ -69,30 +70,30 @@
         failasimportant="false"
         buildresultsurl="${env.BUILD_RESULT_URL}/${project.name}">
         <always
-            address="${env.BUILD_ALWAYS_TO_ADDRESS}" />
+            address="${env.BUILD_ALWAYS_TO_ADDRESS}"/>
     </plugin>
     <plugin
         name="project"
         buildafterfailed="false">
-        <!-- dateformat had to be removed for CC 2.8.0
-        <dateformat
+        <!--
+            dateformat had to be removed for CC 2.8.0 <dateformat
             format="yyyy-MM-dd HH:mm '('z')'" />
-         -->
+        -->
         <log
             dir="${env.LOG_DIR}/${project.name}"
             encoding="ISO-8859-1">
             <merge
-                dir="${env.PROJECT_TESTS}/${project.name}/results/xml" />
+                dir="${env.PROJECT_TESTS}/${project.name}/results/xml"/>
             <delete
                 every="10"
                 unit="DAY"
-                ignoreSuffix="true" />
+                ignoreSuffix="true"/>
             <gzip
                 every="5"
-                unit="DAY" />
+                unit="DAY"/>
         </log>
         <listeners>
-            <currentbuildstatuslistener />
+            <currentbuildstatuslistener/>
         </listeners>
         <publishers>
             <antpublisher
@@ -105,25 +106,39 @@
                 saveLogDir="${env.BUILD_HOME}/tmp">
                 <property
                     name="localArtifactsDirectory"
-                    value="${env.PROJECT_ARTIFACTS}/${project.name}" />
+                    value="${env.PROJECT_ARTIFACTS}/${project.name}"/>
             </antpublisher>
             <htmlemail
                 logdir="${env.LOG_DIR}/${project.name}">
-                <failure address="david_williams" reportWhenFixed="true" />
-                <failure address="nitind" reportWhenFixed="true" />
-                <failure address="avera" reportWhenFixed="true" />
-                <failure address="nhauge" reportWhenFixed="true" />
-                <failure address="tle" reportWhenFixed="true" />
-                <failure address="rsrinivasan" reportWhenFixed="true" />
-                <failure address="nsandonato" reportWhenFixed="true" />
+                <failure
+                    address="david_williams"
+                    reportWhenFixed="true"/>
+                <failure
+                    address="nitind"
+                    reportWhenFixed="true"/>
+                <failure
+                    address="avera"
+                    reportWhenFixed="true"/>
+                <failure
+                    address="nhauge"
+                    reportWhenFixed="true"/>
+                <failure
+                    address="tle"
+                    reportWhenFixed="true"/>
+                <failure
+                    address="rsrinivasan"
+                    reportWhenFixed="true"/>
+                <failure
+                    address="nsandonato"
+                    reportWhenFixed="true"/>
                 <propertiesmapper
-                    file="${env.EMAIL_PROPERTIES}" />
+                    file="${env.EMAIL_PROPERTIES}"/>
             </htmlemail>
         </publishers>
     </plugin>
     <plugin
         name="cvs"
-        cvsroot=":${env.BUILD_CVS_READ_PROTOCOL}:${env.BUILD_CVS_READ_USER}@${env.BUILD_CVS_SERVER}:${env.BUILD_CVS_ROOT}" />
+        cvsroot=":${env.BUILD_CVS_READ_PROTOCOL}:${env.BUILD_CVS_READ_USER}@${env.BUILD_CVS_SERVER}:${env.BUILD_CVS_ROOT}"/>
     <!--
         Note: projects must be named in the form
         ${build.distribution}-${buildBranch}-${buildType} Also, please
@@ -137,8 +152,8 @@
         requireModification="false"
         name="cleanup-artifacts-B">
         <modificationset>
-         <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
-            <alwaysbuild />
+            <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
+            <alwaysbuild/>
         </modificationset>
         <schedule
             interval="${time.twentyFourHours}">
@@ -155,76 +170,72 @@
         <publishers>
         </publishers>
     </project>
-
     <project
         forceOnly="true"
         requireModification="false"
         name="wtpbuildTools-R3.0-T">
         <modificationset>
-         <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
-            <alwaysbuild />
+            <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
+            <alwaysbuild/>
         </modificationset>
         <schedule
             interval="${time.veryLongTime}">
             <ant>
                 <property
                     name="buildType"
-                    value="T" />
+                    value="T"/>
                 <property
                     name="buildBranch"
-                    value="R3.0" />
+                    value="R3.0"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="releng.dali-mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="releng.jsf-mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="build.distribution"
-                    value="wtpbuildTools" />
+                    value="wtpbuildTools"/>
             </ant>
         </schedule>
     </project>
-    
     <project
         forceOnly="false"
-        requireModification="true"    
+        requireModification="true"
         name="xsl-R1.0-I">
         <modificationset
             quietperiod="120">
             <cvs
                 module="${env.RELENGSOURCEEDITING}"
-                reallyquiet="${env.CVS_QUIET}" />
+                reallyquiet="${env.CVS_QUIET}"/>
         </modificationset>
         <schedule
             interval="${time.oneHour}">
             <ant>
                 <property
                     name="buildType"
-                    value="I" />
+                    value="I"/>
                 <property
                     name="buildBranch"
-                    value="R1.0" />
+                    value="R1.0"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="build.distribution"
-                    value="xsl" />
+                    value="xsl"/>
                 <property
                     name="SKIP_JAR_SIGNING"
-                    value="true" />
+                    value="true"/>
                 <property
                     name="normalizeJarFiles"
-                    value="false" />
-                    
+                    value="false"/>
             </ant>
         </schedule>
     </project>
-
     <project
         forceOnly="false"
         requireModification="true"
@@ -233,33 +244,32 @@
             quietperiod="120">
             <cvs
                 module="${env.RELENGINCUBATORVEX}"
-                reallyquiet="${env.CVS_QUIET}" />
+                reallyquiet="${env.CVS_QUIET}"/>
         </modificationset>
         <schedule
             interval="${time.oneHour}">
             <ant>
                 <property
                     name="buildType"
-                    value="I" />
+                    value="I"/>
                 <property
                     name="buildBranch"
-                    value="R0.5" />
+                    value="R0.5"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="build.distribution"
-                    value="vex" />
+                    value="vex"/>
                 <property
                     name="SKIP_JAR_SIGNING"
-                    value="true" />
+                    value="true"/>
                 <property
                     name="normalizeJarFiles"
-                    value="false" />
+                    value="false"/>
             </ant>
         </schedule>
     </project>
-
     <project
         forceOnly="true"
         requireModification="true"
@@ -268,130 +278,123 @@
             quietperiod="120">
             <cvs
                 module="${env.RELENGSERVERTOOLS}"
-                reallyquiet="${env.CVS_QUIET}" />
+                reallyquiet="${env.CVS_QUIET}"/>
         </modificationset>
         <schedule
             interval="${time.oneHour}">
             <ant>
                 <property
                     name="buildType"
-                    value="I" />
+                    value="I"/>
                 <property
                     name="buildBranch"
-                    value="R3.1" />
+                    value="R3.1"/>
                 <property
                     name="mapVersionTag"
-                    value="david_williams_tempBranch11" />
+                    value="david_williams_tempBranch11"/>
                 <property
                     name="build.distribution"
-                    value="servadapt" />
+                    value="servadapt"/>
             </ant>
         </schedule>
     </project>
-
-
     <project
         forceOnly="false"
-        requireModification="true"    
+        requireModification="true"
         name="jaxws-R0.5-I">
         <modificationset
             quietperiod="120">
             <cvs
                 module="${env.RELENGJAXWS}"
-                reallyquiet="${env.CVS_QUIET}" />
+                reallyquiet="${env.CVS_QUIET}"/>
         </modificationset>
         <schedule
             interval="${time.oneHour}">
             <ant>
                 <property
                     name="buildType"
-                    value="I" />
+                    value="I"/>
                 <property
                     name="buildBranch"
-                    value="R0.5" />
+                    value="R0.5"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="build.distribution"
-                    value="jaxws" />
+                    value="jaxws"/>
                 <property
                     name="SKIP_JAR_SIGNING"
-                    value="true" />
+                    value="true"/>
                 <property
                     name="normalizeJarFiles"
-                    value="false" />
-                    
+                    value="false"/>
             </ant>
         </schedule>
     </project>
-    
     <project
         forceOnly="false"
-        requireModification="true"    
+        requireModification="true"
         name="xmlsec-R0.5-I">
         <modificationset
             quietperiod="120">
             <cvs
                 module="${env.RELENGXMLSEC}"
-                reallyquiet="${env.CVS_QUIET}" />
+                reallyquiet="${env.CVS_QUIET}"/>
         </modificationset>
         <schedule
             interval="${time.oneHour}">
             <ant>
                 <property
                     name="buildType"
-                    value="I" />
+                    value="I"/>
                 <property
                     name="buildBranch"
-                    value="R0.5" />
+                    value="R0.5"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="build.distribution"
-                    value="xmlsec" />
+                    value="xmlsec"/>
                 <property
                     name="SKIP_JAR_SIGNING"
-                    value="true" />
+                    value="true"/>
                 <property
                     name="normalizeJarFiles"
-                    value="false" />
-                    
+                    value="false"/>
             </ant>
         </schedule>
     </project>
-
-
     <project
         forceOnly="true"
         requireModification="true"
         name="dali-R2.1-R">
         <modificationset>
-         <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
-            <alwaysbuild />
+            <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
+            <alwaysbuild/>
         </modificationset>
-        <schedule interval="${time.veryLongTime}">
+        <schedule
+            interval="${time.veryLongTime}">
             <ant>
                 <property
                     name="buildType"
-                    value="R" />
+                    value="R"/>
                 <property
                     name="buildBranch"
-                    value="R2.1" />
+                    value="R2.1"/>
                 <property
                     name="buildId"
-                    value="2.1.1" />                    
+                    value="2.1.1"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="releng.dali-mapVersionTag"
-                    value="R2_1_maintenance" />
+                    value="R2_1_maintenance"/>
                 <property
                     name="build.distribution"
-                    value="dali" />
-                
+                    value="dali"/>
             </ant>
         </schedule>
     </project>
@@ -401,19 +404,26 @@
         requireModification="true"
         name="patches-R1.5.5-P">
         <modificationset>
-         <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
-            <alwaysbuild />
+            <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
+            <alwaysbuild/>
         </modificationset>
-        
-        <schedule interval="${time.veryLongTime}">
+        <schedule
+            interval="${time.veryLongTime}">
             <ant>
-                <property name="buildType" value="P" />
-                <property name="buildBranch" value="R1.5.5" />
-                <property name="mapVersionTag" value="R1_5_5_patches" />
-                <property name="build.distribution" value="patches" />
+                <property
+                    name="buildType"
+                    value="P"/>
+                <property
+                    name="buildBranch"
+                    value="R1.5.5"/>
+                <property
+                    name="mapVersionTag"
+                    value="R1_5_5_patches"/>
+                <property
+                    name="build.distribution"
+                    value="patches"/>
             </ant>
         </schedule>
-        
         <publishers>
             <antpublisher
                 antscript="${env.RELENG_CONTROL}/ant_med_priority.sh"
@@ -425,37 +435,42 @@
                 saveLogDir="${env.BUILD_HOME}/tmp">
                 <property
                     name="localArtifactsDirectory"
-                    value="${env.PROJECT_ARTIFACTS}/${project.name}" />
+                    value="${env.PROJECT_ARTIFACTS}/${project.name}"/>
             </antpublisher>
             <htmlemail
                 skipusers="true"
                 logdir="${env.BUILD_HOME}/tmp">
                 <propertiesmapper
-                    file="" />
+                    file=""/>
             </htmlemail>
         </publishers>
     </project>
-
-
     <project
         forceOnly="true"
         forceBuildNewProject="false"
         requireModification="true"
         name="patches-R3.0.4-P">
         <modificationset>
-         <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
-            <alwaysbuild />
+            <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
+            <alwaysbuild/>
         </modificationset>
-        
-        <schedule interval="${time.veryLongTime}">
+        <schedule
+            interval="${time.veryLongTime}">
             <ant>
-                <property name="buildType" value="P" />
-                <property name="buildBranch" value="R3.0.4" />
-                <property name="mapVersionTag" value="R3_0_4_patches" />
-                <property name="build.distribution" value="patches3" />
+                <property
+                    name="buildType"
+                    value="P"/>
+                <property
+                    name="buildBranch"
+                    value="R3.0.4"/>
+                <property
+                    name="mapVersionTag"
+                    value="R3_0_4_patches"/>
+                <property
+                    name="build.distribution"
+                    value="patches3"/>
             </ant>
         </schedule>
-        
         <publishers>
             <antpublisher
                 antscript="${env.RELENG_CONTROL}/ant_med_priority.sh"
@@ -467,87 +482,93 @@
                 saveLogDir="${env.BUILD_HOME}/tmp">
                 <property
                     name="localArtifactsDirectory"
-                    value="${env.PROJECT_ARTIFACTS}/${project.name}" />
+                    value="${env.PROJECT_ARTIFACTS}/${project.name}"/>
             </antpublisher>
             <htmlemail
                 skipusers="true"
                 logdir="${env.BUILD_HOME}/tmp">
                 <propertiesmapper
-                    file="" />
+                    file=""/>
             </htmlemail>
         </publishers>
     </project>
-
-    
-    <!-- 
     <project
-        forceOnly="false"
+        forceOnly="true"
+        forceBuildNewProject="false"
         requireModification="true"
-        name="wtp-R3.1-R">
-        <modificationset
-            quietperiod="120">
-
-            <cvs
-                module="${env.RELENGCOMMON}"
-                reallyquiet="${env.CVS_QUIET}" />
-            <cvs
-                module="${env.RELENGEJBTOOLS}"
-                reallyquiet="${env.CVS_QUIET}" />
-            <cvs
-                module="${env.RELENGJEETOOLS}"
-                reallyquiet="${env.CVS_QUIET}" />
-            <cvs
-                module="${env.RELENGSERVERTOOLS}"
-                reallyquiet="${env.CVS_QUIET}" />
-            <cvs
-                module="${env.RELENGSOURCEEDITING}"
-                reallyquiet="${env.CVS_QUIET}" />
-            <cvs
-                module="${env.RELENGWEBSERVICES}"
-                reallyquiet="${env.CVS_QUIET}" />
-            <cvs
-                module="${env.RELENGJSF}"
-                reallyquiet="${env.CVS_QUIET}" />
-            <cvs
-                module="${env.RELENGDALI}"
-                reallyquiet="${env.CVS_QUIET}" />
+        name="patches-R3.0.4-U">
+        <modificationset>
+            <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
+            <alwaysbuild/>
         </modificationset>
         <schedule
-            interval="${time.oneHour}">
+            interval="${time.veryLongTime}">
             <ant>
                 <property
                     name="buildType"
-                    value="R" />
-                <property
-                    name="buildId"
-                    value="3.1" />
+                    value="P"/>
                 <property
                     name="buildBranch"
-                    value="R3.1" />
+                    value="R3.0.4"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD" />
-                <property
-                    name="releng.dali-mapVersionTag"
-                    value="HEAD" />
-                <property
-                    name="releng.jsf-mapVersionTag"
-                    value="HEAD" />
+                    value="R3_0_4_updates"/>
                 <property
                     name="build.distribution"
-                    value="wtp" />
+                    value="patches3"/>
             </ant>
         </schedule>
+        <publishers>
+            <antpublisher
+                antscript="${env.RELENG_CONTROL}/ant_med_priority.sh"
+                buildfile="${env.RELENG_CONTROL}/cc_copyArtifacts.xml"
+                target="copyArtifacts"
+                usequiet="true"
+                uselogger="false"
+                antWorkingDir="${env.BUILD_HOME}/tmp"
+                saveLogDir="${env.BUILD_HOME}/tmp">
+                <property
+                    name="localArtifactsDirectory"
+                    value="${env.PROJECT_ARTIFACTS}/${project.name}"/>
+            </antpublisher>
+            <htmlemail
+                skipusers="true"
+                logdir="${env.BUILD_HOME}/tmp">
+                <propertiesmapper
+                    file=""/>
+            </htmlemail>
+        </publishers>
     </project>
+    <!--
+        <project forceOnly="false" requireModification="true"
+        name="wtp-R3.1-R"> <modificationset quietperiod="120"> <cvs
+        module="${env.RELENGCOMMON}" reallyquiet="${env.CVS_QUIET}" />
+        <cvs module="${env.RELENGEJBTOOLS}"
+        reallyquiet="${env.CVS_QUIET}" /> <cvs
+        module="${env.RELENGJEETOOLS}" reallyquiet="${env.CVS_QUIET}" />
+        <cvs module="${env.RELENGSERVERTOOLS}"
+        reallyquiet="${env.CVS_QUIET}" /> <cvs
+        module="${env.RELENGSOURCEEDITING}"
+        reallyquiet="${env.CVS_QUIET}" /> <cvs
+        module="${env.RELENGWEBSERVICES}" reallyquiet="${env.CVS_QUIET}"
+        /> <cvs module="${env.RELENGJSF}" reallyquiet="${env.CVS_QUIET}"
+        /> <cvs module="${env.RELENGDALI}"
+        reallyquiet="${env.CVS_QUIET}" /> </modificationset> <schedule
+        interval="${time.oneHour}"> <ant> <property name="buildType"
+        value="R" /> <property name="buildId" value="3.1" /> <property
+        name="buildBranch" value="R3.1" /> <property
+        name="mapVersionTag" value="HEAD" /> <property
+        name="releng.dali-mapVersionTag" value="HEAD" /> <property
+        name="releng.jsf-mapVersionTag" value="HEAD" /> <property
+        name="build.distribution" value="wtp" /> </ant> </schedule>
+        </project>
     -->
-     
     <project
         forceOnly="false"
         requireModification="true"
         name="wtp-R3.1-S">
         <modificationset
             quietperiod="120">
-
             <cvs
                 module="${env.RELENGCOMMON}"
                 reallyquiet="${env.CVS_QUIET}"/>
@@ -575,7 +596,8 @@
         </modificationset>
         <schedule
             interval="${time.oneHour}">
-            <ant antscript="${env.RELENG_CONTROL}/ant_med_priority.sh">
+            <ant
+                antscript="${env.RELENG_CONTROL}/ant_med_priority.sh">
                 <property
                     name="buildType"
                     value="S"/>
@@ -600,15 +622,12 @@
             </ant>
         </schedule>
     </project>
-    
-  
-   <project
+    <project
         forceOnly="false"
         requireModification="true"
         name="wtp-R3.1-I">
         <modificationset
             quietperiod="120">
-
             <cvs
                 module="${env.RELENGCOMMON}"
                 reallyquiet="${env.CVS_QUIET}"/>
@@ -636,7 +655,8 @@
         </modificationset>
         <schedule
             interval="${time.oneHour}">
-            <ant antscript="${env.RELENG_CONTROL}/ant_med_priority.sh">
+            <ant
+                antscript="${env.RELENG_CONTROL}/ant_med_priority.sh">
                 <property
                     name="buildType"
                     value="I"/>
@@ -658,27 +678,21 @@
                 <property
                     name="build.distribution"
                     value="wtp"/>
-                
                 <property
                     name="SKIP_JAR_SIGNING"
-                    value="true" />
+                    value="true"/>
                 <property
                     name="normalizeJarFiles"
-                    value="false" />
-                                    
-                    
+                    value="false"/>
             </ant>
         </schedule>
-    </project>  
-  
-   
-    <project    
+    </project>
+    <project
         forceOnly="false"
         requireModification="true"
         name="wtp-R3.0-M">
         <modificationset
             quietperiod="120">
-
             <cvs
                 tag="R3_0_maintenance"
                 module="${env.RELENGCOMMON}"
@@ -736,19 +750,15 @@
                 <property
                     name="build.distribution"
                     value="wtp"/>
-                
             </ant>
         </schedule>
     </project>
-    
-    
     <project
         forceOnly="false"
         requireModification="true"
         name="wtp-R3.0-R">
         <modificationset
             quietperiod="120">
-
             <cvs
                 tag="R3_0_maintenance"
                 module="${env.RELENGCOMMON}"
@@ -809,46 +819,46 @@
             </ant>
         </schedule>
     </project>
-    
     <project
         forceOnly="true"
         requireModification="true"
         name="wtp-R3.1-N">
         <modificationset>
-         <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
-            <alwaysbuild />
+            <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
+            <alwaysbuild/>
         </modificationset>
         <schedule
             interval="${time.veryLongTime}">
-            <ant antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
+            <ant
+                antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
                 <property
                     name="buildType"
-                    value="N" />
+                    value="N"/>
                 <!-- in this context, buildBranch is simply a label -->
                 <property
                     name="buildBranch"
-                    value="R3.1" />
+                    value="R3.1"/>
                 <property
                     name="mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="releng.dali-mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="releng.jsf-mapVersionTag"
-                    value="HEAD" />
+                    value="HEAD"/>
                 <property
                     name="build.distribution"
-                    value="wtp" />
+                    value="wtp"/>
                 <property
                     name="build.donottagmaps"
-                    value="true" />
+                    value="true"/>
                 <property
                     name="SKIP_JAR_SIGNING"
-                    value="true" />
+                    value="true"/>
                 <property
                     name="normalizeJarFiles"
-                    value="false" />
+                    value="false"/>
             </ant>
         </schedule>
     </project>