diff --git a/releng.common/maps/wst-common-core.map b/releng.common/maps/wst-common-core.map
index 47034d4..2517995 100644
--- a/releng.common/maps/wst-common-core.map
+++ b/releng.common/maps/wst-common-core.map
@@ -1,20 +1,20 @@
 !*************** wst-common-core.map
 
-plugin@org.eclipse.wst.command.env.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.core
-plugin@org.eclipse.wst.command.env=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env
+plugin@org.eclipse.wst.command.env.core=v200707302047,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.core
+plugin@org.eclipse.wst.command.env=v200708202226,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env
 
-plugin@org.eclipse.wst.common.emf=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
-plugin@org.eclipse.wst.common.emfworkbench.integration=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
+plugin@org.eclipse.wst.common.emf=v200708082330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
+plugin@org.eclipse.wst.common.emfworkbench.integration=v200708072330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
 
 plugin@org.eclipse.wst.common.environment=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.environment
 
 plugin@org.eclipse.wst.common.frameworks=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
-plugin@org.eclipse.wst.common.modulecore=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
-plugin@org.eclipse.wst.common.project.facet.core=v200706071740,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.core
+plugin@org.eclipse.wst.common.modulecore=v200708131600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
+plugin@org.eclipse.wst.common.project.facet.core=v200708232226,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.core
 plugin@org.eclipse.wst.common.uriresolver=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.uriresolver
 
 plugin@org.eclipse.wst.internet.cache=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.cache
 
-plugin@org.eclipse.wst.validation=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation
+plugin@org.eclipse.wst.validation=v200707301730,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation
 
 !***************
\ No newline at end of file
diff --git a/releng.common/maps/wst-common-tests.map b/releng.common/maps/wst-common-tests.map
index 4ea2802..7375bcd 100644
--- a/releng.common/maps/wst-common-tests.map
+++ b/releng.common/maps/wst-common-tests.map
@@ -1,6 +1,6 @@
 !*************** wst-common-tests.map
 
-plugin@org.eclipse.wst.common.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
+plugin@org.eclipse.wst.common.tests=v200707301730,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
 plugin@org.eclipse.wst.common.tests.collector=v200706030600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.collector
 plugin@org.eclipse.wst.common.tests.ui=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.ui
 
@@ -8,7 +8,7 @@
 
 
 plugin@org.eclipse.wst.common.snippets.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.snippets.tests
-plugin@org.eclipse.wst.common.project.facet.core.tests=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.project.facet.core.tests
+plugin@org.eclipse.wst.common.project.facet.core.tests=v200707311701,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.project.facet.core.tests
 plugin@org.eclipse.wst.common.project.facet.ui.tests=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.project.facet.ui.tests
 
 !***************
\ No newline at end of file
diff --git a/releng.common/maps/wst-common-ui.map b/releng.common/maps/wst-common-ui.map
index 76c9916..034a708 100644
--- a/releng.common/maps/wst-common-ui.map
+++ b/releng.common/maps/wst-common-ui.map
@@ -1,8 +1,8 @@
 !*************** wst-common-ui.map
 
-plugin@org.eclipse.wst.command.env.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.ui
+plugin@org.eclipse.wst.command.env.ui=v200707302047,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.ui
 plugin@org.eclipse.wst.common.frameworks.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks.ui
-plugin@org.eclipse.wst.common.project.facet.ui=v200706071742,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.ui
+plugin@org.eclipse.wst.common.project.facet.ui=v200708232226,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.ui
 plugin@org.eclipse.wst.common.snippets=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.snippets
 plugin@org.eclipse.wst.common.ui.properties=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.ui.properties
 plugin@org.eclipse.wst.common.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.ui
diff --git a/releng.dali/maps/jpt.map b/releng.dali/maps/jpt.map
index a050195..2adff88 100644
--- a/releng.dali/maps/jpt.map
+++ b/releng.dali/maps/jpt.map
@@ -1,14 +1,14 @@
 !*************** jpt.map
 
-feature@org.eclipse.jpt.feature=v200706190000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpt.feature
+feature@org.eclipse.jpt.feature=v200706250000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpt.feature
 feature@org.eclipse.jpt_sdk.feature=v200706040001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpt_sdk.feature
 
 plugin@org.eclipse.jpt.utility=v200705300001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.utility
