diff --git a/archive/org.eclipse.wtp.releng/maps/jst-common.map b/archive/org.eclipse.wtp.releng/maps/jst-common.map
index 1a428c9c2fadb3cfca4af745f26b306bdae420cd..5018c9f066b587e6effe845e0a1b7f5e9af152e1 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-common.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-common.map
@@ -5,8 +5,8 @@ plugin@org.eclipse.jst.common.annotations.core=v20050316,:pserver:anonymous@dev.
 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.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=v20050421a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.navigator.java
+plugin@org.eclipse.jst.common.navigator.java=v20050425,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.navigator.java
 
-plugin@org.eclipse.jst.common.launcher.ant=v20050412,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/common/plugins/org.eclipse.jst.common.launcher.ant
+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
 
 !***************
\ No newline at end of file
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 36e2e663dd60e574438ae65878eb7799e590f537..271ab94186ca191595cd44a73c3a0ba9e13d6414 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=v20050421a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
-plugin@org.eclipse.jst.ejb.ui=v20050419a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
-plugin@org.eclipse.jst.j2ee.jca=v20050418,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
-plugin@org.eclipse.jst.j2ee.webservice=v20050421a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
+plugin@org.eclipse.jst.j2ee.ejb=v20050425,: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=v20050425,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
+plugin@org.eclipse.jst.j2ee.webservice=v20050425,: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 ef7d9162b7516ed526ccef9acb10bc9203996250..1bcf5a204d1f46daf3a9b9f2eb152c66c96eb040 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=v20050419,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.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.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 45fce29f5d64cf6b40f117f146303abd42d3e43d..19095090b55fc7c37b37f4eb72d666109636f515 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=v20050420,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
-plugin@org.eclipse.jst.j2ee.ui=v20050421_1126,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
+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=v20050421a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
+plugin@org.eclipse.jst.j2ee=v20050425,: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=v20050421,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.j2ee.web=v20050425,: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-tests.map b/archive/org.eclipse.wtp.releng/maps/wst-common-tests.map
index a894f5859e9cdcc8a702802d511f34923880835a..d85609f1c7ab8cfb30573174da3e54d05daf9a6c 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=v20050420,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
+plugin@org.eclipse.wst.common.tests=v20050425,: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 97fd9435284868bbde9a3797d6cd23bd80911899..0bfbd9a1138f7d1663ac230e4c34f7c3066b97d0 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-common.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-common.map
@@ -6,13 +6,13 @@ plugin@org.eclipse.wst.common.uriresolver=v20050420_0145,:pserver:anonymous@dev.
 
 plugin@org.eclipse.wst.common.emf=v20050328,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
 plugin@org.eclipse.wst.common.emfworkbench.integration=v20050421a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
-plugin@org.eclipse.wst.common.frameworks=v20050420,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
+plugin@org.eclipse.wst.common.frameworks=v20050425,: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=v20050420,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.migration
+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=v20050419,: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=v20050421a,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
+plugin@org.eclipse.wst.common.modulecore=v20050425,: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