diff --git a/archive/org.eclipse.wtp.releng/maps/jst-common.map b/archive/org.eclipse.wtp.releng/maps/jst-common.map
index 4f379f8579cad131771c93d646c1837638f4d7a3..fd8364533483c0f77a081fcaae2eade46027ef1f 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-common.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-common.map
@@ -1,6 +1,6 @@
 !*************** jst-common.map
 
-plugin@org.eclipse.jst.common.annotations.controller=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.controller
+plugin@org.eclipse.jst.common.annotations.controller=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.controller
 plugin@org.eclipse.jst.common.annotations.core=v20050316,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.core
 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
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 7ecc8a5460dcfa0150311cbde2e8ddc5e8b29a8a..301ce6bfff407a8418c51d18e971ceb94677b57c 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-j2ee-advanced.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-j2ee-advanced.map
@@ -1,16 +1,16 @@
 !*************** jst-j2ee-advanced.map
 
-plugin@org.eclipse.jst.j2ee.ejb=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
-plugin@org.eclipse.jst.ejb.ui=v20050425,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
-plugin@org.eclipse.jst.j2ee.jca=v20050426,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
-plugin@org.eclipse.jst.j2ee.webservice=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
+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.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=v20050419a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca.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.ejb.annotation.model=v20050512,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotation.model
+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
-plugin@org.eclipse.jst.j2ee.ejb.annotations.ui=v20050512,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui
-plugin@org.eclipse.jst.j2ee.ejb.annotations.xdoclet=v20050512,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet
+plugin@org.eclipse.jst.j2ee.ejb.annotations.ui=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui
+plugin@org.eclipse.jst.j2ee.ejb.annotations.xdoclet=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet
 
 
 !***************
\ No newline at end of file
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 623f4db28db416ec9168a7003267b156f820c37d..1c232f346ca07e2ba9da6f8674d3fdaaad08bd61 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,5 +1,5 @@
 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.tests=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.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
 plugin@org.eclipse.jst.validation.test=v20050418,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.test
\ No newline at end of file
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 e1567de69a25aaf4a6732b3e22446624c7212084..b931649c1b66cd90b345f21efb18e0df769ea17c 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=v20050425,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
-plugin@org.eclipse.jst.j2ee.ui=v20050425,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
+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=v20050511,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
+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.core=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v20050511,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
-plugin@org.eclipse.jst.servlet.ui=v20050419a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
+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
 
 !***************
\ 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 212a0b8ebb0c62c57ce5a0e1450ec1d36516288c..6beef97d82d32a5a69d46668c2afe7a8fc22a5d4 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=v20050428,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
+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.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 352365ca5f8c422da8c7c7d24dd63e0d7cef25ad..ae941b360f34597f5a3edef1f93fc3d02f08c887 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-common.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-common.map
@@ -6,18 +6,18 @@ plugin@org.eclipse.wst.common.uriresolver=v20050513_0130,:pserver:anonymous@dev.
 
 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=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
-plugin@org.eclipse.wst.common.frameworks.ui=v20050419a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks.ui
+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.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.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=v20050426,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.navigator.views
+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=v20050511,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
+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.dependencychecker=v20050414_1113,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.dependencychecker
 
-plugin@org.eclipse.wst.validation.ui=v20050418b,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation.ui
-plugin@org.eclipse.wst.validation=v20050420,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation
+plugin@org.eclipse.wst.validation.ui=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation.ui
+plugin@org.eclipse.wst.validation=v20050516,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation
 
 plugin@org.eclipse.wst.command.env.core=v20050425_2245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.core
 plugin@org.eclipse.wst.command.env=v20050425_2245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env