diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb
index 23dc0b137ea..9b9410b80a9 100644
--- a/releng/org.eclipse.rse.build/build.rb
+++ b/releng/org.eclipse.rse.build/build.rb
@@ -2,15 +2,16 @@
 # Build script for Remote System Explorer
 # Author: Dave Dykstal, Kushal Munir
 # Prerequisites:
-# java and CVS have to be in the path
+# written in ruby
+# java and cvs have to be in the path
 
 require "ftools"
 
 def ask(question, default)
-	message = "#{question} (default is #{default})" 
+	message = "#{question} (default is #{default}): " 
 	STDERR.print message
-	answer = readline()
-	answer = answer.strip.empty? ? default : answer
+	answer = readline().strip
+	answer = answer.empty? ? default : answer
 	return answer
 end
 
@@ -20,12 +21,17 @@ eclipse	= "c:/work/targets/OpenRSE-1.0/eclipse"
 
 # "builder" is the location of the custom build scripts customTargets.xml and build.properties
 # (i.e. the contents of org.eclipse.rse.build)
-builder	= File.expand_path(".") # needs to be an absolute path
+builder	= "."
 
 # "working" is where the build is actually done, does not need to exist
 working = "c:/temp/build"
 
-# Find the base build scripts
+# make these absolute paths
+eclipse = File.expand_path(eclipse)
+builder = File.expand_path(builder)
+working = File.expand_path(working)
+
+# Find the base build scripts: genericTargets.xml and build.xml
 candidates = Dir["#{eclipse}/plugins/org.eclipse.pde.build*"]
 if (candidates.size == 0) then 
 	raise("PDE Build was not found.")
diff --git a/releng/org.eclipse.rse.build/build.xml b/releng/org.eclipse.rse.build/build.xml
deleted file mode 100644
index f721cdcb92b..00000000000
--- a/releng/org.eclipse.rse.build/build.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<project name="Build All Elements" default="main">
-
-<!-- ===================================================================== -->
-<!-- Global properties.  See the build.properties for information on -->
-<!-- the properties which callers can control. -->
-<!-- ===================================================================== -->
-<property name="builder" location="${user.dir}"/>
-<property name="builderDirectory" location="${builder}"/>
-<property name="buildProperties" location="${builder}/build.properties"/>
-<property file="${buildProperties}"/>
-<available property="customTargets" file="${builder}/customTargets.xml" value="${builder}/customTargets.xml"/>
-<property name="customTargets" location="${eclipse.pdebuild.templates}/headless-build/customTargets.xml"/>
-<property name="genericTargets" location="${eclipse.pdebuild.scripts}/genericTargets.xml"/>
-	
-<!-- ===================================================================== -->
-<!-- main entry point to setup, fetch, generate, build etc. Use -->
-<!-- the customTargets.xml to modify the build behaviour. -->
-<!-- ===================================================================== -->
-
-<!-- ******* add in the descriptions for each of the top level targets to teh target decl -->
-<target name="main" description="the main build target">	
-  	<antcall target="preBuild" /> 
- 	<antcall target="fetch" />
-	<antcall target="generate" /> 
-	<antcall target="process" /> 
-	<antcall target="assemble" />
-	<antcall target="package" />
-	<antcall target="postBuild" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before starting the build.  Typical setup includes -->
-<!-- fetching the map files and building the directory.  -->
-<!-- ===================================================================== -->
-<target name="preBuild">
-	<mkdir dir="${buildDirectory}" />
-	<ant antfile="${customTargets}" target="preSetup" /> 
-	<ant antfile="${customTargets}" target="getMapFiles" /> 
-	<concat destfile="${buildDirectory}/directory.txt" fixlastline="yes">
-		<fileset dir="${buildDirectory}" includes="maps/**/*.map"/>
-	</concat>
-	<ant antfile="${customTargets}" target="postSetup" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Fetch the elements identified in the customTargets -->
-<!-- ===================================================================== -->
-<target name="fetch" unless="skipFetch">
-	<ant antfile="${customTargets}" target="preFetch"/>
-	<!-- Generates and then execute the fetch scripts for each build element-->
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="fetchElement" />
-	</ant>
-	
-	<ant antfile="${customTargets}" target="postFetch"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Generate the build scripts for each element identified in the customTargets -->
-<!-- ===================================================================== -->
-<target name="generate">
-	<ant antfile="${customTargets}" target="preGenerate"/>
-	<!-- Generate the build.xml for each build element-->
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="generateScript" />
-	</ant>
-	<ant antfile="${customTargets}" target="postGenerate"/>	
-</target>
-
-<!-- ===================================================================== -->
-<!-- Run the build scripts for each element identified in the customTargets -->
-<!-- ===================================================================== -->
-<target name="process">
-	<!-- Run custom tasks before processing, i.e. creating source build zip files -->
-	<ant antfile="${customTargets}" target="preProcess" />
-
-	<!-- Process all of the build elements-->
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="processElement" />
-	</ant>
-
-	<!-- Run custom tasks after compiling, i.e. reporting compile errors -->
-	<ant antfile="${customTargets}" target="postProcess" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Assemble the build elements into final distributions -->
-<!-- ===================================================================== -->
-<target name="assemble">
-	<ant antfile="${customTargets}" target="preAssemble"/>
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="assembleElement"/>
-	</ant>
-	<ant antfile="${customTargets}" target="postAssemble"/>	
-</target>
-
-<!-- ===================================================================== -->
-<!-- Package the build elements into final distributions -->
-<!-- ===================================================================== -->
-<target name="package" if="runPackager">
-	<ant antfile="${customTargets}" target="prePackage"/>
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="packageElement"/>
-	</ant>
-	<ant antfile="${customTargets}" target="postPackage"/>	
-</target>
-
-<!-- ===================================================================== -->
-<!-- Do any steps required after the build (e.g., posting, testing, ...) -->
-<!-- ===================================================================== -->
-<target name="postBuild">
-	<ant antfile="${customTargets}" target="postBuild" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Clean the build elements.  This target is here as an entry -->
-<!-- point to the customTargets.  It is not called directly in the normal -->
-<!-- course of events. -->
-<!-- ===================================================================== -->
-<target name="clean">
-  <ant antfile="${customTargets}" target="allElements">
-     <property name="target" value="cleanElement"/>
-  </ant>
-</target>
-
-</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 6ee0c50dd8c..c157f1542ed 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -55,20 +55,15 @@
 	</target>
 
 	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
