diff --git a/archive/org.eclipse.wtp.releng/maps/jst-jsp-tests.map b/archive/org.eclipse.wtp.releng/maps/jst-jsp-tests.map
index 6bcf3038bc8f72ba341fa8198acc4b8f7ed7234c..2d7a7d983e36bf4cf6f453c05d9f5d2aecfe8370 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-jsp-tests.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-jsp-tests.map
@@ -1,5 +1,5 @@
-plugin@org.eclipse.jst.jsp.core.tests=v20050413_0201,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.core.tests
-plugin@org.eclipse.jst.jsp.ui.tests=v20050414_1015,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests
+plugin@org.eclipse.jst.jsp.core.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.core.tests
+plugin@org.eclipse.jst.jsp.ui.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests
 plugin@org.eclipse.jst.jsp.tests.encoding=v20050405_0240,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.tests.encoding
 
-plugin@org.eclipse.jst.jsp.ui.tests.performance=v20050413_0201,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests.performance
\ No newline at end of file
+plugin@org.eclipse.jst.jsp.ui.tests.performance=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests.performance
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/maps/jst-jsp.map b/archive/org.eclipse.wtp.releng/maps/jst-jsp.map
index d64adaa370773e7670c34042bfcc528477216e00..0760509d6a3ffeec60b9f9f75a73455b98aac204 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-jsp.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-jsp.map
@@ -1,6 +1,6 @@
 !*************** jst-jsp.map
 
-plugin@org.eclipse.jst.jsp.core=v20050418_0115,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.core
-plugin@org.eclipse.jst.jsp.ui=v20050415_2000,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.ui
+plugin@org.eclipse.jst.jsp.core=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.core
+plugin@org.eclipse.jst.jsp.ui=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.ui
 
 !***************
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-common.map b/archive/org.eclipse.wtp.releng/maps/wst-common.map
index d567c785f17d656763a9f91eb5c3e2882ca5daf9..5083c603e1cca00abf128d75e2d7a877f1359c3a 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-common.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-common.map
@@ -23,6 +23,6 @@ plugin@org.eclipse.wst.command.env.core=v20050417_0920,:pserver:anonymous@dev.ec
 plugin@org.eclipse.wst.command.env=v20050417_0920,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env
 plugin@org.eclipse.wst.command.env.ui=v20050417_0920,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.ui
 
-plugin@org.eclipse.wst.common.snippets=v20050415_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.snippets
+plugin@org.eclipse.wst.common.snippets=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.snippets
 
 !****
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-webresources-tests.map b/archive/org.eclipse.wtp.releng/maps/wst-webresources-tests.map
index e3b5ecc4f2e2cd70e752c9d65eaa42b48cb969fc..0b7f9efd415bd3c6783687310051814f853989f2 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-webresources-tests.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-webresources-tests.map
@@ -1,9 +1,9 @@
 
-plugin@org.eclipse.wst.css.core.tests=v20050417_1830,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/css/tests/org.eclipse.wst.css.core.tests
+plugin@org.eclipse.wst.css.core.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/css/tests/org.eclipse.wst.css.core.tests
 plugin@org.eclipse.wst.css.tests.encoding=v20050411_1745,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/css/tests/org.eclipse.wst.css.tests.encoding
 plugin@org.eclipse.wst.css.ui.tests.performance=v20050405_0240,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/css/tests/org.eclipse.wst.css.ui.tests.performance
 
-plugin@org.eclipse.wst.html.core.tests=v20050414_1015,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/tests/org.eclipse.wst.html.core.tests
-plugin@org.eclipse.wst.html.ui.tests=v20050413_1845,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/tests/org.eclipse.wst.html.ui.tests
+plugin@org.eclipse.wst.html.core.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/tests/org.eclipse.wst.html.core.tests
+plugin@org.eclipse.wst.html.ui.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/tests/org.eclipse.wst.html.ui.tests
 plugin@org.eclipse.wst.html.tests.encoding=v20050405_0240,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/tests/org.eclipse.wst.html.tests.encoding
 plugin@org.eclipse.wst.html.ui.tests.performance=v20050405_0240,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/tests/org.eclipse.wst.html.ui.tests.performance
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-webresources.map b/archive/org.eclipse.wtp.releng/maps/wst-webresources.map
index cdc7f2dc87389d052a97a93ed4ae187d129d91dd..6b851f41f93eb5cb120dabb22b24a4e1a44ef709 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-webresources.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-webresources.map
@@ -1,10 +1,10 @@
 !*************** wst-webresources.map
 
