294564 refactoring needed to have truly independent JSDT build
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
index 60e41cb..9a1711f 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
@@ -534,6 +534,57 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceURL@"
+           value="${emfsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceFile@"
+           value="${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceName@"
+           value="${emfsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceDescription@"
+           value="${emfsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceBuildHome@"
+           value="${emfsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsource.mirror.prefixuri@"
+           value="${emfsource.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceURL@"
+           value="${emfxsdsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceFile@"
+           value="${emfxsdsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceName@"
+           value="${emfxsdsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceDescription@"
+           value="${emfxsdsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceBuildHome@"
+           value="${emfxsdsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsource.mirror.prefixuri@"
+           value="${emfxsdsource.mirror.prefixuri}"/>
+           	
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -606,6 +657,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstName@"
+           value="${wst.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstDescription@"
+           value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -622,6 +681,15 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
+    	
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstName@"
+    	           value="${jst.name}"/>
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstDescription@"
+    	           value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -638,6 +706,15 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
+            	
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpName@"
+                  value="${wtp.name}"/>
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpDescription@"
+                  value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
diff --git a/releng.wtpbuilder/buildtemplates/jaxws.properties b/releng.wtpbuilder/buildtemplates/jaxws.properties
index dd98788..c321182 100644
--- a/releng.wtpbuilder/buildtemplates/jaxws.properties
+++ b/releng.wtpbuilder/buildtemplates/jaxws.properties
@@ -24,7 +24,12 @@
 
 #  prereq is the basic prereq on top of platform, jdt, emf, gef
 #  (only realistic options for right now are wst, jst). 
-basicprereq=wtp
+prereq.eclipse=true
+prereq.emf=true
+prereq.emfxsd=true
+prereq.emfvalidation=true
+prereq.gef=true
+prereq.wtp=true
 
 # These next properties are mainly for distribution template files
 
diff --git a/releng.wtpbuilder/components/jaxws/dependency.xml b/releng.wtpbuilder/components/jaxws/dependency.xml
index 3aa2d0b..352febe 100644
--- a/releng.wtpbuilder/components/jaxws/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws/dependency.xml
@@ -23,7 +23,7 @@
     <condition
         property="getprereq.eclipse">
         <istrue
-            value="false"/>
+            value="true"/>
     </condition>
     <condition
         property="getprereq.eclipseplatform">
@@ -33,22 +33,22 @@
     <condition
         property="getprereq.emf">
         <istrue
-            value="false"/>
+            value="true"/>
     </condition>
     <condition
         property="getprereq.emfxsd">
         <istrue
-            value="false"/>
+            value="true"/>
     </condition>
     <condition
         property="getprereq.emfvalidation">
         <istrue
-            value="false"/>
+            value="true"/>
     </condition>
     <condition
         property="getprereq.gef">
         <istrue
-            value="false"/>
+            value="true"/>
     </condition>
     <condition
         property="getprereq.dtp">
@@ -68,7 +68,7 @@
     <condition
         property="getprereq.wtp">
         <istrue
-            value="false"/>
+            value="true"/>
     </condition>
     <target
         name="get">
diff --git a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
index 2023e34..fc244c0 100644
--- a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
@@ -23,7 +23,7 @@
 	    <condition
 	        property="getprereq.eclipse">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.eclipseplatform">
@@ -33,22 +33,22 @@
 	    <condition
 	        property="getprereq.emf">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.emfxsd">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.emfvalidation">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.gef">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.dtp">
@@ -68,7 +68,7 @@
 	    <condition
 	        property="getprereq.wtp">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	            	
     <target
diff --git a/releng.wtpbuilder/components/jaxws_tests/dependency.xml b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
index b4a2703..1e02cb5 100644
--- a/releng.wtpbuilder/components/jaxws_tests/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
@@ -23,7 +23,7 @@
 	    <condition
 	        property="getprereq.eclipse">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.eclipseplatform">
