diff --git a/releng.wtpbuilder/distribution/patches32x.site/build.xml b/releng.wtpbuilder/distribution/patches32x.site/build.xml
index bcee7f89a88940c9587911758d858cacdcb90d47..6b4839d7441c6b69a0262e6ad985412795641876 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.site/build.xml
@@ -18,13 +18,31 @@
     <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
 
     <!-- = = = end standard properties pattern = = = -->
-    <echo message="ant.file: ${ant.file}"/>
+    <echo level="debug" message="ant.file: ${ant.file}"/>
     <target name="build">
-        <mkdir dir="${buildDirectory}/${buildLabel}"/>
+
+          <!-- make sure there is a base builder, since we need the launcher -->
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
+            target="getBaseBuilder"/>
+        <condition
+            property="antQuietValue"
+            value="-quiet"
+            else="">
+            <istrue value="${env.USE_QUIET}"/>
+        </condition>
+        <!-- TODO: should set 'failonerror' to false, and follow up with error 
+        check and appropriate cleanup/finishup actions before failing -->
+
         <java
-            jar="${eclipse.launcher}"
             fork="true"
-            failonerror="true">
+            failonerror="true"
+            classname="org.eclipse.equinox.launcher.Main">
+            <classpath>
+                <fileset dir="${pde.builder.path}/plugins">
+                    <include name="org.eclipse.equinox.launcher_*.jar"/>
+                </fileset>
+            </classpath>
             <jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
             <jvmarg value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
@@ -46,6 +64,7 @@
             <arg value="${basedir}/workspace"/>
             <arg value="-application"/>
             <arg value="org.eclipse.ant.core.antRunner"/>
+            <arg value="${antQuietValue}"/>
             <arg value="-buildfile"/>
             <arg value="${ant.file}"/>
             <arg value="publish"/>
@@ -64,6 +83,10 @@
             property="component.dir"/>
         <ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
         <property file="${buildDirectory}/label.properties"/>
+
+         <!-- buildLabel is defined in label.properties -->
+        <mkdir dir="${buildDirectory}/${buildLabel}"/>
+
         <property
             name="publish.xml"
             value="${component.dir}/publish.xml"/>
@@ -104,11 +127,13 @@
 
         <!--  Get the build map over for the results to point to. -->
         <copy
+            failonerror="false"
             file="${buildDirectory}/directory.txt"
             tofile="${result}/directory.txt"/>
 
         <!-- Copy info for build identification -->
         <copy
+            failonerror="false"
             file="${buildDirectory}/label.properties"
             tofile="${result}/label.properties"/>
 
@@ -129,7 +154,7 @@
                 dir="${env.ANT_WORKING}/${projectname}"
                 includes="antBuilderOutput.log"/>
         </copy>
-
+               
         <!-- final count files -->
         <countBuildFiles
             sourceDirectory="${buildDirectory}/${buildLabel}"
diff --git a/releng.wtpbuilder/distribution/patches32x.site/publish.xml b/releng.wtpbuilder/distribution/patches32x.site/publish.xml
index 41ed782d948cbfcc6a08872eaf80ce4adb56184f..b9d78aa92a6801a47647ad486d28de28067f3727 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches32x.site/publish.xml
@@ -53,12 +53,17 @@
     <fail
         message="dependency file not found: ${dependency.properties}"
         unless="dependency.properties.exists"/>
-    <echo message="dependency file: ${dependency.properties}"/>
-    <property file="${dependency.properties}"/>
+    <echo level="debug"  message="dependency file: ${dependency.properties}"/>
+
     <target name="default">
         <copy todir="${resultDir}">
             <fileset dir="${templateDir}/templateFiles"/>
         </copy>
+
+        <copy
+            todir="${resultDir}"
+            file="${buildDirectory}/maps/${env.RELENG}/distribution/${build.distribution}.site/prereqsToDisplay.php"/>
+
         <copy
             overwrite="true"
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
@@ -73,37 +78,15 @@
         <antcall target="getStaticFiles"/>
     </target>
     <target name="generateCompileIndex">