-plugin@org.eclipse.jpt.db=v200706130000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.db
+plugin@org.eclipse.jpt.db=v200708130000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.db
 plugin@org.eclipse.jpt.db.ui=v200705300001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.db.ui
 plugin@org.eclipse.jpt.gen=v200705300001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.gen
-plugin@org.eclipse.jpt.core=v200706180000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.core
-plugin@org.eclipse.jpt.ui=v200706120001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui
-plugin@org.eclipse.jpt.doc.user=v200705300001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.doc.user
+plugin@org.eclipse.jpt.core=v200708210002,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.core
+plugin@org.eclipse.jpt.ui=v200708130000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui
+plugin@org.eclipse.jpt.doc.user=v200708210000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.doc.user
 
 !***************
\ No newline at end of file
diff --git a/releng.dali/maps/jpt.tests.map b/releng.dali/maps/jpt.tests.map
index eca35e1..17ad7cb 100644
--- a/releng.dali/maps/jpt.tests.map
+++ b/releng.dali/maps/jpt.tests.map
@@ -3,6 +3,6 @@
 feature@org.eclipse.jpt.tests.feature=v200706040001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpt.tests.feature
 
 plugin@org.eclipse.jpt.utility.tests=v200705300001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpt.utility.tests
-plugin@org.eclipse.jpt.core.tests=v200706080000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpt.core.tests
+plugin@org.eclipse.jpt.core.tests=v200708210000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpt.core.tests
 
 !*************** 
\ No newline at end of file
diff --git a/releng.ejbtools/maps/jst-enterprise-component-features.map b/releng.ejbtools/maps/jst-enterprise-component-features.map
index ec46f0f..cac23a1 100644
--- a/releng.ejbtools/maps/jst-enterprise-component-features.map
+++ b/releng.ejbtools/maps/jst-enterprise-component-features.map
@@ -2,7 +2,7 @@
 
 feature@org.eclipse.jst.enterprise_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_core.feature
 feature@org.eclipse.jst.enterprise_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_sdk.feature
-feature@org.eclipse.jst.enterprise_tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_tests.feature
+feature@org.eclipse.jst.enterprise_tests.feature=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_tests.feature
 feature@org.eclipse.jst.enterprise_ui.feature=v200706200200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_ui.feature
 feature@org.eclipse.jst.enterprise_userdoc.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_userdoc.feature
 
diff --git a/releng.jeetools/maps/jst-j2ee-advanced.map b/releng.jeetools/maps/jst-j2ee-advanced.map
index e37c894..41db86e 100644
--- a/releng.jeetools/maps/jst-j2ee-advanced.map
+++ b/releng.jeetools/maps/jst-j2ee-advanced.map
@@ -1,10 +1,10 @@
 !*************** jst-j2ee-advanced.map
 
-plugin@org.eclipse.jst.j2ee.ejb=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
-plugin@org.eclipse.jst.ejb.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
-plugin@org.eclipse.jst.j2ee.jca=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
-plugin@org.eclipse.jst.j2ee.webservice=v200706121000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
-plugin@org.eclipse.jst.j2ee.webservice.ui=v200706121000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice.ui
+plugin@org.eclipse.jst.j2ee.ejb=v200708171700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
+plugin@org.eclipse.jst.ejb.ui=v200708141930,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
+plugin@org.eclipse.jst.j2ee.jca=v200708171700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
+plugin@org.eclipse.jst.j2ee.webservice=v200707311400,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
+plugin@org.eclipse.jst.j2ee.webservice.ui=v200707311400,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice.ui
 plugin@org.eclipse.jst.j2ee.jca.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca.ui
 
 plugin@org.eclipse.jst.j2ee.ejb.annotation.model=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotation.model
@@ -13,6 +13,6 @@
 plugin@org.eclipse.jst.j2ee.ejb.annotations.xdoclet=v200705302225,: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=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.xdoclet.runtime
 
