diff --git a/archive/org.eclipse.wtp.releng/maps/jst-common.map b/archive/org.eclipse.wtp.releng/maps/jst-common.map
index 6251776d019f9d7b50db3852f36d9e021f45387c..4f379f8579cad131771c93d646c1837638f4d7a3 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-common.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-common.map
@@ -1,8 +1,8 @@
 !*************** jst-common.map
 
-plugin@org.eclipse.jst.common.annotations.controller=v20050411a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.controller
+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.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=v20050405,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.ui
+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
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 08a253d9d26bc103e4bf5120945f37617479bb40..fb4c7a434b3cb696db0619a90497b5ce0e4b9d40 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-j2ee-advanced.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-j2ee-advanced.map
@@ -1,9 +1,9 @@
 !*************** jst-j2ee-advanced.map
 
-plugin@org.eclipse.jst.j2ee.ejb=v20050429,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
+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=v20050426,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
+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.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
 
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 1bcf5a204d1f46daf3a9b9f2eb152c66c96eb040..623f4db28db416ec9168a7003267b156f820c37d 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=v20050425,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.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.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 f3594e8bd2243c8c3ba8e1780f4b568d8b931414..bc3e531761973ae18d6426fa44171033c8ed0159 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-j2ee-basic.map
@@ -3,9 +3,9 @@
 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=v20050429,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
-plugin@org.eclipse.jst.j2ee.core=v20050418a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v20050429,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.j2ee=v20050509,: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=v20050509,: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
 
 !***************
\ 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 0d52811e2e993fbcc7053780c50aeb84f0a7ea44..7e42d5e16a27cff7ef67872d743a124726121a04 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=v20050209,:pserver:anonymous@dev.eclipse.org:/h
 plugin@org.eclipse.wst.common.uriresolver=v20050420_0145,: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=v20050428a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
-plugin@org.eclipse.wst.common.frameworks=v20050427a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
+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.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.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=v20050429,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
+plugin@org.eclipse.wst.common.modulecore=v20050509,: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
 
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-server.map b/archive/org.eclipse.wtp.releng/maps/wst-server.map
index d72e00e6ab2806f49c2cbefc4e736288f1245c2b..bd72905a0459c3de60a2f4b3cdeae62f9bca4502 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-server.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-server.map
@@ -5,7 +5,7 @@ plugin@org.eclipse.wst.internet.monitor.ui=v20050424,:pserver:anonymous@dev.ecli
 plugin@org.eclipse.wst.internet.webbrowser=v20050420,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.webbrowser
 
 plugin@org.eclipse.wst.server.core=v20050429,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/plugins/org.eclipse.wst.server.core
-plugin@org.eclipse.wst.server.ui=v20050429,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/plugins/org.eclipse.wst.server.ui
+plugin@org.eclipse.wst.server.ui=v20050509,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/plugins/org.eclipse.wst.server.ui
 plugin@org.eclipse.wst.server.util=v20050424,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/plugins/org.eclipse.wst.server.util
 
 plugin@org.eclipse.wst.internet.proxy=v20050412_2245,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.proxy