simplify build parameters
diff --git a/releng.wtpbuilder/releng.wtpbuilder build.xml.launch b/releng.wtpbuilder/releng.wtpbuilder build.xml.launch
index 725768f..0d2efd1 100644
--- a/releng.wtpbuilder/releng.wtpbuilder build.xml.launch
+++ b/releng.wtpbuilder/releng.wtpbuilder build.xml.launch
@@ -11,24 +11,24 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="ANT_HOME" value="/home/shared/webtools/apps/apache-ant-1.7.0"/>
-<mapEntry key="CVS_RSH" value="ssh"/>
<mapEntry key="DISPLAY" value="127.0.0.1:1.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="RELENGMAPS" value="webtools.maps"/>
<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="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="RELENGDALI" value="webtools.maps/releng.dali"/>
+<mapEntry key="CVS_RSH" value="ssh"/>
+<mapEntry key="WTP_CVS_PROTOCOL" value="ext"/>
+<mapEntry key="BUILD_HOME" value="/home/shared/workbenchbuild/"/>
+<mapEntry key="WTP_CVS_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="RELENGDALI" value="webtools.maps/releng.dali"/>
<mapEntry key="WTP_CVS_ROOT" value="/cvsroot/webtools"/>
<mapEntry key="RELENGJSF" value="webtools.maps/releng.jsf"/>
</mapAttribute>
@@ -36,19 +36,20 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_12"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="releng.wtpbuilder"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk1.5.0_12"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
<mapEntry key="eclipse.pdebuild.scripts" value="/home/davidw/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070517/scripts/"/>
-<mapEntry key="releng.jsf-mapVersionTag" value="HEAD"/>
<mapEntry key="build.distribution" value="wtp"/>
-<mapEntry key="mapVersionTag" value="HEAD"/>
-<mapEntry key="releng.dali-mapVersionTag" value="HEAD"/>
<mapEntry key="eclipse.pdebuild.templates" value="/home/davidw/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070517/templates/"/>
<mapEntry key="buildType" value="I"/>
<mapEntry key="buildBranch" value="R3.0"/>
+<mapEntry key="releng.jsf-mapVersionTag" value="HEAD"/>
+<mapEntry key="mapVersionTag" value="HEAD"/>
+<mapEntry key="releng.dali-mapVersionTag" value="HEAD"/>
<mapEntry key="eclipse.pdebuild.home" value="/home/davidw/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070517/./"/>
</mapAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/releng.wtpbuilder/build.xml}"/>