-plugin@org.eclipse.jst.jee.ejb=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
-plugin@org.eclipse.jst.jee.ui=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ui
+plugin@org.eclipse.jst.jee.ejb=v200708160600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
+plugin@org.eclipse.jst.jee.ui=v200708141930,: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 b2ae311..0b3ed4c 100644
--- a/releng.jeetools/maps/jst-j2ee-basic-tests.map
+++ b/releng.jeetools/maps/jst-j2ee-basic-tests.map
@@ -1,11 +1,11 @@
 !*************** jst-j2ee-basic-tests.map
 
 plugin@org.eclipse.jst.j2ee.core.tests=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests
-plugin@org.eclipse.jst.j2ee.tests=v200706181357,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
-plugin@org.eclipse.jst.servlet.tests=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
+plugin@org.eclipse.jst.j2ee.tests=v200708160030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
+plugin@org.eclipse.jst.servlet.tests=v200707061900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
 plugin@org.eclipse.jst.validation.sample=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.sample
 plugin@org.eclipse.jst.validation.test=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.test
-plugin@org.eclipse.jst.j2ee.core.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests.performance
+plugin@org.eclipse.jst.j2ee.core.tests.performance=v200707121230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests.performance
 plugin@org.eclipse.jst.j2ee.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests.performance
 
 !***************
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-j2ee-basic.map b/releng.jeetools/maps/jst-j2ee-basic.map
index 072974f..22a050c 100644
--- a/releng.jeetools/maps/jst-j2ee-basic.map
+++ b/releng.jeetools/maps/jst-j2ee-basic.map
@@ -1,16 +1,16 @@
 !*************** jst-j2ee-basic.map
 
-plugin@org.eclipse.jst.j2ee.navigator.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
-plugin@org.eclipse.jst.j2ee.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
+plugin@org.eclipse.jst.j2ee.navigator.ui=v200707111130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
+plugin@org.eclipse.jst.j2ee.ui=v200708141930,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
 
-plugin@org.eclipse.jst.j2ee=v200706121630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
-plugin@org.eclipse.jst.j2ee.core=v200706111630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
-plugin@org.eclipse.jst.servlet.ui=v200706201330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
+plugin@org.eclipse.jst.j2ee=v200708171700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
+plugin@org.eclipse.jst.j2ee.core=v200708140700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
+plugin@org.eclipse.jst.j2ee.web=v200708171700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.servlet.ui=v200708072330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
 
-plugin@org.eclipse.jst.jee=v200706121000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
-plugin@org.eclipse.jst.jee.web=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.web
+plugin@org.eclipse.jst.jee=v200708160600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
+plugin@org.eclipse.jst.jee.web=v200708160600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.web
 
-plugin@org.eclipse.jst.standard.schemas=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.standard.schemas
+plugin@org.eclipse.jst.standard.schemas=v200706221355,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.standard.schemas
 
 !***************
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-jem.map b/releng.jeetools/maps/jst-jem.map
index 047f24b..de10ca6 100644
--- a/releng.jeetools/maps/jst-jem.map
+++ b/releng.jeetools/maps/jst-jem.map
@@ -4,7 +4,7 @@
 plugin@org.eclipse.jem.beaninfo=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.beaninfo
 plugin@org.eclipse.jem.proxy=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.proxy
 plugin@org.eclipse.jem.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.ui
-plugin@org.eclipse.jem.util=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.util
+plugin@org.eclipse.jem.util=v200708131600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.util
 plugin@org.eclipse.jem.workbench=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.workbench
 plugin@org.eclipse.jem.tests=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/tests/org.eclipse.jem.tests
 !***************
\ No newline at end of file
diff --git a/releng.servertools/maps/jst-server.map b/releng.servertools/maps/jst-server.map
index f2253db..0eb61fa 100644
--- a/releng.servertools/maps/jst-server.map
+++ b/releng.servertools/maps/jst-server.map
@@ -2,7 +2,7 @@
 
 plugin@org.eclipse.jst.server.core=v20070612,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.core
 plugin@org.eclipse.jst.server.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.ui
-plugin@org.eclipse.jst.server.preview.adapter=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.preview.adapter
+plugin@org.eclipse.jst.server.preview.adapter=v20070814b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.preview.adapter
 
 plugin@org.eclipse.jst.server.generic.core=v200706120310,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.core
 plugin@org.eclipse.jst.server.generic.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.ui
