diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-addCategories-320.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-320.sh
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-addCategories-320.sh
rename to releng.wtpbuilder/manualStepScripts/antrunner/addCategories-320.sh
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-addCategories-321.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-321.sh
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-addCategories-321.sh
rename to releng.wtpbuilder/manualStepScripts/antrunner/addCategories-321.sh
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-addCategories-322.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-322.sh
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-addCategories-322.sh
rename to releng.wtpbuilder/manualStepScripts/antrunner/addCategories-322.sh
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-addRepoProperties-320.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-320.sh
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-addRepoProperties-320.sh
rename to releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-320.sh
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-addRepoProperties-321.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-321.sh
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-addRepoProperties-321.sh
rename to releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-321.sh
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-addRepoProperties-330.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-330.sh
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-addRepoProperties-330.sh
rename to releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-330.sh
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-composite.xml b/releng.wtpbuilder/manualStepScripts/antrunner/makeComposite.xml
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-composite.xml
rename to releng.wtpbuilder/manualStepScripts/antrunner/makeComposite.xml
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-process-artifacts-320.xml b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-320.xml
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-process-artifacts-320.xml
rename to releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-320.xml
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-process-artifacts-321.xml b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-321.xml
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-process-artifacts-321.xml
rename to releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-321.xml
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-process-artifacts-322.xml b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-process-artifacts-322.xml
rename to releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-process-artifacts-330.xml b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-330.xml
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-process-artifacts-330.xml
rename to releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-330.xml
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-releng-tools-composite.xml b/releng.wtpbuilder/manualStepScripts/antrunner/releng-tools-composite.xml
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-releng-tools-composite.xml
rename to releng.wtpbuilder/manualStepScripts/antrunner/releng-tools-composite.xml
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-remove-iu.xml b/releng.wtpbuilder/manualStepScripts/antrunner/remove-iu.xml
similarity index 100%
rename from releng.wtpbuilder/manualStepScripts/antrunner/webtools-remove-iu.xml
rename to releng.wtpbuilder/manualStepScripts/antrunner/remove-iu.xml
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-createnoopzips-standalone-util.xml b/releng.wtpbuilder/manualStepScripts/antrunner/webtools-createnoopzips-standalone-util.xml
deleted file mode 100644
index 1ce696c3b8257b45c58b7ad4c1aba6ab53d1a87a..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/manualStepScripts/antrunner/webtools-createnoopzips-standalone-util.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!--
- This script is to create some zips with core features only.
- Limited, specialized usefulness, so they are not linked or
- advertised. That is, could change at any time.
- -->
-<project
- default="build"
- basedir=".">
- <!--
- These properties are normally set by calling task, but for
- "local" tests from command line, they can be set here
- -->
- <property
- name="buildDirectory"
- value="/shared/webtools/committers/wtp-R3.2.0-S/20100525145526"/>
- <property
- name="buildLabel"
- value="S-3.2.0RC3-20100525145526"/>
- <property
- name="wtp.builder.home"
- value="/shared/webtools/projectBuilders/wtp-R3.2.0-S/webtools.releng/releng.wtpbuilder"/>
- <echo
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- message="buildLabel: ${buildLabel}"/>
- <echo
- message="wtp.builder.home: ${wtp.builder.home}"/>
- <!--
- three convenience variables to help avoid typos, etc. Should
- never need to be changed
- -->
- <property
- name="tempDir"
- value="${buildDirectory}/${buildLabel}/tempdir"/>
- <property
- name="tempRunnableEclipse"
- value="${tempDir}/eclipse"/>
- <property
- name="tempRepo"
- value="${buildDirectory}/${buildLabel}/temprepo"/>
- <target
- name="build">
- <antcall
- target="createNoOptionalZip">
- <param
- name="newarchiveName"
- value="wtp-noop-${buildLabel}.zip"/>
- </antcall>
- <antcall
- target="createNoOptionalSDKZip">
- <param
- name="newarchiveName"
- value="wtp-sdk-noop-${buildLabel}.zip"/>
- </antcall>
- <antcall
- target="createNoOptionalTestZip">
- <param
- name="newarchiveName"
- value="wtp-tests-noop-${buildLabel}.zip"/>
- </antcall>
- </target>
- <target
- name="createNoOptionalZip">
- <ant
- antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
- target="premirrortasks"/>
- <p2.mirror
- source="${buildDirectory}/${buildLabel}/repository"
- destination="${tempRepo}"
- log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log"
- verbose="true">
- <slicingoptions
- followstrict="true"
- includeNonGreedy="false"
- includeOptional="false"/>
- <iu
- id="org.eclipse.wst.web_ui.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
- <iu
- id="org.eclipse.jpt.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.xml_ui.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.jsdt.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.common.fproj.feature.group"/>
- <iu
- id="org.eclipse.wst.server_adapters.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
- <iu
- id="org.eclipse.jst.server_ui.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.web_ui.feature.feature.group"/>
- <iu
- id="org.eclipse.jsf.feature.feature.group"/>
- </p2.mirror>
- <ant
- antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
- target="postmirrortasks"/>
- </target>
- <target
- name="createNoOptionalSDKZip">
- <ant
- antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
- target="premirrortasks"/>
- <p2.mirror
- source="${buildDirectory}/${buildLabel}/repository"
- destination="${tempRepo}"
- log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log"
- verbose="true">
- <slicingoptions
- followstrict="true"
- includeNonGreedy="false"
- includeOptional="false"/>
- <iu
- id="org.eclipse.wst.web_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.enterprise_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jpt_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.xml_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.jsdt_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.common.fproj.sdk.feature.group"/>
- <iu
- id="org.eclipse.wst.server_adapters.sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group"/>
- <iu
- id="org.eclipse.jst.server_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters.sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.web_sdk.feature.feature.group"/>
- <iu
- id="org.eclipse.jsf_sdk.feature.feature.group"/>
- </p2.mirror>
- <ant
- antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
- target="postmirrortasks"/>
- </target>
- <target
- name="createNoOptionalTestZip">
- <ant
- antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
- target="premirrortasks"/>
- <p2.mirror
- source="${buildDirectory}/${buildLabel}/repository"
- destination="${tempRepo}"
- log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log"
- verbose="true">
- <slicingoptions
- followstrict="true"
- includeNonGreedy="false"
- includeOptional="false"/>
- <iu
- id="org.eclipse.jpt.tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.enterprise_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.jsf.tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_adapters.ext_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.server_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.jst.web_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.common_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.jsdt_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.server_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.web_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.ws_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wst.xml_tests.feature.feature.group"/>
- <iu
- id="org.eclipse.wtp.releng.tests.feature.feature.group"/>
- </p2.mirror>
- <ant
- antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
- target="postmirrortasks"/>
- </target>
-</project>