diff --git a/releng.common/maps/wst-common-core.map b/releng.common/maps/wst-common-core.map
index 65d3b2e..0c7ca5b 100644
--- a/releng.common/maps/wst-common-core.map
+++ b/releng.common/maps/wst-common-core.map
@@ -4,7 +4,7 @@
 plugin@org.eclipse.wst.command.env=v200701101526,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env
 
 plugin@org.eclipse.wst.common.emf=v200612151123,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
-plugin@org.eclipse.wst.common.emfworkbench.integration=v200612151123,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
+plugin@org.eclipse.wst.common.emfworkbench.integration=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
 
 plugin@org.eclipse.wst.common.environment=v200612120248,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.environment
 
diff --git a/releng.ejbtools/maps/jst-enterprise-component-features.map b/releng.ejbtools/maps/jst-enterprise-component-features.map
index c028cf5..5418a5b 100644
--- a/releng.ejbtools/maps/jst-enterprise-component-features.map
+++ b/releng.ejbtools/maps/jst-enterprise-component-features.map
@@ -3,7 +3,7 @@
 feature@org.eclipse.jst.enterprise_core.feature=v200612131833,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_core.feature
 feature@org.eclipse.jst.enterprise_sdk.feature=v200611220050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_sdk.feature
 feature@org.eclipse.jst.enterprise_tests.feature=v200611161515,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_tests.feature
-feature@org.eclipse.jst.enterprise_ui.feature=v200611220050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_ui.feature
+feature@org.eclipse.jst.enterprise_ui.feature=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_ui.feature
 feature@org.eclipse.jst.enterprise_userdoc.feature=v200611161515,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_userdoc.feature
 
 !*************** 
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-j2ee-advanced.map b/releng.jeetools/maps/jst-j2ee-advanced.map
index 1bcdfee..32bf470 100644
--- a/releng.jeetools/maps/jst-j2ee-advanced.map
+++ b/releng.jeetools/maps/jst-j2ee-advanced.map
@@ -1,7 +1,7 @@
 !*************** jst-j2ee-advanced.map
 
 plugin@org.eclipse.jst.j2ee.ejb=v200701301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
-plugin@org.eclipse.jst.ejb.ui=v200611161506,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
+plugin@org.eclipse.jst.ejb.ui=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
 plugin@org.eclipse.jst.j2ee.jca=v200701301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
 plugin@org.eclipse.jst.j2ee.webservice=v200612131833,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
 plugin@org.eclipse.jst.j2ee.webservice.ui=v200612130807,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice.ui
@@ -13,6 +13,7 @@
 plugin@org.eclipse.jst.j2ee.ejb.annotations.xdoclet=v200611161506,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet
 plugin@org.eclipse.jst.j2ee.xdoclet.runtime=v200701300433,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.xdoclet.runtime
 
-plugin@org.eclipse.jst.jee.ejb=v200701102313,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
-plugin@org.eclipse.jst.jee=v200701102313,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
+plugin@org.eclipse.jst.jee.ejb=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
+plugin@org.eclipse.jst.jee=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
+plugin@org.eclipse.jst.jee.ui=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ui
 !***************
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-j2ee-basic-tests.map b/releng.jeetools/maps/jst-j2ee-basic-tests.map
index beea617..8013b9f 100644
--- a/releng.jeetools/maps/jst-j2ee-basic-tests.map
+++ b/releng.jeetools/maps/jst-j2ee-basic-tests.map
@@ -1,7 +1,7 @@
 !*************** jst-j2ee-basic-tests.map
 
-plugin@org.eclipse.jst.j2ee.core.tests=v200701261230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests
-plugin@org.eclipse.jst.j2ee.tests=v200701301500,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
+plugin@org.eclipse.jst.j2ee.core.tests=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests
+plugin@org.eclipse.jst.j2ee.tests=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
 plugin@org.eclipse.jst.servlet.tests=v200606011728,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
 plugin@org.eclipse.jst.validation.sample=v200606011728,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.sample
 plugin@org.eclipse.jst.validation.test=v20060830231158,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.test
diff --git a/releng.jeetools/maps/jst-j2ee-basic.map b/releng.jeetools/maps/jst-j2ee-basic.map
index 4ed82dc..10dac52 100644
--- a/releng.jeetools/maps/jst-j2ee-basic.map
+++ b/releng.jeetools/maps/jst-j2ee-basic.map
@@ -3,12 +3,12 @@
 plugin@org.eclipse.jst.j2ee.navigator.ui=v200701301500,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
 plugin@org.eclipse.jst.j2ee.ui=v200701301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
 
-plugin@org.eclipse.jst.j2ee=v200701301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
+plugin@org.eclipse.jst.j2ee=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
 plugin@org.eclipse.jst.j2ee.core=v200701301500,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v200701301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
-plugin@org.eclipse.jst.servlet.ui=v200701301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
+plugin@org.eclipse.jst.j2ee.web=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.servlet.ui=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
 
 plugin@org.eclipse.equinox.servlet.api=v20060601,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.equinox.servlet.api
 
-
+plugin@org.eclipse.jst.jee.web=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.web
 !***************
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-web-component-features.map b/releng.jeetools/maps/jst-web-component-features.map
index ec81a89..bf6e214 100644
--- a/releng.jeetools/maps/jst-web-component-features.map
+++ b/releng.jeetools/maps/jst-web-component-features.map
@@ -1,6 +1,6 @@
 !*************** jst-web-component-features.map
 
-feature@org.eclipse.jst.web_core.feature=v200611220050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_core.feature
+feature@org.eclipse.jst.web_core.feature=v200701312340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_core.feature
 feature@org.eclipse.jst.web_sdk.feature=v200611220050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_sdk.feature
 feature@org.eclipse.jst.web_tests.feature=v200610211700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_tests.feature
 feature@org.eclipse.jst.web_ui.feature=v200611220050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_ui.feature