diff --git a/releng.servertools/maps/wst-server-core.map b/releng.servertools/maps/wst-server-core.map
index ac41b41..fe5bb1e 100644
--- a/releng.servertools/maps/wst-server-core.map
+++ b/releng.servertools/maps/wst-server-core.map
@@ -2,10 +2,10 @@
 
 plugin@org.eclipse.wst.internet.monitor.core=v20070608,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.monitor.core
 
-plugin@org.eclipse.wst.server.core=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.core
+plugin@org.eclipse.wst.server.core=v20070716b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.core
 plugin@org.eclipse.wst.server.http.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.http.core
 
 plugin@org.eclipse.wst.server.preview=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.preview
-plugin@org.eclipse.wst.server.preview.adapter=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.preview.adapter
+plugin@org.eclipse.wst.server.preview.adapter=v20070814b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.preview.adapter
 
 !***************
\ No newline at end of file
diff --git a/releng.servertools/maps/wst-server-ui.map b/releng.servertools/maps/wst-server-ui.map
index 1a9f987..51b3df3 100644
--- a/releng.servertools/maps/wst-server-ui.map
+++ b/releng.servertools/maps/wst-server-ui.map
@@ -1,8 +1,8 @@
 !*************** wst-server.map
 
-plugin@org.eclipse.wst.internet.monitor.ui=v20070608,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.monitor.ui
+plugin@org.eclipse.wst.internet.monitor.ui=v20070716b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.monitor.ui
 
-plugin@org.eclipse.wst.server.ui=v20070619,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.ui
+plugin@org.eclipse.wst.server.ui=v20070814b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.ui
 plugin@org.eclipse.wst.server.http.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.http.ui
 
 
diff --git a/releng.sourceediting/maps/jst-jsp-tests.map b/releng.sourceediting/maps/jst-jsp-tests.map
index 205143a..8faa82e 100644
--- a/releng.sourceediting/maps/jst-jsp-tests.map
+++ b/releng.sourceediting/maps/jst-jsp-tests.map
@@ -1,6 +1,6 @@
 !*************** jst-jsp-tests.map
 
-plugin@org.eclipse.jst.jsp.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.core.tests
+plugin@org.eclipse.jst.jsp.core.tests=v200708142303,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.core.tests
 plugin@org.eclipse.jst.jsp.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests
 plugin@org.eclipse.jst.jsp.tests.encoding=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.tests.encoding
 
diff --git a/releng.sourceediting/maps/jst-jsp.map b/releng.sourceediting/maps/jst-jsp.map
index 62ef2d5..c1c29d4 100644
--- a/releng.sourceediting/maps/jst-jsp.map
+++ b/releng.sourceediting/maps/jst-jsp.map
@@ -1,6 +1,6 @@
 !*************** jst-jsp.map
 
-plugin@org.eclipse.jst.jsp.core=v200706120811,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.core
+plugin@org.eclipse.jst.jsp.core=v200707301910,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.core
 plugin@org.eclipse.jst.jsp.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.ui
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-web-core.map b/releng.sourceediting/maps/wst-web-core.map
index 726440d..ec88cc2 100644
--- a/releng.sourceediting/maps/wst-web-core.map
+++ b/releng.sourceediting/maps/wst-web-core.map
@@ -1,6 +1,6 @@
 !*************** wst-web-core.map
 
-plugin@org.eclipse.wst.web=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web
+plugin@org.eclipse.wst.web=v200708171700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web
 plugin@org.eclipse.wst.css.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/plugins/org.eclipse.wst.css.core
 plugin@org.eclipse.wst.html.core=v200706120811,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/plugins/org.eclipse.wst.html.core
 plugin@org.eclipse.wst.javascript.core=v200706071955,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/javascript/plugins/org.eclipse.wst.javascript.core
diff --git a/releng.sourceediting/maps/wst-xml-core.map b/releng.sourceediting/maps/wst-xml-core.map
index c67e10a..b7017a7 100644
--- a/releng.sourceediting/maps/wst-xml-core.map
+++ b/releng.sourceediting/maps/wst-xml-core.map
@@ -1,8 +1,14 @@
 !*************** wst-xml-core.map
 