-        <!--
-            <taskdef name="indexResults"
-            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
-            />
-        -->
-        <!--
-            isBuildTested: true|false should JUnit plugin test results
-            be used to generate index page dropTokenList: comma
-            separated list of strings which should be replaced by the
-            fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName: path to directory containing JUnit plugin
-            test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result
-            of the build. testResultsTemplateFileName: path to template
-            file used to generate page with links to JUnit test results
-            testResultsHtmlFileName: name of file which will be
-            generated with links to JUnit test results dropHtmlFileName:
-            name of generated index page hrefTestResultsTargetPath:
-            relative path from index page to directory containing JUnit
-            html test results hrefCompileLogsTargetPath: relative path
-            from index page directory containing compilelogs
-            testManifestFileName: name of xml file containing
-            descriptions of zip types and log files
-        -->
 
         <property
             name="dependency.properties"
             value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
+
         <available
             file="${dependency.properties}"
             property="dependency.properties.exists"/>
+
         <fail
             message="dependency file not found: ${dependency.properties}"
             unless="dependency.properties.exists"/>
@@ -121,20 +104,21 @@
                 name="outputDirectory"
                 value="${resultDir}/compilelogs"/>
         </antcall>
+
         <tstamp>
             <format
                 property="TODAY"
                 pattern="MMMM d, yyyy"/>
         </tstamp>
 
-        <!--  Insert Build Type descriptor  -->
-        <antcall target="${buildType}"/>
-        <antcall target="writeData"/>
+        <antcall target="replaceData"/>
+
         <!--
             Update timestamp on file to permit overwrite through Ant
             copy task
         -->
         <touch file="${resultingIndex}"/>
+
     </target>
     <target
         name="generateTestCompileOutput"
@@ -212,7 +196,6 @@
         <fail
             message="dependency file not found: ${dependency.properties}"
             unless="dependency.properties.exists"/>
-        <property file="${dependencies.properties}"/>
 
         <!-- create table of test plugin compiles first -->
         <!-- set isBuildTested to true for the "compile only" results -->
@@ -231,14 +214,14 @@
                 pattern="MMMM d, yyyy"/>
         </tstamp>
 
-        <!--  Insert Build Type descriptor  -->
-        <antcall target="${buildType}"/>
-        <antcall target="writeData"/>
+        <antcall target="replaceData"/>
+        
         <!--
             Update timestamp on file to permit overwrite through Ant
             copy task
         -->
         <touch file="${resultingIndex}"/>
+
     </target>
     <target name="getStaticFiles">
         <!--get static files required in the buildLabel directory-->
@@ -249,6 +232,7 @@
         <!--copy buildnotes from plugin directories-->
         <mkdir dir="${resultDir}/buildnotes"/>
         <copy
+            failonerror="false"
             todir="${resultDir}/buildnotes"
             flatten="true">
             <fileset
@@ -259,114 +243,30 @@
                 includes="**/buildnotes_*.html"/>
         </copy>
         <copy
+            failonerror="false"
             file="${templateDir}/staticDropFiles/logIndex.php"
             tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
         <copy
+            failonerror="false"
             file="${templateDir}/staticDropFiles/logIndex.php"
             tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
         <copy
+            failonerror="false"
             file="${templateDir}/staticDropFiles/logIndex.php"
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
 
     <target name="countFiles">
-        <!--
-            files.count is a file that should exist in the drop
-            directory with a count of the zip files in the same
-            directory. It is required to generate a link to the build on
-            the downloads page.
-        -->
-        <countBuildFiles
-            sourceDirectory="${resultDir}"
-            filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count"/>
-    </target>
 
-    <!--Build type descriptors-->
-    <target name="I">
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@type@"
-            value="Integration"/>
-    </target>
-    <target name="S">
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@type@"
-            value="Stable"/>
-    </target>
-    <target name="N">
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@type@"
-            value="Nightly"/>
-    </target>
-    <target name="M">
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@type@"
-            value="Maintenance"/>
-    </target>
-    <target name="R">
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@type@"
-            value="Release"/>
-    </target>
-    <target name="T">
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@type@"
-            value="Test"/>
-    </target>
-    <target name="P">
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@type@"
-            value="Patches"/>
+        <resourcecount property="files.count">
+            <fileset dir="${resultDir}">
+                <include name="*.zip"/>
+            </fileset>
+        </resourcecount>
+        <echo file="${resultDir}/files.count">${files.count}</echo>
     </target>
+
+
     <target name="checkIfTested">
         <echo
             level="debug"
@@ -383,711 +283,54 @@
         <condition property="doCompileLogs">
             <available file="${outputDirectory}"/>
         </condition>
-        <echo message="doCompileLogs: ${doCompileLogs)   outputDirectory: ${outputDirectory}"/>
+        <echo level="debug" message="doCompileLogs: ${doCompileLogs)   outputDirectory: ${outputDirectory}"/>
     </target>
-    <target name="writeData">
-        <!--  Insert Build Date  -->
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@date@"
-            value="${TODAY}"/>
+    <target name="replaceData">
 
-        <!--  Insert Build Name and related information -->
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@build@"
-            value="${buildLabel}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@buildBranch@"
-            value="${buildBranch}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@build_distribution@"
-            value="${build.distribution}"/>
 
-        <!--  Insert PreRequsites  -->
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseplatformFile@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseplatformURL@"
-            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseplatformBuildURL@"
-            value="${eclipseplatform.url}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseplatformfilelinux@"
-            value="${eclipseplatform.file.linux-gtk-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseplatformfilewindows@"
-            value="${eclipseplatform.file.win32-win32-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseplatformfilemacos@"
-            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseplatformBuildHome@"
-            value="${eclipseplatform.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseplatform.mirror.prefixuri@"
-            value="${eclipseplatform.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseplatform.fspath.prefix@"
-            value="${eclipseplatform.fspath.prefix}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipseBuildHome@"
-            value="${eclipse.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@testFile@"
-            value="${eclipseTestFramework.file}"/>
-
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@e4File@"
-            value="${e4.file.linux-gtk-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@e4URL@"
-            value="${e4.url}/${eclipse.file.linux-gtk-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@e4BuildURL@"
-            value="${e4.url}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@e4filelinux@"
-            value="${e4.file.linux-gtk-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@e4filewindows@"
-            value="${e4.file.win32-win32-x86}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@e4filemacos@"
-            value="${e4.file.macosx-carbon-ppc}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@e4BuildHome@"
-            value="${e4.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@e4.mirror.prefixuri@"
-            value="${e4.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@e4.fspath.prefix@"
-            value="${e4.fspath.prefix}"/>
-
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfName@"
-            value="${emf.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfDescription@"
-            value="${emf.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfFile@"
-            value="${emf.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfBuildHome@"
-            value="${emf.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfsourceURL@"
-            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfsourceFile@"
-            value="${emfsourcedoc.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfsourceName@"
-            value="${emfsourcedoc.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfsourceDescription@"
-            value="${emfsourcedoc.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfsourceBuildHome@"
-            value="${emfsourcedoc.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfsource.mirror.prefixuri@"
-            value="${emfsourcedoc.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdsourceURL@"
-            value="${emfxsdsourcedoc.url}/${emfxsdsourcedoc.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdsourceFile@"
-            value="${emfxsdsourcedoc.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdsourceName@"
-            value="${emfxsdsourcedoc.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdsourceDescription@"
-            value="${emfxsdsourcedoc.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdsourceBuildHome@"
-            value="${emfxsdsourcedoc.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdsource.mirror.prefixuri@"
-            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdFile@"
-            value="${emfxsd.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdName@"
-            value="${emfxsd.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdDescription@"
-            value="${emfxsd.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdURL@"
-            value="${emfxsd.url}/${emfxsd.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsdBuildHome@"
-            value="${emfxsd.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfxsd.mirror.prefixuri@"
-            value="${emfxsd.mirror.prefixuri}"/>
 
+        <writePropertiesAsPHP
+            propFileName="${dependency.properties}"
+            outPHPFileName="${resultDir}/dependency.properties.php"
+            buildlabel="${buildLabel}"/>
+         
 
+        
+        <!--
+        
+        <property file="${dependency.properties}"/>
+        
+        -->
 
         <replace
             dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdsourceURL@"
