From 55e1d3ccbf52a66a2634a8cb2ae42c95927611d4 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 7 Dec 2008 02:08:32 +0000
Subject: [PATCH] 257813 we should update to cruisecontrol 2.8
---
releng.control/ant.sh | 2 +-
releng.control/cc.sh | 6 ++++--
releng.control/cc_config.xml | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index 3cdf07c79..778663b67 100644
--- a/releng.control/ant.sh
+++ b/releng.control/ant.sh
@@ -26,7 +26,7 @@ fi
# Note: this must be Java 4, for now, for "customizeAccessRules"
# to work. I'll recompile it for Java 5 eventually, but it causes
# a problem, and a problem only on PPC machine/VM.
-export JAVA_HOME=${JAVA_4_HOME}
+export JAVA_HOME=${JAVA_5_HOME}
ANT_CMD="${ANT_HOME}/bin/ant"
exec "$ANT_CMD" "$@"
diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index 4ce09af03..4ae6e5545 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -19,10 +19,12 @@ trivialPw="ballad"
rm -fr ./workspace
-CCNAME="Webtools"
+CCNAME="Webtools-"
# We want to execute CC itself in Java 5
export JAVA_HOME=${JAVA_5_HOME}
-sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname ${CCNAME} 1>out.txt 2>err.txt &
+export JETTY_HOME=${CCDIR}
+
+sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname ${CCNAME} -webapppath ${CCDIR}/webapps/cruisecontrol -jettyxml ${CCDIR}/etc/jetty.xml -dashboardurl http://wtp.rtp.raleigh.ibm.com:7777/dashboard 1>out.txt 2>err.txt &
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 36b06b9aa..b95736de8 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -74,8 +74,10 @@
<plugin
name="project"
buildafterfailed="false">
+ <!-- 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">
--
GitLab