-plugin@org.eclipse.wst.dtd.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.core
-plugin@org.eclipse.wst.sse.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.core
-plugin@org.eclipse.wst.xml.core=v200706120811,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.core
-plugin@org.eclipse.wst.xsd.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/plugins/org.eclipse.wst.xsd.core
+! This map file is for 
+! WTP 2.0.x maintenance releases
 
-!*************** 
\ No newline at end of file
+! These bundles are currently being developed and released 
+! from the HEAD stream
+ 
+plugin@org.eclipse.wst.dtd.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.core
+plugin@org.eclipse.wst.sse.core=v200706212223,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.core
+plugin@org.eclipse.wst.xml.core=v200706120811,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.core
+plugin@org.eclipse.wst.xsd.core=v200707172046,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/plugins/org.eclipse.wst.xsd.core
+
+!*************** 
diff --git a/releng.sourceediting/maps/wst-xml-tests.map b/releng.sourceediting/maps/wst-xml-tests.map
index 1b272a4..04cc4dd 100644
--- a/releng.sourceediting/maps/wst-xml-tests.map
+++ b/releng.sourceediting/maps/wst-xml-tests.map
@@ -14,6 +14,6 @@
 
 plugin@org.eclipse.wst.xsd.validation.tests=v200706071955,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/tests/org.eclipse.wst.xsd.validation.tests
 
-plugin@org.eclipse.wst.xsd.tests.performance=v200706110300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/tests/org.eclipse.wst.xsd.tests.performance
+plugin@org.eclipse.wst.xsd.tests.performance=v200708152025,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/tests/org.eclipse.wst.xsd.tests.performance
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-xml-ui.map b/releng.sourceediting/maps/wst-xml-ui.map
index a83f12b..2cb4425 100644
--- a/releng.sourceediting/maps/wst-xml-ui.map
+++ b/releng.sourceediting/maps/wst-xml-ui.map
@@ -1,8 +1,8 @@
 !*************** wst-xml.map
 
 plugin@org.eclipse.wst.dtd.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.ui
-plugin@org.eclipse.wst.sse.ui=v200706192034,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.ui
+plugin@org.eclipse.wst.sse.ui=v200707252231,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.ui
 plugin@org.eclipse.wst.xml.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.ui
-plugin@org.eclipse.wst.xsd.ui=v200706131840,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/plugins/org.eclipse.wst.xsd.ui
+plugin@org.eclipse.wst.xsd.ui=v200707181720,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/plugins/org.eclipse.wst.xsd.ui
 
 !*************** 
\ No newline at end of file
diff --git a/releng.webservices/maps/jst-ws-tests.map b/releng.webservices/maps/jst-ws-tests.map
index 002edd4..bb03207 100644
--- a/releng.webservices/maps/jst-ws-tests.map
+++ b/releng.webservices/maps/jst-ws-tests.map
@@ -1,8 +1,8 @@
 !*************** jst-ws-tests.map
 
-plugin@org.eclipse.jst.ws.tests=v200705311834,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests
-plugin@org.eclipse.jst.ws.tests.performance=v200706200235,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests.performance
-plugin@org.eclipse.jst.ws.axis.consumption.core.tests=v200705311834,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.axis.consumption.core.tests
+plugin@org.eclipse.jst.ws.tests=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests
+plugin@org.eclipse.jst.ws.tests.performance=v200708131547,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests.performance
+plugin@org.eclipse.jst.ws.axis.consumption.core.tests=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.axis.consumption.core.tests
 
 
 !***************
\ No newline at end of file
diff --git a/releng.webservices/maps/jst-ws.map b/releng.webservices/maps/jst-ws.map
index 0ffc6fb..e22ea45 100644
--- a/releng.webservices/maps/jst-ws.map
+++ b/releng.webservices/maps/jst-ws.map
@@ -1,22 +1,22 @@
 !*************** jst-ws.map
 
-plugin@org.eclipse.jst.ws=v200705311743,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws
-plugin@org.eclipse.jst.ws.axis.consumption.core=v200705311743,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.core
-plugin@org.eclipse.jst.ws.axis.consumption.ui=v200705311743,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.ui
-plugin@org.eclipse.jst.ws.axis.creation.ui=v200705311743,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis.creation.ui
+plugin@org.eclipse.jst.ws=v200707251745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws
+plugin@org.eclipse.jst.ws.axis.consumption.core=v200708151945,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.core
+plugin@org.eclipse.jst.ws.axis.consumption.ui=v200708151945,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis.consumption.ui
+plugin@org.eclipse.jst.ws.axis.creation.ui=v200708151945,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis.creation.ui
 plugin@org.eclipse.jst.ws.consumption=v200705311743,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.consumption
-plugin@org.eclipse.jst.ws.consumption.ui=v200705311743,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.consumption.ui
+plugin@org.eclipse.jst.ws.consumption.ui=v200708202218,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.consumption.ui
 plugin@org.eclipse.jst.ws.creation.ejb.ui=v200706030600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.creation.ejb.ui
-plugin@org.eclipse.jst.ws.creation.ui=v200706030115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.creation.ui
+plugin@org.eclipse.jst.ws.creation.ui=v200708151945,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.creation.ui
 plugin@org.eclipse.jst.ws.uddiregistry=v200705311743,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.uddiregistry
-plugin@org.eclipse.jst.ws.ui=v200705311743,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.ui
+plugin@org.eclipse.jst.ws.ui=v200708202218,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.ui
 
 !*** Axis2 plugins
-plugin@org.eclipse.jst.ws.axis2.consumption.core=v200706130319,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.consumption.core
-plugin@org.eclipse.jst.ws.axis2.consumption.ui=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.consumption.ui
-plugin@org.eclipse.jst.ws.axis2.core=v200706130319,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.core
-plugin@org.eclipse.jst.ws.axis2.creation.core=v200706141828,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.creation.core
-plugin@org.eclipse.jst.ws.axis2.creation.ui=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.creation.ui
-plugin@org.eclipse.jst.ws.axis2.ui=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.ui
+plugin@org.eclipse.jst.ws.axis2.consumption.core=v200708241921,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.consumption.core
+plugin@org.eclipse.jst.ws.axis2.consumption.ui=v200708241921,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.consumption.ui
+plugin@org.eclipse.jst.ws.axis2.core=v200708241921,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.core
+plugin@org.eclipse.jst.ws.axis2.creation.core=v200708241921,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.creation.core
+plugin@org.eclipse.jst.ws.axis2.creation.ui=v200708241921,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.creation.ui
+plugin@org.eclipse.jst.ws.axis2.ui=v200708241921,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis2.ui
 
 !***************
\ No newline at end of file
diff --git a/releng.webservices/maps/wst-ws-core.map b/releng.webservices/maps/wst-ws-core.map
index 5a5d3d8..11ea774 100644
--- a/releng.webservices/maps/wst-ws-core.map
+++ b/releng.webservices/maps/wst-ws-core.map
@@ -1,9 +1,9 @@
 !*************** wst-ws-core.map
 
-plugin@org.eclipse.wst.ws=v200705311823,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws
+plugin@org.eclipse.wst.ws=v200708151945,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws
 plugin@org.eclipse.wst.ws.parser=v200706061845,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.parser
 
-plugin@org.eclipse.wst.wsdl=v200706062140,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl
+plugin@org.eclipse.wst.wsdl=v200707201214,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl
 plugin@org.eclipse.wst.wsdl.validation=v200706062140,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl.validation
 plugin@org.eclipse.wst.wsi=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsi/plugins/org.eclipse.wst.wsi
 
diff --git a/releng.webservices/maps/wst-ws-tests.map b/releng.webservices/maps/wst-ws-tests.map
index 6ba3f1d..20b83b1 100644
--- a/releng.webservices/maps/wst-ws-tests.map
+++ b/releng.webservices/maps/wst-ws-tests.map
@@ -1,12 +1,12 @@
 !*************** wst-ws-tests.map
 
-plugin@org.eclipse.wst.wsdl.tests=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests
+plugin@org.eclipse.wst.wsdl.tests=v200707201214,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests
 plugin@org.eclipse.wst.wsdl.tests.ui=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests.ui
 plugin@org.eclipse.wst.wsdl.validation.tests=v200706062140,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.validation.tests
 plugin@org.eclipse.wst.wsi.tests=v200705310330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsi/tests/org.eclipse.wst.wsi.tests
 
 plugin@org.eclipse.wst.wsdl.tests.performance=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests.performance
 
