diff --git a/archive/org.eclipse.wtp.releng/maps/jst-common.map b/archive/org.eclipse.wtp.releng/maps/jst-common.map
index fd8364533483c0f77a081fcaae2eade46027ef1f..faf33d78f50a0b634fbca3a7fdd7ab186091a475 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-common.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-common.map
@@ -5,7 +5,7 @@ plugin@org.eclipse.jst.common.annotations.core=v20050316,:pserver:anonymous@dev.
 plugin@org.eclipse.jst.common.annotations.ui=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.ui
 plugin@org.eclipse.jst.common.frameworks=v20050419a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.frameworks
 plugin@org.eclipse.jst.common.frameworks.ui=v20050405,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.frameworks.ui
-plugin@org.eclipse.jst.common.navigator.java=v20050426,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.navigator.java
+plugin@org.eclipse.jst.common.navigator.java=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.navigator.java
 
 plugin@org.eclipse.jst.common.launcher.ant=v20050425,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.launcher.ant
 
diff --git a/archive/org.eclipse.wtp.releng/maps/jst-j2ee-advanced.map b/archive/org.eclipse.wtp.releng/maps/jst-j2ee-advanced.map
index 301ce6bfff407a8418c51d18e971ceb94677b57c..8384383149bbaffdfa52a451cb2e50f2a4b75853 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-j2ee-advanced.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-j2ee-advanced.map
@@ -1,11 +1,11 @@
 !*************** jst-j2ee-advanced.map
 
-plugin@org.eclipse.jst.j2ee.ejb=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
-plugin@org.eclipse.jst.ejb.ui=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
-plugin@org.eclipse.jst.j2ee.jca=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
+plugin@org.eclipse.jst.j2ee.ejb=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
+plugin@org.eclipse.jst.ejb.ui=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
+plugin@org.eclipse.jst.j2ee.jca=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
 plugin@org.eclipse.jst.j2ee.webservice=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
-plugin@org.eclipse.jst.j2ee.webservices.ui=v20050415,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice.ui
-plugin@org.eclipse.jst.j2ee.jca.ui=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca.ui
+plugin@org.eclipse.jst.j2ee.webservices.ui=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice.ui
+plugin@org.eclipse.jst.j2ee.jca.ui=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca.ui
 
 plugin@org.eclipse.jst.j2ee.ejb.annotation.model=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotation.model
 plugin@org.eclipse.jst.j2ee.ejb.annotations.emitter=v20050512,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter
diff --git a/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic-tests.map b/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic-tests.map
index 1c232f346ca07e2ba9da6f8674d3fdaaad08bd61..d1e0101ba18ad9b13f6e6a55605d4787a2375414 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic-tests.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic-tests.map
@@ -1,4 +1,4 @@
-plugin@org.eclipse.jst.j2ee.core.tests=v20050328,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests
+plugin@org.eclipse.jst.j2ee.core.tests=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests
 plugin@org.eclipse.jst.j2ee.tests=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
 plugin@org.eclipse.jst.servlet.tests=v20050417,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
 plugin@org.eclipse.jst.validation.sample=v20050418b,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.sample
diff --git a/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic.map b/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic.map
index b931649c1b66cd90b345f21efb18e0df769ea17c..82a8d38a91d50a34db149a0578519e84df1d41df 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic.map
@@ -1,11 +1,11 @@
 !*************** jst-j2ee-basic.map
 
-plugin@org.eclipse.jst.j2ee.navigator.ui=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
-plugin@org.eclipse.jst.j2ee.ui=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
+plugin@org.eclipse.jst.j2ee.navigator.ui=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
+plugin@org.eclipse.jst.j2ee.ui=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
 
-plugin@org.eclipse.jst.j2ee=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
+plugin@org.eclipse.jst.j2ee=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
 plugin@org.eclipse.jst.j2ee.core=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
-plugin@org.eclipse.jst.servlet.ui=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
+plugin@org.eclipse.jst.j2ee.web=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.servlet.ui=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
 
 !***************
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-common-tests.map b/archive/org.eclipse.wtp.releng/maps/wst-common-tests.map
index 6beef97d82d32a5a69d46668c2afe7a8fc22a5d4..b90b683172d417e28dc6c1fa32a105ce69fea170 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-common-tests.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-common-tests.map
@@ -1,5 +1,5 @@
 
-plugin@org.eclipse.wst.common.tests=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
+plugin@org.eclipse.wst.common.tests=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
 plugin@org.eclipse.wst.common.tests.collector=v20050405,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.collector
 plugin@org.eclipse.wst.common.tests.ui=v20050420,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.ui
 
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-common.map b/archive/org.eclipse.wtp.releng/maps/wst-common.map
index 27018e3ba501e9afc71e6550afe14b7d90010326..f4b22d20559bede883b4f2dd8b1a807868cb43e1 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-common.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-common.map
@@ -5,14 +5,14 @@ plugin@org.eclipse.wst.common.ui=v20050511_1809,:pserver:anonymous@dev.eclipse.o
 plugin@org.eclipse.wst.common.uriresolver=v20050513_0130,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.uriresolver
 
 plugin@org.eclipse.wst.common.emf=v20050427a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
-plugin@org.eclipse.wst.common.emfworkbench.integration=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
-plugin@org.eclipse.wst.common.frameworks=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
+plugin@org.eclipse.wst.common.emfworkbench.integration=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
+plugin@org.eclipse.wst.common.frameworks=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
 plugin@org.eclipse.wst.common.frameworks.ui=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks.ui
-plugin@org.eclipse.wst.common.migration=v20050425,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.migration
+plugin@org.eclipse.wst.common.migration=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.migration
 plugin@org.eclipse.wst.common.migration.ui=v20050323,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.migration.ui
 plugin@org.eclipse.wst.common.navigator.views=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.navigator.views
-plugin@org.eclipse.wst.common.navigator.workbench=v20050415,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.navigator.workbench
-plugin@org.eclipse.wst.common.modulecore=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
+plugin@org.eclipse.wst.common.navigator.workbench=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.navigator.workbench
+plugin@org.eclipse.wst.common.modulecore=v20050518,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
 
 plugin@org.eclipse.wst.common.dependencychecker=v20050414_1113,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.dependencychecker