-plugin@org.eclipse.wst.css.core=v20050418_0115,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/css/plugins/org.eclipse.wst.css.core
-plugin@org.eclipse.wst.css.ui=v20050413_2100,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/css/plugins/org.eclipse.wst.css.ui
-plugin@org.eclipse.wst.html.core=v20050418_0115,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/plugins/org.eclipse.wst.html.core
-plugin@org.eclipse.wst.html.ui=v20050415_2000,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/plugins/org.eclipse.wst.html.ui
+plugin@org.eclipse.wst.css.core=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/css/plugins/org.eclipse.wst.css.core
+plugin@org.eclipse.wst.css.ui=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/css/plugins/org.eclipse.wst.css.ui
+plugin@org.eclipse.wst.html.core=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/plugins/org.eclipse.wst.html.core
+plugin@org.eclipse.wst.html.ui=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/html/plugins/org.eclipse.wst.html.ui
 plugin@org.eclipse.wst.javascript.core=v20050418_0115,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/javascript/plugins/org.eclipse.wst.javascript.core
-plugin@org.eclipse.wst.javascript.ui=v20050413_2100,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/javascript/plugins/org.eclipse.wst.javascript.ui
+plugin@org.eclipse.wst.javascript.ui=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/javascript/plugins/org.eclipse.wst.javascript.ui
 
 !***************
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-xml-tests.map b/archive/org.eclipse.wtp.releng/maps/wst-xml-tests.map
index 1692bf01c4c1406acbc18432eedc93bb1dd85cf5..4bbe3fc23220ab2f8cad52232c8e7a5e4e096f14 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-xml-tests.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-xml-tests.map
@@ -1,13 +1,13 @@
-plugin@org.eclipse.wst.sse.core.tests=v20050413_0201,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.core.tests
-plugin@org.eclipse.wst.sse.ui.tests=v20050413_1845,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.ui.tests
+plugin@org.eclipse.wst.sse.core.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.core.tests
+plugin@org.eclipse.wst.sse.ui.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.ui.tests
 plugin@org.eclipse.wst.sse.ui.tests.performance=v20050405_0240,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.ui.tests.performance
 
-plugin@org.eclipse.wst.xml.core.tests=v20050413_0201,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.core.tests
-plugin@org.eclipse.wst.xml.ui.tests=v20050413_1845,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.ui.tests
+plugin@org.eclipse.wst.xml.core.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.core.tests
+plugin@org.eclipse.wst.xml.ui.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.ui.tests
 plugin@org.eclipse.wst.xml.tests.encoding=v20050405_0240,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.tests.encoding
-plugin@org.eclipse.wst.xml.ui.tests.performance=v20050405_2147,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.ui.tests.performance
+plugin@org.eclipse.wst.xml.ui.tests.performance=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.ui.tests.performance
 plugin@org.eclipse.wst.xml.validation.tests=v20050417_1950,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.validation.tests
 
-plugin@org.eclipse.wst.dtd.ui.tests=v20050413_1845,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/dtd/tests/org.eclipse.wst.dtd.ui.tests
+plugin@org.eclipse.wst.dtd.ui.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/dtd/tests/org.eclipse.wst.dtd.ui.tests
 
 plugin@org.eclipse.wst.xsd.validation.tests=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xsd/tests/org.eclipse.wst.xsd.validation.tests
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-xml.map b/archive/org.eclipse.wtp.releng/maps/wst-xml.map
index fe48ce361972da2941b3d938e2bd3a1985acdd7d..abfa2c9a06daed7ea6722ccfc5fc01992261020f 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-xml.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-xml.map
@@ -1,17 +1,17 @@
 !*************** wst-xml.map
 
-plugin@org.eclipse.wst.dtd.core=v20050418_0115,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.core
-plugin@org.eclipse.wst.dtd.ui=v20050413_2100,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.ui
-plugin@org.eclipse.wst.dtd.validation=v20050413_1845,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.validation
+plugin@org.eclipse.wst.dtd.core=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.core
+plugin@org.eclipse.wst.dtd.ui=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.ui
+plugin@org.eclipse.wst.dtd.validation=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.validation
 
-plugin@org.eclipse.wst.sse.core=v20050417_1830,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.core
-plugin@org.eclipse.wst.sse.ui=v20050415_2000,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.ui
+plugin@org.eclipse.wst.sse.core=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.core
+plugin@org.eclipse.wst.sse.ui=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.ui
 
-plugin@org.eclipse.wst.xml.core=v20050418_0115,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.core
-plugin@org.eclipse.wst.xml.ui=v20050417_1830,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.ui
+plugin@org.eclipse.wst.xml.core=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.core
+plugin@org.eclipse.wst.xml.ui=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.ui
 plugin@org.eclipse.wst.xml.uriresolver=v20050405_2147,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.uriresolver
-plugin@org.eclipse.wst.xml.uriresolver.ui=v20050405_0240,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.uriresolver.ui
-plugin@org.eclipse.wst.xml.validation=v20050417_1950,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.validation
+plugin@org.eclipse.wst.xml.uriresolver.ui=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.uriresolver.ui
+plugin@org.eclipse.wst.xml.validation=v20050418_1245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.validation
 plugin@org.apache.xerces=v20050413_1608,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/thirdparty/org.apache.xerces
 
 plugin@org.eclipse.wst.xsd.ui=v20050413_1845,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xsd/plugins/org.eclipse.wst.xsd.ui