-plugin@org.eclipse.wst.ws.tests=v200705311823,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/tests/org.eclipse.wst.ws.tests
+plugin@org.eclipse.wst.ws.tests=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/tests/org.eclipse.wst.ws.tests
 
 !***************
\ No newline at end of file
diff --git a/releng.webservices/maps/wst-ws-ui.map b/releng.webservices/maps/wst-ws-ui.map
index 9b4d1c1..87268e9 100644
--- a/releng.webservices/maps/wst-ws-ui.map
+++ b/releng.webservices/maps/wst-ws-ui.map
@@ -1,8 +1,12 @@
 !*************** wst-ws-ui.map
 
-plugin@org.eclipse.wst.ws.ui=v200705311823,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.ui
-plugin@org.eclipse.wst.ws.explorer=v200706061845,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.explorer
+! This map file is for the WTP 2.0.x maintenance release.
 
+! These bundles are currently being developed and released from the R2_0_maintenance branch.
+plugin@org.eclipse.wst.ws.ui=v200708222126,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.ui
+plugin@org.eclipse.wst.ws.explorer=v200708211833,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.explorer
+
+! These bundles are currently being developed and released from the HEAD branch.
 plugin@org.eclipse.wst.wsdl.ui=v200706062140,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui
 plugin@org.eclipse.wst.wsi.ui=v200706062140,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsi/plugins/org.eclipse.wst.wsi.ui
 
diff --git a/releng/.project b/releng/.project
index 9838d30..649ff20 100644
--- a/releng/.project
+++ b/releng/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng</name>
+	<name>releng R2_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg
index 459cd04..d2c477e 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -1,3 +1 @@
-wtpBuilderVersion=v200706130120
-
-
+wtpBuilderVersion=v200708260241
\ No newline at end of file
diff --git a/releng/maps/dependencies.properties b/releng/maps/dependencies.properties
index 4aa5efd..720e671 100644
--- a/releng/maps/dependencies.properties
+++ b/releng/maps/dependencies.properties
@@ -50,8 +50,8 @@
 dita.description = DITA-OT 1.2.1 Binary ASL Distribution
 #######################################################################################
 
-wtp.eclipse.build.id=3.3RC4
-wtp.eclipse.build.dir=S-3.3RC4-200706081718
+wtp.eclipse.build.id=M20070822-0800
+wtp.eclipse.build.dir=M20070822-0800
 
 #######################################################################################
 # Eclipse SDK Dependency
@@ -64,8 +64,8 @@
 eclipse.file.linux-gtk-ppc=eclipse-SDK-${wtp.eclipse.build.id}-linux-gtk-ppc.tar.gz
 eclipse.file.win32-win32-x86=eclipse-SDK-${wtp.eclipse.build.id}-win32.zip
 eclipse.file.macosx-carbon-ppc=eclipse-SDK-${wtp.eclipse.build.id}-macosx-carbon.tar.gz
-eclipse.name = Eclipse SDK v3.3 RC4
-eclipse.description = Eclipse SDK v3.3 RC4
+eclipse.name = Eclipse SDK v3.3.1
+eclipse.description = Eclipse SDK v3.3.1
 
 #######################################################################################
 
@@ -80,8 +80,8 @@
 
 eclipseTestFramework.file = eclipse-test-framework-${wtp.eclipse.build.id}.zip
 
-eclipseTestFramework.name = Eclipse test framework v3.3 Stream
-eclipseTestFramework.description = Eclipse test framework v3.3 Stream
+eclipseTestFramework.name = Eclipse test framework v3.3.1 Stream
+eclipseTestFramework.description = Eclipse test framework v3.3.1 Stream
 
 #######################################################################################
 
@@ -92,9 +92,9 @@
 # groupID : emf
 
 
-emf.url  = http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/S200706200000/
-emf.file = emf-sdo-xsd-SDK-2.3.0RC4.zip
-emf.name = EMF SDO XSD sdk v2.3 RC4
+emf.url  = http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.1/M200708142030/
+emf.file = emf-sdo-xsd-SDK-M200708142030.zip
+emf.name = EMF SDO XSD sdk v2.3.1
 emf.description = ${emf.name}
 
 #######################################################################################
@@ -105,9 +105,9 @@
 # GEF SDK will be used for building the distribution
 # groupID : gef
 
-gef.url  = http://download.eclipse.org/tools/gef/downloads/drops/S-3.3RC4-200706201021
-gef.file = 	GEF-SDK-3.3RC4.zip
-gef.name = GEF SDK 3.3 RC4
+gef.url  = http://download.eclipse.org/tools/gef/downloads/drops/M20070814-1555
+gef.file = 	GEF-SDK-M20070814-1555.zip
+gef.name = GEF-SDK-M20070814-1555.zip
 gef.description = ${gef.name}
 
 #######################################################################################
@@ -118,9 +118,9 @@
 # DTP SDK will be used for building the distribution
 # groupID : dtp
 
-dtp.url  = http://download.eclipse.org/datatools/downloads/1.5
-dtp.file = dtp-sdk_1.5RC4.zip
-dtp.name = DTP sdk v1.5 RC4
+dtp.url  = http://download.eclipse.org/datatools/downloads/drops/N_DTP_1.5.1
+dtp.file = dtp-sdk_1.5.1_N082107.zip
+dtp.name = DTP sdk v1.5.1
 dtp.description = ${dtp.name}
 
 #######################################################################################
diff --git a/releng/maps/jst-doc.map b/releng/maps/jst-doc.map
index 8fd3c5d..6578631 100644
--- a/releng/maps/jst-doc.map
+++ b/releng/maps/jst-doc.map
@@ -4,7 +4,7 @@
 
 plugin@org.eclipse.jst.ejb.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ejb.doc.user
 plugin@org.eclipse.jst.j2ee.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.j2ee.doc.user
-plugin@org.eclipse.jst.server.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.server.ui.doc.user
+plugin@org.eclipse.jst.server.ui.doc.user=v200708161939,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.server.ui.doc.user
 plugin@org.eclipse.jst.ws.axis.ui.doc.user=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.axis.ui.doc.user
 plugin@org.eclipse.jst.ws.consumption.ui.doc.user=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.consumption.ui.doc.user
 plugin@org.eclipse.jst.ws.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.doc.user
@@ -19,7 +19,7 @@
 plugin@org.eclipse.jst.jsp.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.jsp.ui.infopop
 plugin@org.eclipse.jst.server.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.server.ui.infopop
 plugin@org.eclipse.jst.servlet.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.servlet.ui.infopop
-plugin@org.eclipse.jst.ws.axis.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.axis.infopop
+plugin@org.eclipse.jst.ws.axis.infopop=v200708222303,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.axis.infopop
 plugin@org.eclipse.jst.ws.consumption.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.consumption.infopop
 plugin@org.eclipse.jst.ws.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.infopop
 
diff --git a/releng/maps/wtp-releng.map b/releng/maps/wtp-releng.map
index 135afd1..0698f0e 100644
--- a/releng/maps/wtp-releng.map
+++ b/releng/maps/wtp-releng.map
@@ -2,8 +2,8 @@
 ! This map file is for releng oriented plugins and tests 
 
 feature@org.eclipse.wtp.releng.tests.feature=v200706110805,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.wtp/org.eclipse.wtp.releng.tests.feature
-plugin@org.eclipse.callisto.tools.versionchecker=v200706041621,:pserver:anonymous@dev.eclipse.org:/cvsroot/callisto,,org.eclipse.callisto.tools.versionchecker
-plugin@org.eclipse.wtp.releng.tests=v200706201115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.wtp/org.eclipse.wtp.releng.tests
+plugin@org.eclipse.callisto.tools.versionchecker=v200708251937,:pserver:anonymous@dev.eclipse.org:/cvsroot/callisto,,org.eclipse.callisto.tools.versionchecker
+plugin@org.eclipse.wtp.releng.tests=v200708202101,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.wtp/org.eclipse.wtp.releng.tests
 plugin@org.eclipse.wtp.releng.tools=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,releng.wtptools/org.eclipse.wtp.releng.tools
 
 !***************
\ No newline at end of file