@@ -33,22 +33,22 @@
 	    <condition
 	        property="getprereq.emf">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.emfxsd">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.emfvalidation">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.gef">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.dtp">
@@ -68,7 +68,7 @@
 	    <condition
 	        property="getprereq.wtp">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
     <target
         name="get">
diff --git a/releng.wtpbuilder/distribution/jaxws.site/publish.xml b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
index 60e41cb..9a1711f 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
@@ -534,6 +534,57 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceURL@"
+           value="${emfsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceFile@"
+           value="${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceName@"
+           value="${emfsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceDescription@"
+           value="${emfsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceBuildHome@"
+           value="${emfsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsource.mirror.prefixuri@"
+           value="${emfsource.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceURL@"
+           value="${emfxsdsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceFile@"
+           value="${emfxsdsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceName@"
+           value="${emfxsdsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceDescription@"
+           value="${emfxsdsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceBuildHome@"
+           value="${emfxsdsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsource.mirror.prefixuri@"
+           value="${emfxsdsource.mirror.prefixuri}"/>
+           	
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -606,6 +657,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstName@"
+           value="${wst.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstDescription@"
+           value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -622,6 +681,15 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
+    	
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstName@"
+    	           value="${jst.name}"/>
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstDescription@"
+    	           value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -638,6 +706,15 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
+            	
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpName@"
+                  value="${wtp.name}"/>
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpDescription@"
+                  value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
index decc598..0ef05a3 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
@@ -127,16 +127,16 @@
 $orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
 
 
-$prereq_eclipse="false";
+$prereq_eclipse="true";
 $prereq_eclipseplatform="false";
-$prereq_emf="false";
-$prereq_emfxsd="false";
-$prereq_emfvalidation="false";
-$prereq_gef="false";
+$prereq_emf="true";
+$prereq_emfxsd="true";
+$prereq_emfvalidation="true";
+$prereq_gef="true";
 $prereq_dtp="false";
 $prereq_wst="false";
 $prereq_jst="false";
-$prereq_wtp="false";
+$prereq_wtp="true";
 
 
 include("miscUtil.php");
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
index d6bb7df..9069630 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
@@ -23,7 +23,7 @@
 	    <condition
 	        property="getprereq.eclipse">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.eclipseplatform">
@@ -33,22 +33,22 @@
 	    <condition
 	        property="getprereq.emf">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.emfxsd">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.emfvalidation">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.gef">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
 	    <condition
 	        property="getprereq.dtp">
@@ -68,7 +68,7 @@
 	    <condition
 	        property="getprereq.wtp">
 	        <istrue
-	            value="false"/>
+	            value="true"/>
 	    </condition>
     <target
         name="get">
