re-write for less variables
diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index 6ea9485..d7cd1c2 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -4,22 +4,22 @@
# so that users path is used to find it (first)
if [ -n $BUILD_INITIALIZED ]
then
- source commonVariations.sh
+ source commonVariations.shsource
+ source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource
fi
-export LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
-
-
-# NOTE: we intentionally use Java 5 here to run Cruise Control
-export JAVA_HOME=${JAVA_5_HOME}
-
-
port="7000"
+webport="7777"
+# its ok for these to be trivial, just used to prevent
+# accidental use, no real security needed.
+trivialUserName="wtp"
+trivialPw="ballad"
rm -fr ./workspace
-
export CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5
-sh $CCDIR/cruisecontrol.sh $BUILD_HOME/releng.control/config.xml -jmxport $port -webport 7777 -user wtp -password ballad -cchome $CCDIR 1>out.txt 2>err.txt &
+CCNAME="Webtools builds"
+
+sh $CCDIR/cruisecontrol.sh -configfile $BUILD_HOME/releng.control/cc_config.xml -jmxport $port -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname $CCNAME 1>out.txt 2>err.txt &