fix to monitor all of RELENGMAPS for changes to kick off builds

releng.control/cc_config.xml

@@ -105,7 +105,8 @@
         name="cvs"
         cvsroot="${env.CVS_MAIN_REPO}" />
 
-    <!--
+    <!-- 
+    
         Note: projects should be named in the form
         ${build.distribution}-${buildBranch}-${buildType}
     -->
@@ -132,68 +133,68 @@
                 <property
                     name="build.distribution"
                     value="patches" />
-                
+
                 <!--     
-                <property
+                    <property
                     name="skipCleanBuild"
                     value="yes" />
-                 -->    
-                 
+                -->
+
                 <!--     
-                <property
+                    <property
                     name="skipUnitTests"
                     value="yes" />
-                 -->   
+                -->
             </ant>
         </schedule>
     </project>
 
-<!-- 
-    <project name="wtp-R1.5-M">
-
+    <!-- 
+        <project name="wtp-R1.5-M">
+        
         <modificationset quietperiod="120">
-            <cvs
-                tag="R1_5_maintenance"
-                module="${env.RELENG}"
-                reallyQuiet="${env.CVS_REALLY_QUIET}" />
+        <cvs
+        tag="R1_5_maintenance"
+        module="${env.RELENGMAPS}"
+        reallyQuiet="${env.CVS_REALLY_QUIET}" />
         </modificationset>
-
+        
         <schedule interval="${time.oneHour}">
-            <ant>
-
-                <!- - this "M" label should be changed to "R" once maintenance release
-                    is warming up for its "R"elease.
-                - ->
-                <property
-                    name="buildType"
-                    value="R" />
-
-                <property
-                    name="buildId"
-                    value="1.5.5" />
-                <property
-                    name="buildBranch"
-                    value="R1.5" />
-
-                <property
-                    name="checkoutprojectname"
-                    value="${project.name}" />
-
-                <property
-                    name="mapVersionTag"
-                    value="R1_5_maintenance" />
-            </ant>
+        <ant>
+        
+        <!- - this "M" label should be changed to "R" once maintenance release
+        is warming up for its "R"elease.
+        - ->
+        <property
+        name="buildType"
+        value="R" />
+        
+        <property
+        name="buildId"
+        value="1.5.5" />
+        <property
+        name="buildBranch"
+        value="R1.5" />
+        
+        <property
+        name="checkoutprojectname"
+        value="${project.name}" />
+        
+        <property
+        name="mapVersionTag"
+        value="R1_5_maintenance" />
+        </ant>
         </schedule>
-    </project>
-
--->    
+        </project>
+        
+    -->
 
     <project name="wtp-R2.0-M">
 
         <modificationset quietperiod="120">
             <cvs
                 tag="R2_0_maintenance"
-                module="${env.RELENG}"
+                module="${env.RELENGMAPS}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
@@ -234,12 +235,15 @@
         </schedule>
     </project>
 
-        <project name="wtp-R2.0-R">
+    <!-- remove 'forceOnly' once we move into "release" phase -->
 
+    <project
+        name="wtp-R2.0-R"
+        forceOnly="true">
         <modificationset quietperiod="120">
             <cvs
                 tag="R2_0_maintenance"
-                module="${env.RELENG}"
+                module="${env.RELENGMAPS}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
@@ -284,7 +288,7 @@
 
         <modificationset quietperiod="120">
             <cvs
-                module="${env.RELENG}"
+                module="${env.RELENGMAPS}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 module="${env.RELENGJSF}"
@@ -323,7 +327,7 @@
         </schedule>
     </project>
 
-    
+
 
     <project
         name="wtp-R3.0-N"
@@ -356,8 +360,8 @@
         </schedule>
     </project>
 
-    
 
+    <!-- remove 'forceOnly' once we move into this phase of building -->
     <project
         name="wtp-R3.0-S"
         forceOnly="true">
@@ -365,7 +369,7 @@
 
         <modificationset quietperiod="120">
             <cvs
-                module="${env.RELENG}"
+                module="${env.RELENGMAPS}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 module="${env.RELENGJSF}"
@@ -408,8 +412,8 @@
         </schedule>
     </project>
 
-    
 
+    <!-- remove 'forceOnly' once we move into this phase of building -->
     <project
         name="wtp-R3.0-R"
         forceOnly="true">
@@ -417,7 +421,7 @@
 
         <modificationset quietperiod="120">
             <cvs
-                module="${env.RELENG}"
+                module="${env.RELENGMAPS}"
                 reallyQuiet="${env.CVS_REALLY_QUIET}" />
             <cvs
                 module="${env.RELENGJSF}"
@@ -457,7 +461,7 @@
         </schedule>
     </project>
 
-    
+
 
     <project
         name="wtp-buildTools-R3.0-T"