diff --git a/releng.wtpbuilder/distribution/jsdt.site/publish.xml b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
index 60e41cb..9a1711f 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
@@ -534,6 +534,57 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceURL@"
+           value="${emfsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceFile@"
+           value="${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceName@"
+           value="${emfsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceDescription@"
+           value="${emfsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceBuildHome@"
+           value="${emfsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsource.mirror.prefixuri@"
+           value="${emfsource.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceURL@"
+           value="${emfxsdsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceFile@"
+           value="${emfxsdsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceName@"
+           value="${emfxsdsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceDescription@"
+           value="${emfxsdsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceBuildHome@"
+           value="${emfxsdsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsource.mirror.prefixuri@"
+           value="${emfxsdsource.mirror.prefixuri}"/>
+           	
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -606,6 +657,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstName@"
+           value="${wst.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstDescription@"
+           value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -622,6 +681,15 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
+    	
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstName@"
+    	           value="${jst.name}"/>
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstDescription@"
+    	           value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -638,6 +706,15 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
+            	
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpName@"
+                  value="${wtp.name}"/>
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpDescription@"
+                  value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
diff --git a/releng.wtpbuilder/distribution/pave.site/publish.xml b/releng.wtpbuilder/distribution/pave.site/publish.xml
index 60e41cb..9a1711f 100644
--- a/releng.wtpbuilder/distribution/pave.site/publish.xml
+++ b/releng.wtpbuilder/distribution/pave.site/publish.xml
@@ -534,6 +534,57 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceURL@"
+           value="${emfsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceFile@"
+           value="${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceName@"
+           value="${emfsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceDescription@"
+           value="${emfsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceBuildHome@"
+           value="${emfsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsource.mirror.prefixuri@"
+           value="${emfsource.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceURL@"
+           value="${emfxsdsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceFile@"
+           value="${emfxsdsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceName@"
+           value="${emfxsdsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceDescription@"
+           value="${emfxsdsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceBuildHome@"
+           value="${emfxsdsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsource.mirror.prefixuri@"
+           value="${emfxsdsource.mirror.prefixuri}"/>
+           	
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -606,6 +657,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstName@"
+           value="${wst.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstDescription@"
+           value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -622,6 +681,15 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
+    	
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstName@"
+    	           value="${jst.name}"/>
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstDescription@"
+    	           value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -638,6 +706,15 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
+            	
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpName@"
+                  value="${wtp.name}"/>
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpDescription@"
+                  value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
diff --git a/releng.wtpbuilder/distribution/vex.site/publish.xml b/releng.wtpbuilder/distribution/vex.site/publish.xml
index 60e41cb..9a1711f 100644
--- a/releng.wtpbuilder/distribution/vex.site/publish.xml
+++ b/releng.wtpbuilder/distribution/vex.site/publish.xml
@@ -534,6 +534,57 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceURL@"
+           value="${emfsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceFile@"
+           value="${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceName@"
+           value="${emfsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceDescription@"
+           value="${emfsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceBuildHome@"
+           value="${emfsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsource.mirror.prefixuri@"
+           value="${emfsource.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceURL@"
+           value="${emfxsdsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceFile@"
+           value="${emfxsdsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceName@"
+           value="${emfxsdsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceDescription@"
+           value="${emfxsdsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceBuildHome@"
+           value="${emfxsdsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsource.mirror.prefixuri@"
+           value="${emfxsdsource.mirror.prefixuri}"/>
+           	
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -606,6 +657,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstName@"
+           value="${wst.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstDescription@"
+           value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -622,6 +681,15 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
+    	
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstName@"
+    	           value="${jst.name}"/>
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstDescription@"
+    	           value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -638,6 +706,15 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
+            	
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpName@"
+                  value="${wtp.name}"/>
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpDescription@"
+                  value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
index 60e41cb..9a1711f 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
@@ -534,6 +534,57 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceURL@"
+           value="${emfsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceFile@"
+           value="${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceName@"
+           value="${emfsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceDescription@"
+           value="${emfsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsourceBuildHome@"
+           value="${emfsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfsource.mirror.prefixuri@"
+           value="${emfsource.mirror.prefixuri}"/>
+    	
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceURL@"
+           value="${emfxsdsource.url}/${emfsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceFile@"
+           value="${emfxsdsource.file}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceName@"
+           value="${emfxsdsource.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceDescription@"
+           value="${emfxsdsource.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsourceBuildHome@"
+           value="${emfxsdsourceBuildHome}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@emfxsdsource.mirror.prefixuri@"
+           value="${emfxsdsource.mirror.prefixuri}"/>
+           	
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -606,6 +657,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstName@"
+           value="${wst.name}"/>
+       <replace
+           file="${resultingIndex}"
+           token="@wstDescription@"
+           value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -622,6 +681,15 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
+    	
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstName@"
+    	           value="${jst.name}"/>
+    	       <replace
+    	           file="${resultingIndex}"
+    	           token="@jstDescription@"
+    	           value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -638,6 +706,15 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
+            	
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpName@"
+                  value="${wtp.name}"/>
+              <replace
+                  file="${resultingIndex}"
+                  token="@wtpDescription@"
+                  value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"