diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index b58f5f6c53419ada7d34634a4adbd657fb515ee8..9d98853556fd7dec932dfc8fd4699e3aed5c23d6 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -1,16 +1,19 @@
<cruisecontrol>
-
<!--
- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
- be ${env.Path} not ${env.PATH} on Windows -->
+ Note to be cross-platform, "environment variables" are only
+ appropriate for some variables, e.g. ones we set, since
+ properties are case sensitive, even if the environment variables
+ on your operating system are not, e.g. it will be ${env.Path}
+ not ${env.PATH} on Windows
+ -->
<property
environment="env"
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 exist. -->
+ <!--
+ 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
+ exist.
+ -->
<property
name="time.tenMinutes"
value="600" />
@@ -30,7 +33,10 @@
<plugin
name="currentbuildstatuslistener"
file="${env.LOG_DIR}/${project.name}/status.txt" />
- <!-- remember, our logDir must be same as logdir specified in CC's web.xml file -->
+ <!--
+ remember, our logDir must be same as logdir specified in CC's
+ web.xml file
+ -->
<plugin
name="ant"
antscript="${env.RELENG_CONTROL}/ant.sh"
@@ -101,17 +107,13 @@
<plugin
name="cvs"
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 note, the order is somewhat important, too.
- We order these so the quickest running come first in the list,
- so they have an opportunity to "get done" before a longer one starts.
- The next criteria is importance
-
+ ${build.distribution}-${buildBranch}-${buildType} Also, please
+ note, the order is somewhat important, too. We order these so
+ the quickest running come first in the list, so they have an
+ opportunity to "get done" before a longer one starts. The next
+ criteria is importance
-->
<project
requireModification="false"
@@ -123,15 +125,15 @@
command="${env.BUILD_HOME}/releng.control/cleanupArtifacts.sh">
</exec>
</schedule>
-
- <modificationset>
+ <modificationset>
<!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
- <forceonly/>
- </modificationset>
-
- <!-- need to prevent, or override, default publishers,
- especially since the ant default antpublisher will
- result in error, if an ant build hasn't ran! -->
+ <forceonly />
+ </modificationset>
+ <!--
+ need to prevent, or override, default publishers, especially
+ since the ant default antpublisher will result in error, if
+ an ant build hasn't ran!
+ -->
<publishers>
</publishers>
</project>
@@ -162,10 +164,10 @@
value="wtpbuildTools" />
</ant>
</schedule>
- <modificationset>
+ <modificationset>
<!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
- <forceonly/>
- </modificationset>
+ <forceonly />
+ </modificationset>
</project>
<project
name="incubator-R0.5-S">
@@ -232,10 +234,10 @@
requireModification="false"
name="patches-R1.5-P"
forceOnly="true">
- <modificationset>
+ <modificationset>
<!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
- <forceonly/>
- </modificationset>
+ <forceonly />
+ </modificationset>
<schedule
interval="${time.veryLongTime}">
<ant>
@@ -512,7 +514,8 @@
</htmlemail>
</publishers>
</project>
- <project
+ <!--
+ <project
name="wtp-R3.0-R">
<modificationset
quietperiod="120">
@@ -571,6 +574,7 @@
</ant>
</schedule>
</project>
+ -->
<!--
<project
name="wtp-R3.0-S">
@@ -578,114 +582,115 @@
quietperiod="120">
<cvs
module="${env.RELENG}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGCOMMON}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGEJBTOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGJEETOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGSERVERTOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGSOURCEEDITING}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGWEBSERVICES}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGJSF}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGDALI}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
</modificationset>
<schedule
interval="${time.oneHour}">
<ant>
<property
name="buildType"
- value="S" />
+ value="S"/>
<property
name="buildId"
- value="3.0RC4" />
+ value="3.0RC4"/>
<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="wtp" />
+ value="wtp"/>
</ant>
</schedule>
</project>
- -->
- <!--
+ -->
+
+ <!--
<project
name="wtp-R3.0-I">
<modificationset
quietperiod="120">
<cvs
module="${env.RELENG}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGCOMMON}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGEJBTOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGJEETOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGSERVERTOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGSOURCEEDITING}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGWEBSERVICES}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGJSF}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
<cvs
module="${env.RELENGDALI}"
- reallyquiet="${env.CVS_QUIET}" />
+ reallyquiet="${env.CVS_QUIET}"/>
</modificationset>
<schedule
interval="${time.veryLongTime}">
<ant>
<property
name="buildType"
- value="I" />
+ value="I"/>
<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="wtp" />
+ value="wtp"/>
</ant>
</schedule>
</project>
@@ -694,10 +699,10 @@
requireModification="false"
name="wtp-R3.0-N"
forceOnly="true">
- <modificationset>
+ <modificationset>
<!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
- <forceonly/>
- </modificationset>
+ <forceonly />
+ </modificationset>
<schedule
interval="${time.veryLongTime}">
<ant>
@@ -728,7 +733,7 @@
value="true" />
<property
name="normalizeJarFiles"
- value="false" />
+ value="false" />
</ant>
</schedule>
</project>