-            value="${emfandxsdsourcedoc.url}/${emfandxsdsourcedoc.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdsourceFile@"
-            value="${emfandxsdsourcedoc.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdsourceName@"
-            value="${emfandxsdsourcedoc.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdsourceDescription@"
-            value="${emfandxsdsourcedoc.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdsourceBuildHome@"
-            value="${emfandxsdsourcedoc.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdsource.mirror.prefixuri@"
-            value="${emfandxsdsourcedoc.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdFile@"
-            value="${emfandxsd.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdRepo@"
-            value="${emfandxsd.repo}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdName@"
-            value="${emfandxsd.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdDescription@"
-            value="${emfandxsd.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdURL@"
-            value="${emfandxsd.url}/${emfandxsd.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsdBuildHome@"
-            value="${emfandxsd.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfandxsd.mirror.prefixuri@"
-            value="${emfandxsd.mirror.prefixuri}"/>
+            includes="**/buildvariables.php"
+            value=""
+            propertyFile="${dependency.properties}">      
 
+        <!-- general build info -->
 
+            <replacefilter
+                token="@buildtype@"
+                value="${buildType}"/>
 
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationFile@"
-            value="${emfvalidation.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationURL@"
-            value="${emfvalidation.url}/${emfvalidation.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationBuildHome@"
-            value="${emfvalidation.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidation.mirror.prefixuri@"
-            value="${emfvalidation.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationName@"
-            value="${emfvalidation.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationDescription@"
-            value="${emfvalidation.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationsourceFile@"
-            value="${emfvalidationsourcedoc.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationsourceURL@"
-            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationsourceBuildHome@"
-            value="${emfvalidationsourcedoc.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationsource.mirror.prefixuri@"
-            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationsourceName@"
-            value="${emfvalidationsourcedoc.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@emfvalidationsourceDescription@"
-            value="${emfvalidationsourcedoc.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wstName@"
-            value="${wst.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wstDescription@"
-            value="${wst.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wstFile@"
-            value="${wst.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jstName@"
-            value="${jst.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jstDescription@"
-            value="${jst.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jstFile@"
-            value="${jst.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jstURL@"
-            value="${jst.url}/${jst.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jstBuildHome@"
-            value="${jst.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jst.mirror.prefixuri@"
-            value="${jst.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtpName@"
-            value="${wtp.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtpDescription@"
-            value="${wtp.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtpRepo@"
-            value="${wtp.repo}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
+            <replacefilter
+                token="@date@"
+                value="${TODAY}"/>
 
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtptestsName@"
-            value="${wtptests.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtptestsDescription@"
-            value="${wtptests.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtptestsFile@"
-            value="${wtptests.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtptestsURL@"
-            value="${wtptests.url}/${wtptests.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtptestsBuildHome@"
-            value="${wtptests.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@wtptests.mirror.prefixuri@"
-            value="${wtptests.mirror.prefixuri}"/>
+            <replacefilter
+                token="@build@"
+                value="${buildLabel}"/>
 
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@gefFile@"
-            value="${gef.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@gefRepo@"
-            value="${gef.repo}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@gefBuildHome@"
-            value="${gef.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@gefName@"
-            value="${gef.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@gefDescription@"
-            value="${gef.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipserelengFile@"
-            value="${eclipsereleng.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
+            <replacefilter
+                token="@buildBranch@"
+                value="${buildBranch}"/>
 
+            <replacefilter
+                token="@build_distribution@"
+                value="${build.distribution}"/>
+
+        </replace>
 
-        <!-- no longer used. Post 1.5.5 -->
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jemFile@"
-            value="${jem.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jemBuildHome@"
-            value="${jem.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dtpFile@"
-            value="${dtp.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dtpRepo@"
-            value="${dtp.repo}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dtpBuildHome@"
-            value="${dtp.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dtpName@"
-            value="${dtp.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dtpDescription@"
-            value="${dtp.description}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dltkFile@"
-            value="${dltk.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dltkURL@"
-            value="${dltk.url}/${dltk.file}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dltkBuildHome@"
-            value="${dltk.build.home}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dltk.mirror.prefixuri@"
-            value="${dltk.mirror.prefixuri}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dltkName@"
-            value="${dltk.name}"/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
-            token="@dltkDescription@"
-            value="${dltk.description}"/>
     </target>
 </project>
\ No newline at end of file