diff --git a/releng.control/ant.sh b/releng.control/ant.sh index 778663b67b53fa03db47256ce7a68f4c014c262e..3cdf07c799956cca2aa1988b50da15ac2a3605a3 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