streamline build scripts
diff --git a/releng.control/getFromCVS-relengControl.sh b/releng.control/getFromCVS-relengControl.sh
index b11b188..129e4b2 100644
--- a/releng.control/getFromCVS-relengControl.sh
+++ b/releng.control/getFromCVS-relengControl.sh
@@ -24,21 +24,21 @@
fi
echo
-echo " saving serialized CC state ..."
+echo " saving serialized CC state ..."
cp ${RELENG_CONTROL}/*.ser . >/dev/null 2>/dev/null
-echo " removing all of ${RELENG_CONTROL} ..."
+echo " removing all of ${RELENG_CONTROL} ..."
rm -fr ${RELENG_CONTROL}/*
rm -fr ${RELENG_CONTROL}/.project
mkdir -p ${RELENG_CONTROL}
-echo " checking out head of ${RELENG_CONTROL} from cvs ..."
+echo " checking out head of ${RELENG_CONTROL} from cvs ..."
cvs -Q -f -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -d ${RELENG_CONTROL} -r HEAD webtools.releng/${RELENG_CONTROL}
-echo " restore serialized CC state"
+echo " restoreing serialized CC state ..."
mv *.ser ${RELENG_CONTROL} >/dev/null 2>/dev/null
-echo " make sure releng control files are executable and have proper EOL"
+echo " making sure releng control files are executable and have proper EOL"
dos2unix ${RELENG_CONTROL}/*.sh* ${RELENG_CONTROL}/*.properties ${RELENG_CONTROL}/*.xml >/dev/null 2>>/dev/null
chmod +x ${RELENG_CONTROL}/*.sh > /dev/null
echo
diff --git a/releng.control/killcc.sh b/releng.control/killcc.sh
new file mode 100644
index 0000000..17f3898
--- /dev/null
+++ b/releng.control/killcc.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+PIDFILE=cc.pid
+echo;
+if [ -f ${PIDFILE} ] ; then
+ echo " Killing CC process from PID file";
+ PID=`cat ${PIDFILE}`
+ kill -3 $PID
+ if kill -9 $PID ; then
+ echo " CC process stopped";
+ else
+ echo " CC process could not be stopped";
+ fi
+ rm -f ${PIDFILE}
+else
+ echo " PID file (${PIDFILE}) does not exist.";
+ echo " Either CC not running, or PID file deleted";
+fi
+echo;
\ No newline at end of file
diff --git a/releng.control/localBuildExample/whatisfixed.properties b/releng.control/localBuildExample/whatisfixed.properties
index a192443..83e7f5e 100644
--- a/releng.control/localBuildExample/whatisfixed.properties
+++ b/releng.control/localBuildExample/whatisfixed.properties
@@ -47,7 +47,7 @@
buildRelease=${buildBranch}
build.distribution=wtp
-wtpBuilder=${whatisfixed.workdir}/${env.RELENGWTPBUILDER}/distribution/${build.distribution}.whatisfixed/build.xml
+wtpBuilder=${whatisfixed.workdir}/${env.RELENG_BUILDER}/distribution/${build.distribution}.whatisfixed/build.xml
build.whatIsFixed=true
build.trial=false
diff --git a/releng.control/releng.control cc_project_build.xml.launch b/releng.control/releng.control cc_project_build.xml.launch
index 856c6a1..491d970 100644
--- a/releng.control/releng.control cc_project_build.xml.launch
+++ b/releng.control/releng.control cc_project_build.xml.launch
@@ -16,20 +16,20 @@
<mapEntry key="LOCAL_PREREQS_CACHE" value="/home/shared/workbenchbuild/prereqcache"/>
<mapEntry key="USE_LOCAL_MAPS" value="false"/>
<mapEntry key="BASEWS" value="gtk"/>
-<mapEntry key="WTP_CVS_SERVER" value="dev.eclipse.org"/>
+<mapEntry key="BUILD_CVS_SERVER" value="dev.eclipse.org"/>
<mapEntry key="JAVA_5_HOME" value="/home/shared/webtools/apps/jdk1.5.0_12"/>
<mapEntry key="RELENG" value="webtools.maps/releng"/>
<mapEntry key="BASEOS" value="linux"/>
<mapEntry key="LOCAL_BUILD_PROPERTIES_DIR" value="/home/shared/workbenchbuild/localBuildProperties"/>
<mapEntry key="RELENGDALI" value="webtools.maps/releng.dali"/>
<mapEntry key="CVS_RSH" value="ssh"/>
-<mapEntry key="WTP_CVS_PROTOCOL" value="ext"/>
+<mapEntry key="BUILD_CVS_WRITE_PROTOCOL" value="ext"/>
<mapEntry key="BUILD_HOME" value="/home/shared/workbenchbuild/"/>
-<mapEntry key="WTP_CVS_USER" value="david_williams"/>
+<mapEntry key="BUILD_CVS_WRITE_USER" value="david_williams"/>
<mapEntry key="BASEARCH" value="x86"/>
<mapEntry key="JAVA_4_HOME" value="/home/shared/webtools/apps/j2sdk1.4.2_14"/>
-<mapEntry key="RELENGWTPBUILDER" value="webtools.releng/releng.wtpbuilder"/>
-<mapEntry key="WTP_CVS_ROOT" value="/cvsroot/webtools"/>
+<mapEntry key="RELENG_BUILDER" value="webtools.releng/releng.wtpbuilder"/>
+<mapEntry key="BUILD_CVS_ROOT" value="/cvsroot/webtools"/>
<mapEntry key="RELENGJSF" value="webtools.maps/releng.jsf"/>
</mapAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
diff --git a/releng.control/restart.sh b/releng.control/restart.sh
deleted file mode 100644
index 28492c1..0000000
--- a/releng.control/restart.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-./stopBuilds.sh
-
-
-# now, restart CC's
-echo "restarting CruiseControl"
-./startbuild.sh
-
-
-# and list our processes for a warm fuzzy, we pause briefly, since in some
-# error conditions, they will start, but then shutdown a few seconds later
-sleep 10s
-echo "current java processes"
-ps x ww | grep java
-
-
diff --git a/releng.control/somePathDirectory/commonVariations.shsource b/releng.control/somePathDirectory/commonVariations.shsource
index 2bad7b4..71d096b 100644
--- a/releng.control/somePathDirectory/commonVariations.shsource
+++ b/releng.control/somePathDirectory/commonVariations.shsource
@@ -13,19 +13,26 @@
# be included in other sh files, with "source" command, not
# executed on its own.
+# Some things _have_ to go in this file, instead of being an ant property,
+# since they may be used outside the contect of ant (or, before ant get's started).
+# as one example, anything used directly in the cc_config.xml file has to be
+# provided as environment variable, since it can not import ant property files
+# like most ant project files can.
+
export BUILD_HOME=/home/shared/webtools
-export DISPLAY=127.0.0.11:0
+# the following does not really vary, but must be specified "early"
+export RELENG_CONTROL=${BUILD_HOME}/releng.control
-echo "remember to check X virtual frame buffer is running for headless JUnit testing";
-ps -ef | grep Xvfb
+export DISPLAY=127.0.0.1:11.0
# these should be full, abosolute path to the respective home directories
# on this particular build machine
-export ANT_HOME=/shared/webtools/apps/apache-ant-1.7.0
-export JAVA_4_HOME=/shared/webtools/apps/IBMJava2-ppc-142
-export JAVA_5_HOME=/shared/webtools/apps/ibm-java2-ppc-50
-export CCDIR=/shared/webtools/apps/cruisecontrol-bin-2.7.1
+export ANT_HOME=/home/shared/webtools/apps/apache-ant-1.7.0
+export JAVA_4_HOME=/home/shared/webtools/apps/j2sdk1.4.2_11
+export JAVA_5_HOME=/home/shared/webtools/apps/jdk1.5.0_12
+
+export CCDIR=/home/shared/webtools/apps/cruisecontrol-bin-2.7.1
export BASEOS=linux
export BASEWS=gtk
@@ -37,39 +44,47 @@
# See the 'localBuildExample' directory for a starting example
export LOCAL_BUILD_PROPERTIES_DIR=${BUILD_HOME}/localBuildProperties
-export BUILD_BUILDMASTER_EMAIL=davidw@davidw.raleigh.ibm.com
-export BUILD_RETURN_NAME=davidwAtWork
+# note: buildmaster email address should be "real" address
+# that is subscribed to the mailing list, if you want to send
+# mail to mailing list.
+export BUILD_BUILDMASTER_EMAIL=david_williams@us.ibm.com
+
+export BUILD_BUILDMASTER_RETURN_NAME=davidwAtWork
export BUILD_RESULT_URL=http://davidw.raleigh.ibm.com:7777/cruisecontrol/buildresults
export BUILD_ALWAYS_TO_ADDRESS=david_williams@us.ibm.com
-
-# for builds on local machines, SKIPUSERS should be 'true' to avoid
-# notifying users about those builds on your local machine
-export SKIPUSERS=true
+export FAILED_ADDRESS=wtp-releng@eclipse.org
# controls quietness of logging to console
# false means more output to console, true uses ant's logger
-export USE_LOGGER=false
+export USE_LOGGER=true
# contols ANT's quietness level
# true logs error and warnings only
-export USE_QUIET=false
+export USE_QUIET=true
# controls ANT's debug level
# setting to true will result in TONS of ouput
export USE_DEBUG=false
-# should be true for production, false for local
-env.BUILD_UPLOAD=false
+# should be true for production, false for local.
+# it can be set to true for local builds, but then the
+# properties in upload.properties need to be set to valid values.
+export BUILD_UPLOAD=true
+
+# if true, locally existing maps will be used as is, instead of being
+# checked out afresh. Set to false for production builds, so maps are
+# always fresh.
+export USE_LOCAL_MAPS=false
# normally, cvs logging output can be "really quiet", but if problems, then it can be turned back on
# to get more potentially diagnostic information
# TODO: if both of these are 'true' and error is generated by cvs ...
# saying you can't set both to true.
# we could put in some logic to prevent that, someday.
-export CVS_QUIET=false
-export CVS_REALLY_QUIET=false
+export CVS_QUIET=true
+export CVS_REALLY_QUIET=true
# these cvs values need to have write access if
-# build.trial is false, as on production machine.
+# tag.maps is true, as on production machine.
# This is the ID used to both read, and
# to tag releng map files.
#
@@ -80,7 +95,14 @@
# if protocol was pserver, but could be removed in that
# case, if desired.
export CVS_RSH=ssh
-export WTP_CVS_PROTOCOL=ext
-export WTP_CVS_USER=david_williams
-export WTP_CVS_SERVER=dev.eclipse.org
-export WTP_CVS_ROOT=/cvsroot/webtools
+export BUILD_CVS_READ_PROTOCOL=pserver
+export BUILD_CVS_READ_USER=anonymous
+export BUILD_CVS_WRITE_PROTOCOL=ext
+export BUILD_CVS_WRITE_USER=david_williams
+export BUILD_CVS_SERVER=dev.eclipse.org
+export BUILD_CVS_ROOT=/cvsroot/webtools
+
+# for builds on local machines, SKIPUSERS should be 'true' to avoid
+# notifying users about those builds on your local machine
+export SKIPUSERS=true
+
diff --git a/releng.control/startbuild.sh b/releng.control/startbuild.sh
deleted file mode 100644
index 3783043..0000000
--- a/releng.control/startbuild.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# remember to leave no slashes on filename in source command,
-# so that users path is used to find it (first)
-if [ -n $BUILD_INITIALIZED ]
-then
- source commonVariations.shsource
-# source computeCommon.shsource
-fi
-
-cd ${BUILD_HOME}/releng.control
-sh ${BUILD_HOME}/releng.control/cc.sh
-
-
-
diff --git a/releng.control/stopBuilds.sh b/releng.control/stopBuilds.sh
deleted file mode 100644
index 6e969eb..0000000
--- a/releng.control/stopBuilds.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# remember to leave no slashes on filename in source command,
-# so that users path is used to find it (first)
-if [ -n $BUILD_INITIALIZED ]
-then
- source commonVariations.shsource
- source computeCommon.shsource
-fi
-
-# allow to terminate themselves, if they will
-echo "Attempting normal terminate of all java processes"
-killall ${JAVA_HOME}/jre/bin/java
-# pause briefly to allow shutdown to finish
-sleep 10s
-
-# but if the do not terminate themselves, we can safely force them down
-echo "forcing termination of any remaing java processes"
-killall -9 ${JAVA_HOME}/jre/bin/java/jre/bin/java
-# pause briefly to allow ports to free up, etc.
-sleep 10s
-
diff --git a/releng.control/whatisfixed.xml b/releng.control/whatisfixed.xml
index 1a83fa6..334d208 100644
--- a/releng.control/whatisfixed.xml
+++ b/releng.control/whatisfixed.xml
@@ -34,7 +34,7 @@
<ant antfile="${wtpBuilder}">
<property
name="wtp.builder.home"
- value="${whatisfixed.workdir}/${env.RELENGWTPBUILDER}" />
+ value="${whatisfixed.workdir}/${env.RELENG_BUILDER}" />
<property
name="buildBranch"
value="${buildBranch}" />
@@ -53,7 +53,7 @@
file="${whatisfixed.workdir}/${env.RELENG}/maps/dependencies.properties"
property="map.exists" />
<available
- file="${whatisfixed.workdir}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml"
+ file="${whatisfixed.workdir}/${env.RELENG_BUILDER}/scripts/dependency/build.xml"
property="releng.exists" />
<antcall target="checkout-maps" />
<antcall target="getwtpbuilder" />
@@ -76,15 +76,15 @@
unless="releng.exists">
<property file="${whatisfixed.workdir}/${env.RELENG}/maps/build.cfg" />
<delete
- dir="${whatisfixed.workdir}/${env.RELENGWTPBUILDER}"
+ dir="${whatisfixed.workdir}/${env.RELENG_BUILDER}"
failonerror="false" />
<echo
- message="Version tag for ${env.RELENGWTPBUILDER} is: ${wtpBuilderVersion}" />
+ message="Version tag for ${env.RELENG_BUILDER} is: ${wtpBuilderVersion}" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.RELENGWTPBUILDER}"
+ package="${env.RELENG_BUILDER}"
dest="${whatisfixed.workdir}"
tag="${wtpBuilderVersion}" />
</target>
diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
index f36fada..90882c4 100644
--- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
@@ -27,16 +27,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index 222782f..c25f15f 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -27,16 +27,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/dali/customTargets.xml b/releng.wtpbuilder/components/dali/customTargets.xml
index 0b714c3..1206d18 100644
--- a/releng.wtpbuilder/components/dali/customTargets.xml
+++ b/releng.wtpbuilder/components/dali/customTargets.xml
@@ -27,16 +27,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index d9627e8..62ecda78 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -27,16 +27,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index 28bd3dc..ea7c285 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -27,16 +27,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index 99416ca..4d223bb 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -27,16 +27,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 795b7a3..438b049 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -27,16 +27,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index ac2fe5f..c0c1fee 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -26,16 +26,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index b6bf920..eaa0563 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -26,16 +26,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
index 5ee0c84..9763ef5 100644
--- a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
@@ -27,16 +27,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
index 9a5cd37..730db5d 100644
--- a/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
@@ -32,16 +32,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
diff --git a/releng.wtpbuilder/components/wtp-patches/customTargets.xml b/releng.wtpbuilder/components/wtp-patches/customTargets.xml
index e7ac981..1f0aed0 100644
--- a/releng.wtpbuilder/components/wtp-patches/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches/customTargets.xml
@@ -31,16 +31,16 @@
<property
name="cvsProtocol"
- value="${env.WTP_CVS_PROTOCOL}" />
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
- value="${env.WTP_CVS_USER}" />
+ value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
- value="${env.WTP_CVS_SERVER}" />
+ value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
- value="${env.WTP_CVS_ROOT}" />
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
diff --git a/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml
index 212fb36..37a9beb 100644
--- a/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml
@@ -18,7 +18,7 @@
<target name="main">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
name="local.cache.dir"
value="${env.LOCAL_PREREQS_CACHE}" />
@@ -74,13 +74,13 @@
<target name="getDependencies">
<ant
- antfile="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testdependency.xml">
+ antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testdependency.xml">
<property
name="base.install.dir"
value="${testRoot}" />
<property
name="dependencyTargets"
- value="${build.home}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
</ant>
<antcall target="getAndInstallWTP">
<param
@@ -163,10 +163,10 @@
flatten="true"
overwrite="true">
<fileset
- dir="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testScripts" />
+ dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts" />
</copy>
<ant
- antfile="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/build.xml"
+ antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
target="runTestEclipse">
<property
name="testRoot"
@@ -176,7 +176,7 @@
value="" />
</ant>
<copy
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/templateFiles/index.php"
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/templateFiles/index.php"
todir="${testRoot}/results/index.php"
overwrite="true" />
</target>
diff --git a/releng.wtpbuilder/distribution/patches.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/patches.tests/standaloneTest.xml
index 83526da..2fbc25c 100644
--- a/releng.wtpbuilder/distribution/patches.tests/standaloneTest.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/standaloneTest.xml
@@ -18,7 +18,7 @@
<target name="main">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
name="local.cache.dir"
value="${env.LOCAL_PREREQS_CACHE}" />
@@ -72,13 +72,13 @@
<target name="getDependencies">
<ant
- antfile="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testdependency.xml">
+ antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testdependency.xml">
<property
name="base.install.dir"
value="${testRoot}" />
<property
name="dependencyTargets"
- value="${build.home}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
</ant>
<antcall target="getAndInstallWTP">
<param
@@ -167,10 +167,10 @@
flatten="true"
overwrite="true">
<fileset
- dir="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testScripts" />
+ dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts" />
</copy>
<ant
- antfile="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/build.xml"
+ antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
target="runTestEclipse">
<property
name="testRoot"
@@ -180,7 +180,7 @@
value="all" />
</ant>
<copy
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/templateFiles/index.php"
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/templateFiles/index.php"
todir="${testRoot}/results"
overwrite="true" />
</target>
@@ -228,7 +228,7 @@
name="clean"
if="clean">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
name="local.cache.dir"
value="${env.LOCAL_PREREQS_CACHE}" />
diff --git a/releng.wtpbuilder/distribution/wtp.adopters/build.xml b/releng.wtpbuilder/distribution/wtp.adopters/build.xml
index 725dac1..7de9937 100644
--- a/releng.wtpbuilder/distribution/wtp.adopters/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.adopters/build.xml
@@ -25,7 +25,7 @@
<target name="main">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
name="apiRoot"
value="${build.home}/adopterScanRoot" />
@@ -145,7 +145,7 @@
<target name="getAndInstall">
<property
name="dependencyTargets"
- value="${build.home}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
<ant
antfile="${dependencyTargets}"
target="checkDependency">
@@ -165,7 +165,7 @@
<target name="get">
<property
name="dependencyTargets"
- value="${build.home}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
<ant
antfile="${dependencyTargets}"
target="checkDependency">
diff --git a/releng.wtpbuilder/distribution/wtp.api/build.xml b/releng.wtpbuilder/distribution/wtp.api/build.xml
index a9837d1..e8d25f6 100644
--- a/releng.wtpbuilder/distribution/wtp.api/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.api/build.xml
@@ -28,12 +28,12 @@
<target name="main">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.api/api.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api/api.properties" />
<property
name="wtp.api"
- value="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.api" />
+ value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api" />
<property
name="apiRoot"
value="${build.home}/apiRoot" />
@@ -202,7 +202,7 @@
<target name="get">
<property
name="dependencyTargets"
- value="${build.home}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
<ant
antfile="${dependencyTargets}"
target="checkDependency">
@@ -215,7 +215,7 @@
<target name="getAndInstall">
<property
name="dependencyTargets"
- value="${build.home}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
<ant
antfile="${dependencyTargets}"
target="checkDependency">
@@ -420,14 +420,14 @@
todir="${apiRoot}"
overwrite="true">
<fileset
- dir="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testScripts" />
+ dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts" />
</copy>
<copy
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.api/testScripts/test.xml"
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api/testScripts/test.xml"
tofile="${apiRoot}/test.xml"
overwrite="true" />
<ant
- antfile="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/build.xml"
+ antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
target="runTestEclipse">
<property
name="testRoot"
@@ -552,7 +552,7 @@
name="clean"
if="clean">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
name="local.cache.dir"
value="${env.LOCAL_PREREQS_CACHE}" />
diff --git a/releng.wtpbuilder/distribution/wtp.api/testScripts/api-tests.xml b/releng.wtpbuilder/distribution/wtp.api/testScripts/api-tests.xml
index 91039e6..c062c58 100644
--- a/releng.wtpbuilder/distribution/wtp.api/testScripts/api-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.api/testScripts/api-tests.xml
@@ -37,7 +37,7 @@
<target name="runPIAgent">
<property
name="wtp.api"
- value="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.api" />
+ value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api" />
<property
name="piagentDir"
value="${testDir}/piagent" />
diff --git a/releng.wtpbuilder/distribution/wtp.api/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.api/testScripts/test.xml
index 6e94da2..526c998 100644
--- a/releng.wtpbuilder/distribution/wtp.api/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.api/testScripts/test.xml
@@ -3,7 +3,7 @@
basedir=".">
<import
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testScripts/test.xml" />
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts/test.xml" />
<target name="runtests-normal">
<ant
@@ -11,7 +11,7 @@
dir="${eclipse-home}">
<property
name="library-file"
- value="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.api/testScripts/api-tests.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.api/testScripts/api-tests.xml" />
</ant>
<copy
file="${eclipse-home}/${report}.xml"
diff --git a/releng.wtpbuilder/distribution/wtp.perf/build.xml b/releng.wtpbuilder/distribution/wtp.perf/build.xml
index 3d5691e..0e79b05 100644
--- a/releng.wtpbuilder/distribution/wtp.perf/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.perf/build.xml
@@ -53,7 +53,7 @@
name="timestamp.tests"
value="${date.tests}${time.tests}" />
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
name="local.cache.dir"
value="${env.LOCAL_PREREQS_CACHE}" />
@@ -136,7 +136,7 @@
<target name="setup">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
file="${perfRoot}/${env.RELENG}/maps/dependencies.properties" />
<property
@@ -242,7 +242,7 @@
</antcall>
<antcall target="setup.derby" />
<copy
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.perf/performance-tests.xml"
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/performance-tests.xml"
tofile="${perfRoot}/performance-tests.xml">
</copy>
@@ -270,7 +270,7 @@
<target name="getAndInstall">
<property
name="dependencyTargets"
- value="${build.home}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
<ant
antfile="${dependencyTargets}"
target="checkDependency">
@@ -350,7 +350,7 @@
</copy>
<copy
tofile="${derby}/plugin.xml"
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.perf/derby.plugin.xml.template"
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/derby.plugin.xml.template"
overwrite="true" />
<replace
dir="${perfRoot}/eclipse/plugins"
@@ -392,12 +392,12 @@
<jvmarg value="-Dtimestamp.tests=${timestamp.tests}" />
<arg value="-propertyfile" />
<arg
- value="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.perf/perf.properties" />
+ value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.properties" />
<arg value="-application" />
<arg value="org.eclipse.ant.core.antRunner" />
<arg value="-file" />
<arg
- value="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.perf/perf.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.xml" />
<arg value="-logger" />
<arg value="org.apache.tools.ant.DefaultLogger" />
<arg value="${perf.target}" />
@@ -453,12 +453,12 @@
<jvmarg value="-Dtimestamp.tests=${timestamp.tests}" />
<arg value="-propertyfile" />
<arg
- value="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.perf/perf.properties" />
+ value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.properties" />
<arg value="-application" />
<arg value="org.eclipse.ant.core.antRunner" />
<arg value="-file" />
<arg
- value="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.perf/perf.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.xml" />
<arg value="-logger" />
<arg value="org.apache.tools.ant.DefaultLogger" />
<arg value="${perf.target}" />
@@ -497,7 +497,7 @@
command="export"
tag="RC4_33" />
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.perf/perf.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/perf.properties" />
<antcall target="setup.derby">
<param
name="derby"
@@ -540,7 +540,7 @@
<arg value="${perfRoot}/results/graph" />
</java>
<copy
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.perf/performance.php"
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/performance.php"
tofile="${perfRoot}/results/graph/performance.php" />
</target>
@@ -605,7 +605,7 @@
name="clean"
if="clean">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
name="local.cache.dir"
value="${env.LOCAL_PREREQS_CACHE}" />
diff --git a/releng.wtpbuilder/distribution/wtp.perf/perf.xml b/releng.wtpbuilder/distribution/wtp.perf/perf.xml
index 993abfc..1316dab 100644
--- a/releng.wtpbuilder/distribution/wtp.perf/perf.xml
+++ b/releng.wtpbuilder/distribution/wtp.perf/perf.xml
@@ -32,7 +32,7 @@
classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
<classpath>
<pathelement
- location="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testScripts/ComputePluginVersion.jar" />
+ location="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts/ComputePluginVersion.jar" />
</classpath>
<arg value="${perfRoot}/eclipse/plugins" />
<arg value="${perfRoot}/perf2.properties" />
@@ -54,7 +54,7 @@
dir="${perfRoot}/eclipse">
<property
name="library-file"
- value="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.perf/performance-tests.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.perf/performance-tests.xml" />
<property
name="os"
value="${env.BASEOS}" />
@@ -75,7 +75,7 @@
<target name="genHtml">
<style
- style="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testScripts/JUNIT.XSL"
+ style="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts/JUNIT.XSL"
basedir="${results}/xml"
destdir="${results}/html" />
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
index 83526da..2fbc25c 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
@@ -18,7 +18,7 @@
<target name="main">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
name="local.cache.dir"
value="${env.LOCAL_PREREQS_CACHE}" />
@@ -72,13 +72,13 @@
<target name="getDependencies">
<ant
- antfile="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testdependency.xml">
+ antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testdependency.xml">
<property
name="base.install.dir"
value="${testRoot}" />
<property
name="dependencyTargets"
- value="${build.home}/${env.RELENGWTPBUILDER}/scripts/dependency/build.xml" />
+ value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
</ant>
<antcall target="getAndInstallWTP">
<param
@@ -167,10 +167,10 @@
flatten="true"
overwrite="true">
<fileset
- dir="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/testScripts" />
+ dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts" />
</copy>
<ant
- antfile="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/build.xml"
+ antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
target="runTestEclipse">
<property
name="testRoot"
@@ -180,7 +180,7 @@
value="all" />
</ant>
<copy
- file="${build.home}/${env.RELENGWTPBUILDER}/distribution/wtp.tests/templateFiles/index.php"
+ file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/templateFiles/index.php"
todir="${testRoot}/results"
overwrite="true" />
</target>
@@ -228,7 +228,7 @@
name="clean"
if="clean">
<property
- file="${build.home}/${env.RELENGWTPBUILDER}/build.properties" />
+ file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
<property
name="local.cache.dir"
value="${env.LOCAL_PREREQS_CACHE}" />
diff --git a/releng.wtpbuilder/localBuildExample/whatisfixed.properties b/releng.wtpbuilder/localBuildExample/whatisfixed.properties
index a192443..83e7f5e 100644
--- a/releng.wtpbuilder/localBuildExample/whatisfixed.properties
+++ b/releng.wtpbuilder/localBuildExample/whatisfixed.properties
@@ -47,7 +47,7 @@
buildRelease=${buildBranch}
build.distribution=wtp
-wtpBuilder=${whatisfixed.workdir}/${env.RELENGWTPBUILDER}/distribution/${build.distribution}.whatisfixed/build.xml
+wtpBuilder=${whatisfixed.workdir}/${env.RELENG_BUILDER}/distribution/${build.distribution}.whatisfixed/build.xml
build.whatIsFixed=true
build.trial=false
diff --git a/releng.wtpbuilder/releng.wtpbuilder build.xml.launch b/releng.wtpbuilder/releng.wtpbuilder build.xml.launch
index edda868..30e6105 100644
--- a/releng.wtpbuilder/releng.wtpbuilder build.xml.launch
+++ b/releng.wtpbuilder/releng.wtpbuilder build.xml.launch
@@ -15,21 +15,21 @@
<mapEntry key="DISPLAY" value="127.0.0.1:11.0"/>
<mapEntry key="RELENGMAPS" value="webtools.maps"/>
<mapEntry key="LOCAL_PREREQS_CACHE" value="/home/shared/workbenchbuild/prereqcache"/>
-<mapEntry key="WTP_CVS_PROTOCOL" value="ext"/>
+<mapEntry key="BUILD_CVS_WRITE_PROTOCOL" value="ext"/>
<mapEntry key="USE_LOCAL_MAPS" value="false"/>
<mapEntry key="BUILD_HOME" value="/home/shared/workbenchbuild/"/>
<mapEntry key="BASEWS" value="gtk"/>
-<mapEntry key="WTP_CVS_USER" value="david_williams"/>
-<mapEntry key="WTP_CVS_SERVER" value="dev.eclipse.org"/>
+<mapEntry key="BUILD_CVS_WRITE_USER" value="david_williams"/>
+<mapEntry key="BUILD_CVS_SERVER" value="dev.eclipse.org"/>
<mapEntry key="JAVA_5_HOME" value="/home/shared/webtools/apps/jdk1.5.0_12"/>
<mapEntry key="RELENG" value="webtools.maps/releng"/>
<mapEntry key="BASEARCH" value="x86"/>
<mapEntry key="BASEOS" value="linux"/>
<mapEntry key="LOCAL_BUILD_PROPERTIES_DIR" value="/home/shared/workbenchbuild/localBuildProperties"/>
<mapEntry key="JAVA_4_HOME" value="/home/shared/webtools/apps/j2sdk1.4.2_14"/>
-<mapEntry key="RELENGWTPBUILDER" value="webtools.releng/releng.wtpbuilder"/>
+<mapEntry key="RELENG_BUILDER" value="webtools.releng/releng.wtpbuilder"/>
<mapEntry key="RELENGDALI" value="webtools.maps/releng.dali"/>
-<mapEntry key="WTP_CVS_ROOT" value="/cvsroot/webtools"/>
+<mapEntry key="BUILD_CVS_ROOT" value="/cvsroot/webtools"/>
<mapEntry key="RELENGJSF" value="webtools.maps/releng.jsf"/>
</mapAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">