From 50c58558e2c497ea855c5863a11f912c9579c887 Mon Sep 17 00:00:00 2001 From: david_williams <david_williams> Date: Sun, 7 Dec 2008 02:26:20 +0000 Subject: [PATCH] 257813 we should update to cruisecontrol 2.8 --- releng.control/ant.sh | 2 +- .../cruisecontrol.sh | 0 .../dashboard-config.xml | 0 .../webapps/cruisecontrol/WEB-INF/web.xml | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename releng.control/{cc280-bin-dist-mods => cc281-bin-dist-mods}/cruisecontrol.sh (100%) rename releng.control/{cc280-bin-dist-mods => cc281-bin-dist-mods}/dashboard-config.xml (100%) rename releng.control/{cc280-bin-dist-mods => cc281-bin-dist-mods}/webapps/cruisecontrol/WEB-INF/web.xml (100%) diff --git a/releng.control/ant.sh b/releng.control/ant.sh index 778663b67..3cdf07c79 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_5_HOME} +export JAVA_HOME=${JAVA_4_HOME} ANT_CMD="${ANT_HOME}/bin/ant" exec "$ANT_CMD" "$@" diff --git a/releng.control/cc280-bin-dist-mods/cruisecontrol.sh b/releng.control/cc281-bin-dist-mods/cruisecontrol.sh similarity index 100% rename from releng.control/cc280-bin-dist-mods/cruisecontrol.sh rename to releng.control/cc281-bin-dist-mods/cruisecontrol.sh diff --git a/releng.control/cc280-bin-dist-mods/dashboard-config.xml b/releng.control/cc281-bin-dist-mods/dashboard-config.xml similarity index 100% rename from releng.control/cc280-bin-dist-mods/dashboard-config.xml rename to releng.control/cc281-bin-dist-mods/dashboard-config.xml diff --git a/releng.control/cc280-bin-dist-mods/webapps/cruisecontrol/WEB-INF/web.xml b/releng.control/cc281-bin-dist-mods/webapps/cruisecontrol/WEB-INF/web.xml similarity index 100% rename from releng.control/cc280-bin-dist-mods/webapps/cruisecontrol/WEB-INF/web.xml rename to releng.control/cc281-bin-dist-mods/webapps/cruisecontrol/WEB-INF/web.xml -- GitLab