+	<!-- Place the map files into the "maps" directory, specify version tags -->
 	<!-- ===================================================================== -->
 	<target name="getMapFiles">
-		<property name="cvsRoot" value=":pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp" />
-		<cvs cvsRoot="${cvsRoot}"
-			package="org.eclipse.tm.rse/releng/org.eclipse.rse.build"
-			dest="${buildDirectory}/releng"
-			tag="${mapVersionTag}"
-		/>
 		<copy todir="${buildDirectory}/maps">
-			<mapper type="flatten"/>
-			<fileset dir="${buildDirectory}/releng" includes="**/*.map"/>
+			<fileset dir="${builder}" includes="*.map" />
 		</copy>
+		<replace token="@tag@" value="$mapVersionTag">
+			<fileset dir="${buildDirectory}/maps" includes="*.map"/>
+		</replace>
 	</target>
 
 	<!-- ===================================================================== -->
diff --git a/releng/org.eclipse.rse.build/fetchBuilder.rb b/releng/org.eclipse.rse.build/fetchBuilder.rb
new file mode 100644
index 00000000000..010dbc337f2
--- /dev/null
+++ b/releng/org.eclipse.rse.build/fetchBuilder.rb
@@ -0,0 +1,16 @@
+#!/usr/bin/ruby
+STDERR.print("Which tag do you want to fetch? (default is HEAD): ")
+answer = readline().strip
+tag = answer.empty? ? "HEAD" : answer
+
+command = "cvs "
+command += "-d :pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp "
+command += "checkout "
+command += "-r #{tag} "
+command += "-d builder "
+command += "org.eclipse.tm.rse/releng/org.eclipse.rse.build "
+
+system(command)
+
+puts()
+puts("Builder has been fetched and is in the builder subdirectory")
diff --git a/releng/org.eclipse.rse.build/genericTargets.xml b/releng/org.eclipse.rse.build/genericTargets.xml
deleted file mode 100644
index 306a588a62b..00000000000
--- a/releng/org.eclipse.rse.build/genericTargets.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<project name="Generic Build Targets" default="noDefault">
-
-<!-- Properties that must be passed to this script:
-	buildDirectory
-	id
-	type
-	ignoreTagInfo
-	recursiveGeneration
-	workingDirectory
-	configInfo
--->
-
-<!-- ===================================================================== -->
-<!-- Setup default values -->
-<!--   configs : by default build a platform-independent configuration -->
-<!--   fetchTag : by default use the CVS tags as spec'd in directory.txt -->
-<!-- ===================================================================== -->
-<property name="configs" value="*,*,*"/>
-<property name="fetchTag" value=""/>
-<property name="buildingOSGi" value="true"/>
-<property name="generateJnlp" value="false"/>
-<property name="signJars" value="false"/>
-<property name="generateFeatureVersionSuffix" value="false" />
-<property name="generateVersionsLists" value="true" />
-<property name="groupConfigurations" value="false"/>
-<property name="pluginPath" value=""/>
-
-<!-- ===================================================================== -->
-<!-- Fetch a single element (feature, plugin, fragment) -->
-<!-- ===================================================================== -->
-<target name="fetchElement" description="Checking out source from repository..." depends="init">
-	<mkdir dir="${buildDirectory}/features"/>
-	<mkdir dir="${buildDirectory}/plugins"/>
-	<eclipse.fetch
-		elements="${type}@${id}"
-		buildDirectory="${buildDirectory}"
-		directory="${buildDirectory}/directory.txt"
-		fetchTag="${fetchTag}"
-		configInfo="${configs}"
-		baseLocation="${baseLocation}"
-	/>
-	
-	<!-- Run generated fetch script -->
-	<ant antfile="${buildDirectory}/fetch_${id}.xml">
-		<!-- ************  should not have to spec these  *************** -->
-		<property name="featureOnly" value="true"/>
-		<property name="featureAndPlugins" value="true"/>
-		<property name="featuresRecursively" value="true"/>
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Clean previously built elements -->
-<!-- ===================================================================== -->
-<target name="cleanElement" description="Scrubbing features and plugins of old jars..." depends="init">
-<echo message="${elementPath}"/>
-	<ant antfile="build.xml" dir="${elementPath}" target="clean"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Generate a build.xml file for an element -->
-<!-- ===================================================================== -->
-<target name="generateScript" description="Generating build scripts..." depends="init">
-	<eclipse.buildScript 
-		elements="${type}@${id}" 
-		buildDirectory="${buildDirectory}"
-		configInfo="${configs}"
-		baseLocation="${baseLocation}"
-		buildingOSGi="${buildingOSGi}"
-		outputUpdateJars="${outputUpdateJars}"
-		archivesFormat="${archivesFormat}"
-		product="${product}"
-		forceContextQualifier="${forceContextQualifier}"
-		generateJnlp="${generateJnlp}"
-		signJars="${signJars}"
-		generateFeatureVersionSuffix="${generateFeatureVersionSuffix}"
-		generateVersionsLists="${generateVersionsLists}"
-		groupConfiguration="${groupConfigurations}"
-		pluginPath="${pluginPath}"
-	/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Run build.xml for a single element-->
-<!-- ===================================================================== -->
-<target name="processElement" description="Processing build scripts..." depends="init">
-	<ant antfile="build.xml" dir="${elementPath}" target="build.jars">
-		<property name="target" value="build.jars"/>
-	</ant>
-</target>
-
-<!-- **********************
-1) the gather targets do more than just gather.  These are packaging targets.
-We need to continue ot separate the two concepts (gather and package) as 
-the packaging is different if we wanted to create an update site packaging
-(for example).  The gathers are commented out for now as the new generated
-scripts do not seem to have them.
-
-2) do we really need the ws and os properties?  In all cases?  Do they have to be 
-set here?
--->
-
-<!-- ===================================================================== -->
-<!-- Gather items listed in bin.includes -->
-<!-- ===================================================================== -->
-<target name="gatherBinaries" description="Gathering binary distribution..." depends="init">
-	<!-- ant antfile="build.xml" dir="${elementPath}" target="gather.bin.parts"/ -->
-	<ant antfile="build.xml" dir="${elementPath}" target="zip.distribution">
-		<property name="os" value="${os}" />
-		<property name="ws" value="${ws}" />	
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Gather source for a build element -->
-<!-- ===================================================================== -->
-<target name="gatherSources" description="Gathering source distribution..." depends="init">
-	<!--suspect:  this call is required to create the *.src.zip inside each plugin-->
-	<ant antfile="build.xml" dir="${elementPath}" target="build.sources">
-		<property name="os" value="${os}" />
-		<property name="ws" value="${ws}" />	
-	</ant>
-	<ant antfile="build.xml" dir="${elementPath}" target="zip.sources">
-		<property name="os" value="${os}" />
-		<property name="ws" value="${ws}" />	
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Gather log files for an element -->
-<!-- Suspect: We just unzip these right away -->
-<!-- ===================================================================== -->
-<target name="gatherLogs" description="Gathering build logs..." depends="init">
-	<ant antfile="build.xml" dir="${elementPath}" target="zip.logs" >
-		<property name="buildDirectory" value="${buildDirectory}" />
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="This file must be called with explicit targets" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Assemble one build element -->
-<!-- ===================================================================== -->
-<target name="assembleElement" description="Assembling the build..." depends="init">
-	<ant antfile="assemble.${id}.all.xml" dir="${buildDirectory}"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Package one build element -->
-<!-- ===================================================================== -->
-<target name="packageElement" description="Packaging the build..." depends="init">
-	<ant antfile="package.${id}.all.xml" dir="${buildDirectory}"/>
-</target>
-	
-<!-- ===================================================================== -->
-<!-- Miscellaneous helper targets -->
-<!-- ===================================================================== -->
-<target name="init">
-	<condition property="elementPath" value="${buildDirectory}/plugins/${id}">
-		<equals arg1="${type}" arg2="fragment" />
-	</condition>
-	<property name="elementPath" value="${buildDirectory}/${type}s/${id}" />
-</target>
-
-</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/myBuild.xml b/releng/org.eclipse.rse.build/myBuild.xml
deleted file mode 100644
index 4bbcc0ac073..00000000000
--- a/releng/org.eclipse.rse.build/myBuild.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<project name="Build All Elements" default="main">
-
-	<!-- ===================================================================== -->
-	<!-- Custom settings -->
-	<!-- ===================================================================== -->
-	<property name="head" value="${baseLocation}\..\..\packagehome" />
-	<property name="configs" value="*,*,*" />
-	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath" />
-	<tstamp>
-		<format property="today" pattern="E" locale="en" />
-		<format property="timestamp" pattern="yyyyMMdd" locale="en" />
-	</tstamp>
-
-	<!-- ===================================================================== -->
-	<!-- Global properties.  See the build.properties for information on -->
-	<!-- the properties which callers can control. -->
-	<!-- ===================================================================== -->
-	<property name="builderDirectory" location="${builder}" />
-	<property name="buildProperties" location="${builder}/build.properties" />
-	<property name="customTargets" location="${builderDirectory}/customTargets.xml" />
-	<property name="genericTargets" location="${builderDirectory}/genericTargets.xml" />
-	<property name="packageDirectory" location="%{packageDirectory}" />
-	<property name="publishDirectory" location="%{publishDirectory}" />
-	<property file="${buildProperties}" />
-
-	<condition property="doExtract" value="true">
-		<equals arg1="${bld_do_extract}" arg2="yes" />
-	</condition>
-	<condition property="doBuild" value="true">
-		<equals arg1="${bld_do_build}" arg2="yes" />
-	</condition>
-	<condition property="doPackage" value="true">
-		<equals arg1="${bld_do_package}" arg2="yes" />
-	</condition>
-	<condition property="doPublish" value="true">
-		<equals arg1="${bld_do_publish}" arg2="yes" />
-	</condition>
-
-	<!-- ===================================================================== -->
-	<!-- main entry point to setup, fetch, generate, build etc. Use -->
-	<!-- the customTargets.xml to modify the build behaviour. -->
-	<!-- ===================================================================== -->
-	<!-- ******* add in the descriptions for each of the top level targets to the target decl -->
-	<target name="main" description="the main build target">
-		<antcall target="preBuild" />
-		<antcall target="fetch" />
-		<antcall target="generate" />
-		<antcall target="process" />
-		<antcall target="assemble" />
-		<antcall target="postBuild" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before starting the build.  Typical setup includes -->
-	<!-- fetching the map files and building the directory.  -->
-	<!-- ===================================================================== -->
-	<target name="preBuild" if="doExtract">
-		<echo message="Preparing to extract..." />
-		<mkdir dir="${buildDirectory}" />
-		<ant antfile="${customTargets}" target="preSetup" />
-		<ant antfile="${customTargets}" target="getMapFiles" />
-		<concat destfile="${buildDirectory}/directory.txt" fixlastline="yes">
-			<fileset dir="${buildDirectory}" includes="maps/**/*.map" />
-		</concat>
-		<ant antfile="${customTargets}" target="postSetup" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Fetch the elements identified in the customTargets -->
-	<!-- Generates and then execute the fetch scripts for each build element-->
-	<!-- ===================================================================== -->
-	<target name="fetch" if="doExtract">
-		<echo message="Extracting..." />
-		<ant antfile="${customTargets}" target="preFetch" />
-		<ant antfile="${customTargets}" target="allElements">
-			<property name="target" value="fetchElement" />
-		</ant>
-
-		<ant antfile="${customTargets}" target="postFetch" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Generate the build scripts for each element identified in the customTargets -->
-	<!-- ===================================================================== -->
-	<target name="generate" if="doBuild">
-		<echo message="Generating build scripts..." />
-		<ant antfile="${customTargets}" target="preGenerate" />
-		<ant antfile="${customTargets}" target="allElements">
-			<property name="target" value="generateScript" />
-		</ant>
-		<ant antfile="${customTargets}" target="postGenerate" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Run the build scripts for each element identified in the customTargets -->
-	<!-- 1) Run custom tasks before processing, i.e. creating source build zip files -->
-	<!-- 2) Process all of the build elements-->
-	<!-- 3) Run custom tasks after compiling, i.e. reporting compile errors -->
-	<!-- ===================================================================== -->
-	<target name="process" if="doBuild">
-		<echo message="Building..." />
-		<ant antfile="${customTargets}" target="preProcess" />
-		<ant antfile="${customTargets}" target="allElements">
-			<property name="target" value="processElement" />
-		</ant>
-		<ant antfile="${customTargets}" target="postProcess" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Assemble the build elements into final distributions -->
-	<!-- ===================================================================== -->
-	<target name="assemble" if="doPackage">
-		<echo message="Assembling..." />
-		<ant antfile="${customTargets}" target="preAssemble" />
-		<ant antfile="${customTargets}" target="allElements">
-			<property name="target" value="assembleElement" />
-		</ant>
-		<ant antfile="${customTargets}" target="postAssemble" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Do any steps required after the build (e.g., posting, testing, ...) -->
-	<!-- ===================================================================== -->
-	<target name="postBuild" if="doPackage">
-		<echo message="Packaging..." />
-		<ant antfile="${customTargets}" target="postBuild" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Clean the build elements.  This target is here as an entry -->
-	<!-- point to the customTargets.  It is not called directly in the normal -->
-	<!-- course of events. -->
-	<!-- ===================================================================== -->
-	<target name="clean">
-		<ant antfile="${customTargets}" target="allElements">
-			<property name="target" value="cleanElement" />
-		</ant>
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.rse.build/myGenericTargets.xml b/releng/org.eclipse.rse.build/myGenericTargets.xml
deleted file mode 100644
index b9ca652fa3f..00000000000
--- a/releng/org.eclipse.rse.build/myGenericTargets.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<project name="Generic Build Targets" default="noDefault">
-
-<!-- Properties that must be passed to this script:
-	buildDirectory
-	id
-	type
-	ignoreTagInfo
-	recursiveGeneration
-	workingDirectory
-	configInfo
--->
-
-<!-- ===================================================================== -->
-<!-- Setup default values -->
-<!--   configs : by default build a platform-independent configuration -->
-<!--   fetchTag : by default use the CVS tags as spec'd in directory.txt -->
-<!-- ===================================================================== -->
-<property name="configs" value="*,*,*"/>
-<property name="fetchTag" value=""/>
-<property name="buildingOSGi" value="true"/>
-<!-- ===================================================================== -->
-<!-- Fetch a single element (feature, plugin, fragment) -->
-<!-- ===================================================================== -->
-<target name="fetchElement" description="Checking out source from repository..." depends="init">
-	<mkdir dir="${buildDirectory}/features"/>
-	<mkdir dir="${buildDirectory}/plugins"/>
-	<eclipse.fetch
-		elements="${type}@${id}"
-		buildDirectory="${buildDirectory}"
-		directory="${buildDirectory}/directory.txt"
-		fetchTag="${fetchTag}"
-		configInfo="${configs}"
-	/>
-	
-	<!-- Run generated fetch script -->
-
-       <echo message="featuresRecursively is :${featuresRecursively}"/>
-
-	<ant antfile="${buildDirectory}/fetch_${id}.xml">
-		<!-- ************  should not have to spec these  *************** -->
-		<property name="featureOnly" value="true"/>
-		<property name="featureAndPlugins" value="true"/>
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Clean previously built elements -->
-<!-- ===================================================================== -->
-<target name="cleanElement" description="Scrubbing features and plugins of old jars..." depends="init">
-<echo message="${elementPath}"/>
-	<ant antfile="build.xml" dir="${elementPath}" target="clean"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Generate a build.xml file for an element -->
-<!-- ===================================================================== -->
-<target name="generateScript" description="Generating build scripts..." depends="init">
-	<echo message="eclipse.buildScript ${type}@${id} buildDirectory=${buildDirectory} buildingOSGi=${buildingOSGi} baseLocation=${baseLocation} " />
-	<eclipse.buildScript
-		elements="${type}@${id}"
-		buildDirectory="${buildDirectory}"
-		configInfo="${configs}"
-		baseLocation="${baseLocation}"
-		buildingOSGi="${buildingOSGi}"
-               archivesFormat="${archivesFormat}"
-	/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Run build.xml for a single element-->
-<!-- ===================================================================== -->
-<target name="processElement" description="Processing build scripts..." depends="init">
-	<ant antfile="build.xml" dir="${elementPath}" target="build.jars">
-		<property name="target" value="build.jars"/>
-	</ant>
-	<ant antfile="build.xml" dir="${elementPath}" target="build.sources">
-		<property name="os" value="${os}" />
-		<property name="ws" value="${ws}" />	
-	</ant>
-</target>
-
-<!-- **********************
-1) the gather targets do more than just gather.  These are packaging targets.
-We need to continue to separate the two concepts (gather and package) as
-the packaging is different if we wanted to create an update site packaging
-(for example).  The gathers are commented out for now as the new generated
-scripts do not seem to have them.
-
-2) do we really need the ws and os properties?  In all cases?  Do they have to be
-set here?
--->
-
-<!-- ===================================================================== -->
-<!-- Gather items listed in bin.includes -->
-<!-- ===================================================================== -->
-<target name="gatherBinaries" description="Gathering binary distribution..." depends="init">
-	<!-- ant antfile="build.xml" dir="${elementPath}" target="gather.bin.parts"/ -->
-	<ant antfile="build.xml" dir="${elementPath}" target="zip.distribution">
-		<property name="os" value="${os}" />
-		<property name="ws" value="${ws}" />	
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Gather source for a build element -->
-<!-- ===================================================================== -->
-<target name="gatherSources" description="Gathering source distribution..." depends="init">
-	<ant antfile="build.xml" dir="${elementPath}" target="zip.sources">
-		<property name="os" value="${os}" />
-		<property name="ws" value="${ws}" />	
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Gather log files for an element -->
-<!-- Suspect: We just unzip these right away -->
-<!-- ===================================================================== -->
-<target name="gatherLogs" description="Gathering build logs..." depends="init">
-	<ant antfile="build.xml" dir="${elementPath}" target="zip.logs" >
-		<property name="buildDirectory" value="${buildDirectory}" />
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="This file must be called with explicit targets" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Assemble one build element -->
-<!-- ===================================================================== -->
-<target name="assembleElement" description="Assembling the build..." depends="init">
-	<ant antfile="assemble.${id}.all.xml" dir="${buildDirectory}"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Miscellaneous helper targets -->
-<!-- ===================================================================== -->
-<target name="init">
-	<condition property="elementPath" value="${buildDirectory}/plugins/${id}">
-		<equals arg1="${type}" arg2="fragment" />
-	</condition>
-	<property name="elementPath" value="${buildDirectory}/${type}s/${id}" />
-</target>
-
-</project>
diff --git a/releng/org.eclipse.rse.build/rse.map b/releng/org.eclipse.rse.build/rse.map
index de6334e7d48..3b787b33b25 100644
--- a/releng/org.eclipse.rse.build/rse.map
+++ b/releng/org.eclipse.rse.build/rse.map
@@ -1,31 +1,31 @@
-feature@org.eclipse.rse.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
-feature@org.eclipse.rse.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
-feature@org.eclipse.rse.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
-feature@org.eclipse.rse.ftp=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
-feature@org.eclipse.rse.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
-plugin@org.eclipse.dstore.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
-plugin@org.eclipse.dstore.extra=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
-plugin@org.eclipse.rse.connectorservice.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
-plugin@org.eclipse.rse.connectorservice.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
-plugin@org.eclipse.rse.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
-plugin@org.eclipse.rse.dstore.security=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
-plugin@org.eclipse.rse.files.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
-plugin@org.eclipse.rse.logging=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.logging
-plugin@org.eclipse.rse.processes.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
-plugin@org.eclipse.rse.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
-plugin@org.eclipse.rse.services.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
-plugin@org.eclipse.rse.services.files.ftp=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
-plugin@org.eclipse.rse.services.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
-plugin@org.eclipse.rse.services=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
-plugin@org.eclipse.rse.shells.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
-plugin@org.eclipse.rse.subsystems.files.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
-plugin@org.eclipse.rse.subsystems.files.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
-plugin@org.eclipse.rse.subsystems.files.ftp=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
-plugin@org.eclipse.rse.subsystems.files.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
-plugin@org.eclipse.rse.subsystems.processes.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core
-plugin@org.eclipse.rse.subsystems.processes.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore
-plugin@org.eclipse.rse.subsystems.processes.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
-plugin@org.eclipse.rse.subsystems.shells.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
-plugin@org.eclipse.rse.subsystems.shells.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
-plugin@org.eclipse.rse.subsystems.shells.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
-plugin@org.eclipse.rse.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
+feature@org.eclipse.rse.sdk=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
+feature@org.eclipse.rse.core=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
+feature@org.eclipse.rse.dstore=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
+feature@org.eclipse.rse.ftp=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
+feature@org.eclipse.rse.local=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
+plugin@org.eclipse.dstore.core=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
+plugin@org.eclipse.dstore.extra=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
+plugin@org.eclipse.rse.connectorservice.dstore=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
+plugin@org.eclipse.rse.connectorservice.local=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
+plugin@org.eclipse.rse.core=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
+plugin@org.eclipse.rse.dstore.security=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
+plugin@org.eclipse.rse.files.ui=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
+plugin@org.eclipse.rse.logging=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.logging
+plugin@org.eclipse.rse.processes.ui=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
+plugin@org.eclipse.rse.sdk=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
+plugin@org.eclipse.rse.services.dstore=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
+plugin@org.eclipse.rse.services.files.ftp=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
+plugin@org.eclipse.rse.services.local=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
+plugin@org.eclipse.rse.services=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
+plugin@org.eclipse.rse.shells.ui=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
+plugin@org.eclipse.rse.subsystems.files.core=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
+plugin@org.eclipse.rse.subsystems.files.dstore=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
+plugin@org.eclipse.rse.subsystems.files.ftp=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
+plugin@org.eclipse.rse.subsystems.files.local=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
+plugin@org.eclipse.rse.subsystems.processes.core=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core
+plugin@org.eclipse.rse.subsystems.processes.dstore=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore
+plugin@org.eclipse.rse.subsystems.processes.local=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
+plugin@org.eclipse.rse.subsystems.shells.core=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
+plugin@org.eclipse.rse.subsystems.shells.dstore=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
+plugin@org.eclipse.rse.subsystems.shells.local=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
+plugin@org.eclipse.rse.ui=@tag@,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui