This commit was manufactured by cvs2svn to create tag 'vM20070912193227'.
diff --git a/releng.common/maps/jst-common.map b/releng.common/maps/jst-common.map
index b5b4f56..e9ec32e 100644
--- a/releng.common/maps/jst-common.map
+++ b/releng.common/maps/jst-common.map
@@ -1,10 +1,10 @@
 !*************** jst-common.map
 
-plugin@org.eclipse.jst.common.annotations.controller=v200706030115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.controller
-plugin@org.eclipse.jst.common.annotations.core=v200706030115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.core
-plugin@org.eclipse.jst.common.annotations.ui=v200706030115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.ui
-plugin@org.eclipse.jst.common.frameworks=v200706030115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.frameworks
-plugin@org.eclipse.jst.common.project.facet.core=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.project.facet.core
+plugin@org.eclipse.jst.common.annotations.controller=v200708301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.controller
+plugin@org.eclipse.jst.common.annotations.core=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.core
+plugin@org.eclipse.jst.common.annotations.ui=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.ui
+plugin@org.eclipse.jst.common.frameworks=v200708300100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.frameworks
+plugin@org.eclipse.jst.common.project.facet.core=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.project.facet.core
 
 
 !***************
\ No newline at end of file
diff --git a/releng.common/maps/wst-common-component-features.map b/releng.common/maps/wst-common-component-features.map
index feb2f89..f5aacab 100644
--- a/releng.common/maps/wst-common-component-features.map
+++ b/releng.common/maps/wst-common-component-features.map
@@ -1,8 +1,13 @@
 !*************** wst-common-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.wst.common_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_core.feature
-feature@org.eclipse.wst.common_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_sdk.feature
-feature@org.eclipse.wst.common_tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_tests.feature
-feature@org.eclipse.wst.common_ui.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_ui.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.wst.common_core.feature=v200709110622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_core.feature
+feature@org.eclipse.wst.common_sdk.feature=v200709110622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_sdk.feature
+feature@org.eclipse.wst.common_tests.feature=v200709110622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_tests.feature
+feature@org.eclipse.wst.common_ui.feature=v200709110622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_ui.feature
 
 !*************** 
\ No newline at end of file
diff --git a/releng.common/maps/wst-common-core.map b/releng.common/maps/wst-common-core.map
index e9b0055..8ce6558 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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
-plugin@org.eclipse.wst.common.emfworkbench.integration=v200705302225,: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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
-plugin@org.eclipse.wst.common.modulecore=v200705302200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
-plugin@org.eclipse.wst.common.project.facet.core=v200705311546,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.core
+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=v200708300100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
+plugin@org.eclipse.wst.common.project.facet.core=v200708281831,: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=v200705302200,: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 32afc99..7375bcd 100644
--- a/releng.common/maps/wst-common-tests.map
+++ b/releng.common/maps/wst-common-tests.map
@@ -1,14 +1,14 @@
 !*************** 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=v200706030600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.ui
+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
 
-plugin@org.eclipse.wst.common.tests.performance=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/performance-tests/org.eclipse.wst.common.tests.performance
+plugin@org.eclipse.wst.common.tests.performance=v200706071556,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/performance-tests/org.eclipse.wst.common.tests.performance
 
 
 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=v200705302225,: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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.project.facet.ui.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 e9dd0b2..91435b7 100644
--- a/releng.common/maps/wst-common-ui.map
+++ b/releng.common/maps/wst-common-ui.map
@@ -1,12 +1,12 @@
 !*************** 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.common.frameworks.ui=v200705302225,: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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.ui
+plugin@org.eclipse.wst.command.env.ui=v200709052219,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.ui
+plugin@org.eclipse.wst.common.frameworks.ui=v200708300100,: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=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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.ui.properties
+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
-plugin@org.eclipse.wst.validation.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation.ui
-plugin@org.eclipse.wst.common.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.core
+plugin@org.eclipse.wst.validation.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation.ui
+plugin@org.eclipse.wst.common.core=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.core
 
 !***************
\ No newline at end of file
diff --git a/releng.dali/maps/jpt.map b/releng.dali/maps/jpt.map
index 081a45d..91b00ab 100644
--- a/releng.dali/maps/jpt.map
+++ b/releng.dali/maps/jpt.map
@@ -1,14 +1,14 @@
 !*************** jpt.map
 
-feature@org.eclipse.jpt.feature=v200706040001,: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=v200705300001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.db
+plugin@org.eclipse.jpt.db=v200709100000,: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=v200706040000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.core
-plugin@org.eclipse.jpt.ui=v200706040000,: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.gen=v200709100000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.gen
+plugin@org.eclipse.jpt.core=v200709100000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.core
+plugin@org.eclipse.jpt.ui=v200709100000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui
+plugin@org.eclipse.jpt.doc.user=v200709100000,: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 e19dd85..bddd346 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=v200705300001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpt.core.tests
+plugin@org.eclipse.jpt.core.tests=v200709100000,: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 689832f..47a409a 100644
--- a/releng.ejbtools/maps/jst-enterprise-component-features.map
+++ b/releng.ejbtools/maps/jst-enterprise-component-features.map
@@ -1,9 +1,14 @@
 !*************** jst-enterprise-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-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_ui.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_ui.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.jst.enterprise_core.feature=v200709110523,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_core.feature
+feature@org.eclipse.jst.enterprise_sdk.feature=v200709110523,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_sdk.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=v200709110523,: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
 
 !*************** 
\ 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 130e063..966f861 100644
--- a/releng.jeetools/maps/jst-j2ee-advanced.map
+++ b/releng.jeetools/maps/jst-j2ee-advanced.map
@@ -1,18 +1,18 @@
 !*************** jst-j2ee-advanced.map
 
-plugin@org.eclipse.jst.j2ee.ejb=v200705302200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
-plugin@org.eclipse.jst.ejb.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
-plugin@org.eclipse.jst.j2ee.jca=v200705302200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
-plugin@org.eclipse.jst.j2ee.webservice=v200705310343,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
-plugin@org.eclipse.jst.j2ee.webservice.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice.ui
-plugin@org.eclipse.jst.j2ee.jca.ui=v200705311830,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca.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=v200708300100,: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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotation.model
-plugin@org.eclipse.jst.j2ee.ejb.annotations.emitter=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter
-plugin@org.eclipse.jst.j2ee.ejb.annotations.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui
-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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.xdoclet.runtime
+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
+plugin@org.eclipse.jst.j2ee.ejb.annotations.emitter=v200708301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter
+plugin@org.eclipse.jst.j2ee.ejb.annotations.ui=v200706191638,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui
+plugin@org.eclipse.jst.j2ee.ejb.annotations.xdoclet=v200708301745,: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=v200705302200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
-plugin@org.eclipse.jst.jee.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ui
+plugin@org.eclipse.jst.jee.ejb=v200708300100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
+plugin@org.eclipse.jst.jee.ui=v200708300100,: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 c90f506..2b300a9 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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests
-plugin@org.eclipse.jst.j2ee.tests=v200705311830,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
-plugin@org.eclipse.jst.servlet.tests=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
+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=v200709051030,: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=v200705302225,: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.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=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 a8b8369..defac66 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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
-plugin@org.eclipse.jst.j2ee.ui=v200705302225,: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=v200709051030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
 
-plugin@org.eclipse.jst.j2ee=v200705302200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
-plugin@org.eclipse.jst.j2ee.core=v200705302200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v200705302200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
-plugin@org.eclipse.jst.servlet.ui=v200705302200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
+plugin@org.eclipse.jst.j2ee=v200709050933,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
+plugin@org.eclipse.jst.j2ee.core=v200708300100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
+plugin@org.eclipse.jst.j2ee.web=v200708300100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.servlet.ui=v200708271000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
 
-plugin@org.eclipse.jst.jee=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
-plugin@org.eclipse.jst.jee.web=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.web
+plugin@org.eclipse.jst.jee=v200708300100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
+plugin@org.eclipse.jst.jee.web=v200708300100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.web
 
-plugin@org.eclipse.jst.standard.schemas=v200706032350,: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 ca9ae39..ced2bc0 100644
--- a/releng.jeetools/maps/jst-jem.map
+++ b/releng.jeetools/maps/jst-jem.map
@@ -1,10 +1,10 @@
 !*************** jst-jem.map
 
-plugin@org.eclipse.jem=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem
+plugin@org.eclipse.jem=v200709051030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem
 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=v200709051030,: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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/tests/org.eclipse.jem.tests
+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.jeetools/maps/jst-web-component-features.map b/releng.jeetools/maps/jst-web-component-features.map
index 91545b8..414b244 100644
--- a/releng.jeetools/maps/jst-web-component-features.map
+++ b/releng.jeetools/maps/jst-web-component-features.map
@@ -1,8 +1,18 @@
 !*************** jst-web-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.jst.web_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_core.feature
-feature@org.eclipse.jst.web_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_sdk.feature
-feature@org.eclipse.jst.web_tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_tests.feature
-feature@org.eclipse.jst.web_ui.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_ui.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.jst.web_core.feature=v200709121928,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_core.feature
+feature@org.eclipse.jst.web_sdk.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_sdk.feature
+feature@org.eclipse.jst.web_tests.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_tests.feature
+feature@org.eclipse.jst.web_ui.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_ui.feature
+
+feature@org.eclipse.jst.web_userdoc.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_userdoc.feature
+
+feature@org.eclipse.jst.webpageeditor.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/web/features/org.eclipse.jst.webpageeditor.feature
+feature@org.eclipse.jst.webpageeditor_sdk.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/web/features/org.eclipse.jst.webpageeditor_sdk.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.jsf/maps/jsf-doc.map b/releng.jsf/maps/jsf-doc.map
index 3cfb537..1d48e97 100644
--- a/releng.jsf/maps/jsf-doc.map
+++ b/releng.jsf/maps/jsf-doc.map
@@ -1,9 +1,14 @@
 !*************** wtp jsf  docs map
+! This map file is for 
+! WTP 2.0.1 maintenance releases  
 
-feature@org.eclipse.jst.jsf.doc.feature=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/features/org.eclipse.jst.jsf.doc.feature
+! These bundles are currently being developed and released 
+! from the Root1_0_maintenance branch
 
-plugin@org.eclipse.jst.jsf.doc.user=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.user
-plugin@org.eclipse.jst.jsf.doc.dev=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.dev
+feature@org.eclipse.jst.jsf.doc.feature=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/features/org.eclipse.jst.jsf.doc.feature
+
+plugin@org.eclipse.jst.jsf.doc.user=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.user
+plugin@org.eclipse.jst.jsf.doc.dev=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.dev
 
 
 !*************** 
\ No newline at end of file
diff --git a/releng.jsf/maps/jsf.map b/releng.jsf/maps/jsf.map
index c1ea8b8..9ad2914 100644
--- a/releng.jsf/maps/jsf.map
+++ b/releng.jsf/maps/jsf.map
@@ -1,7 +1,12 @@
 !*************** jsf product plugin and assembly features
+! This map file is for 
+! WTP 2.0.1 maintenance releases  
 
-plugin@org.eclipse.jsf=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/plugins/org.eclipse.jsf.branding
+! These bundles are currently being developed and released 
+! from the Root1_0_maintenance branch
 
-feature@org.eclipse.jsf=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/features/org.eclipse.jsf.feature
+plugin@org.eclipse.jsf=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/plugins/org.eclipse.jsf.branding
+
+feature@org.eclipse.jsf=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/features/org.eclipse.jsf.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.jsf/maps/wtp.jsf.map b/releng.jsf/maps/wtp.jsf.map
index d35943f..ca8a326 100644
--- a/releng.jsf/maps/wtp.jsf.map
+++ b/releng.jsf/maps/wtp.jsf.map
@@ -1,21 +1,25 @@
 !*************** jsf product plugins and features
+! This map file is for 
+! WTP 2.0.1 maintenance releases  
 
+! These bundles are currently being developed and released 
+! from the Root1_0_maintenance branch
 
-plugin@org.eclipse.jst.jsf.core=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.core
-plugin@org.eclipse.jst.jsf.ui=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.ui
+plugin@org.eclipse.jst.jsf.core=v20070906,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.core
+plugin@org.eclipse.jst.jsf.ui=v20070613,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.ui
 
-plugin@org.eclipse.jst.jsf.facesconfig=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig
-plugin@org.eclipse.jst.jsf.facesconfig.ui=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui
-plugin@org.eclipse.jst.jsf.common=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common
-plugin@org.eclipse.jst.jsf.common.ui=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.ui
+plugin@org.eclipse.jst.jsf.facesconfig=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig
+plugin@org.eclipse.jst.jsf.facesconfig.ui=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui
+plugin@org.eclipse.jst.jsf.common=v200709051516,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common
+plugin@org.eclipse.jst.jsf.common.ui=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.ui
 
-plugin@org.eclipse.jst.jsf.standard.tagsupport=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
+plugin@org.eclipse.jst.jsf.standard.tagsupport=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
 
-plugin@org.eclipse.jst.pagedesigner=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner
-plugin@org.eclipse.jst.pagedesigner.jsf.ui=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui
-plugin@org.eclipse.jst.pagedesigner.jsp.core=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core
+plugin@org.eclipse.jst.pagedesigner=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner
+plugin@org.eclipse.jst.pagedesigner.jsf.ui=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui
+plugin@org.eclipse.jst.pagedesigner.jsp.core=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core
 
-feature@org.eclipse.jst.jsf.feature=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.feature
-feature@org.eclipse.jst.jsf_sdk.feature=v200705302227,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf_sdk.feature
+feature@org.eclipse.jst.jsf.feature=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.feature
+feature@org.eclipse.jst.jsf_sdk.feature=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf_sdk.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.jsf/maps/wtp.jsf.tests.map b/releng.jsf/maps/wtp.jsf.tests.map
index d1a189c..6a976a9 100644
--- a/releng.jsf/maps/wtp.jsf.tests.map
+++ b/releng.jsf/maps/wtp.jsf.tests.map
@@ -1,14 +1,20 @@
 !*************** wtp jsf tests map
+! This map file is for 
+! WTP 2.0.1 maintenance releases  
 
-feature@org.eclipse.jst.jsf.tests.feature=v20070531,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.tests.feature
+! These bundles are currently being developed and released 
+! from the Root1_0_maintenance branch
 
-plugin@org.eclipse.jst.jsf.core.tests=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.core.tests
-plugin@org.eclipse.jst.jsf.ui.tests=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.ui.tests
 
-plugin@org.eclipse.jst.jsf.metadata.tests=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadata.tests
-plugin@org.eclipse.jst.jsf.contentassist.tests=v20070604,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.contentassist.tests
-plugin@org.eclipse.jst.jsf.metadataprocessingtests2=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2
-plugin@org.eclipse.jst.jsf.test.util=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.test.util
-plugin@org.eclipse.jst.jsf.context.symbol.tests=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests
-plugin@org.eclipse.jst.jsf.designtime.tests=v20070601,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.designtime.tests
+feature@org.eclipse.jst.jsf.tests.feature=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.tests.feature
+
+plugin@org.eclipse.jst.jsf.core.tests=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.core.tests
+plugin@org.eclipse.jst.jsf.ui.tests=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.ui.tests
+
+plugin@org.eclipse.jst.jsf.metadata.tests=v20070906,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadata.tests
+plugin@org.eclipse.jst.jsf.contentassist.tests=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.contentassist.tests
+plugin@org.eclipse.jst.jsf.metadataprocessingtests2=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2
+plugin@org.eclipse.jst.jsf.test.util=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.test.util
+plugin@org.eclipse.jst.jsf.context.symbol.tests=v20070904,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests
+plugin@org.eclipse.jst.jsf.designtime.tests=v20070905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.designtime.tests
 !*************** 
\ No newline at end of file
diff --git a/releng.servertools/maps/jst-server-component-features.map b/releng.servertools/maps/jst-server-component-features.map
index 92b6763..805d4df 100644
--- a/releng.servertools/maps/jst-server-component-features.map
+++ b/releng.servertools/maps/jst-server-component-features.map
@@ -1,11 +1,16 @@
 !*************** jst-server-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.jst.server_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_core.feature
-feature@org.eclipse.jst.server_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_sdk.feature
-feature@org.eclipse.jst.server_tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_tests.feature
-feature@org.eclipse.jst.server_ui.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_ui.feature
-feature@org.eclipse.jst.server_userdoc.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_userdoc.feature
-feature@org.eclipse.jst.server_adapters.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_adapters.feature
-feature@org.eclipse.jst.server_adapters.sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_adapters.sdk.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.jst.server_core.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_core.feature
+feature@org.eclipse.jst.server_sdk.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_sdk.feature
+feature@org.eclipse.jst.server_tests.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_tests.feature
+feature@org.eclipse.jst.server_ui.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_ui.feature
+feature@org.eclipse.jst.server_userdoc.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_userdoc.feature
+feature@org.eclipse.jst.server_adapters.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_adapters.feature
+feature@org.eclipse.jst.server_adapters.sdk.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_adapters.sdk.feature
 
 !*************** 
\ No newline at end of file
diff --git a/releng.servertools/maps/jst-server.map b/releng.servertools/maps/jst-server.map
index 7169aba..b76dbe0 100644
--- a/releng.servertools/maps/jst-server.map
+++ b/releng.servertools/maps/jst-server.map
@@ -1,21 +1,21 @@
 !*************** jst-server.map
 
-plugin@org.eclipse.jst.server.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.core
+plugin@org.eclipse.jst.server.core=v20070829b,: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=v200705302225,: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
+plugin@org.eclipse.jst.server.generic.core=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.core
+plugin@org.eclipse.jst.server.generic.ui=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.ui
 
-plugin@org.eclipse.jst.server.tomcat.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.core
+plugin@org.eclipse.jst.server.tomcat.core=v20070827,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.core
 plugin@org.eclipse.jst.server.tomcat.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.ui
 
-plugin@org.eclipse.jst.server.websphere.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.websphere.core
-plugin@org.eclipse.jst.server.generic.jboss=v200706041820,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.jboss
-plugin@org.eclipse.jst.server.generic.jonas=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.jonas
-plugin@org.eclipse.jst.server.generic.oc4j=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.oc4j
+plugin@org.eclipse.jst.server.websphere.core=v20070608,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.websphere.core
+plugin@org.eclipse.jst.server.generic.jboss=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.jboss
+plugin@org.eclipse.jst.server.generic.jonas=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.jonas
+plugin@org.eclipse.jst.server.generic.oc4j=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.oc4j
 
-plugin@org.eclipse.jst.server.installable=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.installable
+plugin@org.eclipse.jst.server.installable=v20070608,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.installable
 
 plugin@org.apache.cactus=v200606181221,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/thirdparty/org.apache.cactus
 
diff --git a/releng.servertools/maps/wst-server-component-features.map b/releng.servertools/maps/wst-server-component-features.map
index 719e759..b9fc37d 100644
--- a/releng.servertools/maps/wst-server-component-features.map
+++ b/releng.servertools/maps/wst-server-component-features.map
@@ -1,11 +1,16 @@
 !*************** wst-server-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.wst.server_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_core.feature
-feature@org.eclipse.wst.server_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_sdk.feature
-feature@org.eclipse.wst.server_tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_tests.feature
-feature@org.eclipse.wst.server_ui.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_ui.feature
-feature@org.eclipse.wst.server_userdoc.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_userdoc.feature
-feature@org.eclipse.wst.server_adapters.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_adapters.feature
-feature@org.eclipse.wst.server_adapters.sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_adapters.sdk.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.wst.server_core.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_core.feature
+feature@org.eclipse.wst.server_sdk.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_sdk.feature
+feature@org.eclipse.wst.server_tests.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_tests.feature
+feature@org.eclipse.wst.server_ui.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_ui.feature
+feature@org.eclipse.wst.server_userdoc.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_userdoc.feature
+feature@org.eclipse.wst.server_adapters.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_adapters.feature
+feature@org.eclipse.wst.server_adapters.sdk.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_adapters.sdk.feature
 
 !*************** 
\ No newline at end of file
diff --git a/releng.servertools/maps/wst-server-core.map b/releng.servertools/maps/wst-server-core.map
index fb166fe..8220a5e 100644
--- a/releng.servertools/maps/wst-server-core.map
+++ b/releng.servertools/maps/wst-server-core.map
@@ -1,11 +1,11 @@
 !*************** wst-server.map
 
-plugin@org.eclipse.wst.internet.monitor.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.monitor.core
+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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.core
+plugin@org.eclipse.wst.server.core=v20070829b,: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-tests.map b/releng.servertools/maps/wst-server-tests.map
index a8a26d9..558f76f 100644
--- a/releng.servertools/maps/wst-server-tests.map
+++ b/releng.servertools/maps/wst-server-tests.map
@@ -5,7 +5,7 @@
 
 plugin@org.eclipse.wst.server.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.core.tests
 plugin@org.eclipse.wst.server.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.ui.tests
-plugin@org.eclipse.wst.server.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.tests.performance
+plugin@org.eclipse.wst.server.tests.performance=v20070611,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.tests.performance
 plugin@org.eclipse.wst.server.http.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.http.core.tests
 
 plugin@org.eclipse.wst.internet.cache.tests=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/tests/org.eclipse.wst.internet.cache.tests
diff --git a/releng.servertools/maps/wst-server-ui.map b/releng.servertools/maps/wst-server-ui.map
index c5e1d41..6e8edf7 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=v200705302225,: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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.ui
+plugin@org.eclipse.wst.server.ui=v20070912,: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..253aaa1 100644
--- a/releng.sourceediting/maps/jst-jsp-tests.map
+++ b/releng.sourceediting/maps/jst-jsp-tests.map
@@ -1,9 +1,17 @@
 !*************** jst-jsp-tests.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-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.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+plugin@org.eclipse.jst.jsp.core.tests=v200709062330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.core.tests
+plugin@org.eclipse.jst.jsp.ui.tests=v200709061930,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests
+
+! These bundles are currently being developed and released 
+! from the HEAD stream
+
 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
-
 plugin@org.eclipse.jst.jsp.ui.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests.performance
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/jst-jsp.map b/releng.sourceediting/maps/jst-jsp.map
index 0740e7e..26a3beb 100644
--- a/releng.sourceediting/maps/jst-jsp.map
+++ b/releng.sourceediting/maps/jst-jsp.map
@@ -1,6 +1,11 @@
 !*************** jst-jsp.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-plugin@org.eclipse.jst.jsp.core=v200705302225,: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
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+plugin@org.eclipse.jst.jsp.core=v200709061632,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.core
+plugin@org.eclipse.jst.jsp.ui=v200709061102,: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-componenet-features.map b/releng.sourceediting/maps/wst-web-componenet-features.map
index 58ea37c..cc153db 100644
--- a/releng.sourceediting/maps/wst-web-componenet-features.map
+++ b/releng.sourceediting/maps/wst-web-componenet-features.map
@@ -1,9 +1,14 @@
 !*************** wst-web-componenet-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.wst.web_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_core.feature
-feature@org.eclipse.wst.web_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_sdk.feature
-feature@org.eclipse.wst.web_tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_tests.feature
-feature@org.eclipse.wst.web_ui.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_ui.feature
-feature@org.eclipse.wst.web_userdoc.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_userdoc.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.wst.web_core.feature=v200709111200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_core.feature
+feature@org.eclipse.wst.web_sdk.feature=v200709111200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_sdk.feature
+feature@org.eclipse.wst.web_tests.feature=v200709111200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_tests.feature
+feature@org.eclipse.wst.web_ui.feature=v200709111200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_ui.feature
+feature@org.eclipse.wst.web_userdoc.feature=v200709111200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_userdoc.feature
 
 !*************** 
\ 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 cdd042f..57f5139 100644
--- a/releng.sourceediting/maps/wst-web-core.map
+++ b/releng.sourceediting/maps/wst-web-core.map
@@ -1,8 +1,16 @@
 !*************** wst-web-core.map
+! This map file is for 
+! WTP 2.0.x maintenance releases
+ 
+ ! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch:
 
-plugin@org.eclipse.wst.web=v200705302225,: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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/plugins/org.eclipse.wst.html.core
-plugin@org.eclipse.wst.javascript.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/javascript/plugins/org.eclipse.wst.javascript.core
+plugin@org.eclipse.wst.html.core=v200709061102,: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
 
-!***************
\ No newline at end of file
+! These bundles are currently being developed and released 
+! from the HEAD stream:
+
+plugin@org.eclipse.wst.web=v200709051030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web
+!***************
diff --git a/releng.sourceediting/maps/wst-web-tests.map b/releng.sourceediting/maps/wst-web-tests.map
index e4a1f3d..7192f4a 100644
--- a/releng.sourceediting/maps/wst-web-tests.map
+++ b/releng.sourceediting/maps/wst-web-tests.map
@@ -1,7 +1,7 @@
 !*************** wst-web-tests.map
 
 plugin@org.eclipse.wst.css.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.core.tests
-plugin@org.eclipse.wst.css.tests.encoding=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.tests.encoding
+plugin@org.eclipse.wst.css.tests.encoding=v200706071955,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.tests.encoding
 plugin@org.eclipse.wst.css.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.ui.tests
 plugin@org.eclipse.wst.css.ui.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.ui.tests.performance
 
diff --git a/releng.sourceediting/maps/wst-web-ui.map b/releng.sourceediting/maps/wst-web-ui.map
index 3dca23e..5edc054 100644
--- a/releng.sourceediting/maps/wst-web-ui.map
+++ b/releng.sourceediting/maps/wst-web-ui.map
@@ -1,9 +1,18 @@
 !*************** wst-web-ui.map
 
-plugin@org.eclipse.wst.web.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web.ui
-plugin@org.eclipse.wst.css.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/plugins/org.eclipse.wst.css.ui
-plugin@org.eclipse.wst.html.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/plugins/org.eclipse.wst.html.ui
-plugin@org.eclipse.wst.javascript.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/javascript/plugins/org.eclipse.wst.javascript.ui
+! This map file is for 
+! WTP 2.0.x maintenance releases
 
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch:
+
+plugin@org.eclipse.wst.css.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/plugins/org.eclipse.wst.css.ui
+plugin@org.eclipse.wst.html.ui=v200708292012,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/plugins/org.eclipse.wst.html.ui
+plugin@org.eclipse.wst.javascript.ui=v200709112242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/javascript/plugins/org.eclipse.wst.javascript.ui
+
+! These bundles are currently being developed and released 
+! from the HEAD stream:
+
+plugin@org.eclipse.wst.web.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web.ui
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-xml-component-features.map b/releng.sourceediting/maps/wst-xml-component-features.map
index a875bb8..63b7cce 100644
--- a/releng.sourceediting/maps/wst-xml-component-features.map
+++ b/releng.sourceediting/maps/wst-xml-component-features.map
@@ -1,9 +1,14 @@
 !*************** wst-xml-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.wst.xml_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_core.feature
-feature@org.eclipse.wst.xml_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_sdk.feature
-feature@org.eclipse.wst.xml_tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_tests.feature
-feature@org.eclipse.wst.xml_ui.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_ui.feature
-feature@org.eclipse.wst.xml_userdoc.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_userdoc.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.wst.xml_core.feature=v200709110650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_core.feature
+feature@org.eclipse.wst.xml_sdk.feature=v200709110650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_sdk.feature
+feature@org.eclipse.wst.xml_tests.feature=v200709110650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_tests.feature
+feature@org.eclipse.wst.xml_ui.feature=v200709110650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_ui.feature
+feature@org.eclipse.wst.xml_userdoc.feature=v200709110650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_userdoc.feature
 
 !*************** 
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-xml-core.map b/releng.sourceediting/maps/wst-xml-core.map
index 43333a5..55e504d 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
 
+! This map file is for 
+! WTP 2.0.x maintenance releases
+
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch:
+ 
 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=v200705302225,: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
+plugin@org.eclipse.wst.sse.core=v200709061102,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.core
+plugin@org.eclipse.wst.xml.core=v200709061102,: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
 
 !*************** 
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-xml-tests.map b/releng.sourceediting/maps/wst-xml-tests.map
index efd0e51..04cc4dd 100644
--- a/releng.sourceediting/maps/wst-xml-tests.map
+++ b/releng.sourceediting/maps/wst-xml-tests.map
@@ -2,9 +2,9 @@
 
 plugin@org.eclipse.wst.sse.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.core.tests
 plugin@org.eclipse.wst.sse.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.ui.tests
-plugin@org.eclipse.wst.sse.ui.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.ui.tests.performance
+plugin@org.eclipse.wst.sse.ui.tests.performance=v200706071955,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.ui.tests.performance
 
-plugin@org.eclipse.wst.xml.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.core.tests
+plugin@org.eclipse.wst.xml.core.tests=v200706120811,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.core.tests
 plugin@org.eclipse.wst.xml.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.ui.tests
 plugin@org.eclipse.wst.xml.tests.encoding=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.tests.encoding
 plugin@org.eclipse.wst.xml.ui.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.ui.tests.performance
@@ -12,8 +12,8 @@
 
 plugin@org.eclipse.wst.dtd.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/dtd/tests/org.eclipse.wst.dtd.ui.tests
 
-plugin@org.eclipse.wst.xsd.validation.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/tests/org.eclipse.wst.xsd.validation.tests
+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=v200705302225,: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 634bbca..76bccfc 100644
--- a/releng.sourceediting/maps/wst-xml-ui.map
+++ b/releng.sourceediting/maps/wst-xml-ui.map
@@ -1,8 +1,14 @@
-!*************** wst-xml.map
+!*************** wst-xml-ui.map
+
+! This map file is for 
+! WTP 2.0.x maintenance releases
+
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch:
 
 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=v200705302225,: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=v200705311615,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/plugins/org.eclipse.wst.xsd.ui
+plugin@org.eclipse.wst.sse.ui=v200709061102,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.ui
+plugin@org.eclipse.wst.xml.ui=v200709112242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.ui
+plugin@org.eclipse.wst.xsd.ui=v200709112242,: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 3831f87..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=v200705311834,: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 6d8e93d..2d30ea9 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=v200706012019,: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=v200706012019,: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=v200705302225,: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=v200706012019,: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=v200706012019,: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=v200705302225,: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=v200709121418,: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=v200709121418,: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=v200708282350,: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-component.features.map b/releng.webservices/maps/wst-ws-component.features.map
index b2d1a9a..4c9ca6f 100644
--- a/releng.webservices/maps/wst-ws-component.features.map
+++ b/releng.webservices/maps/wst-ws-component.features.map
@@ -1,9 +1,9 @@
 !*************** wst-ws-component.features.map
 
-feature@org.eclipse.wst.ws_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_core.feature
-feature@org.eclipse.wst.ws_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_sdk.feature
-feature@org.eclipse.wst.ws_tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_tests.feature
-feature@org.eclipse.wst.ws_ui.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_ui.feature
+feature@org.eclipse.wst.ws_core.feature=v200709051445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_core.feature
+feature@org.eclipse.wst.ws_sdk.feature=v200709051445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_sdk.feature
+feature@org.eclipse.wst.ws_tests.feature=v200709120100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_tests.feature
+feature@org.eclipse.wst.ws_ui.feature=v200709051445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_ui.feature
 feature@org.eclipse.wst.ws_userdoc.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_userdoc.feature
 
 !*************** 
\ 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 24f9010..8e4a056 100644
--- a/releng.webservices/maps/wst-ws-core.map
+++ b/releng.webservices/maps/wst-ws-core.map
@@ -1,11 +1,11 @@
 !*************** 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.parser=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.parser
+plugin@org.eclipse.wst.ws=v200709052219,: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=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl
-plugin@org.eclipse.wst.wsdl.validation=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl.validation
-plugin@org.eclipse.wst.wsi=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsi/plugins/org.eclipse.wst.wsi
+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
 
 
 !**********
\ No newline at end of file
diff --git a/releng.webservices/maps/wst-ws-tests.map b/releng.webservices/maps/wst-ws-tests.map
index de74aa2..15fbfc9 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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests
-plugin@org.eclipse.wst.wsdl.tests.ui=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests.ui
-plugin@org.eclipse.wst.wsdl.validation.tests=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.validation.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=v200709052219,: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 313e49d..6b1e651 100644
--- a/releng.webservices/maps/wst-ws-ui.map
+++ b/releng.webservices/maps/wst-ws-ui.map
@@ -1,9 +1,14 @@
 !*************** wst-ws-ui.map
+! This map file is for the 
+! WTP 2.0.x maintenance release.
 
-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=v200706030435,: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 R2_0_maintenance branch.
 
-plugin@org.eclipse.wst.wsdl.ui=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui
-plugin@org.eclipse.wst.wsi.ui=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsi/plugins/org.eclipse.wst.wsi.ui
+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=v200709052219,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.explorer
+plugin@org.eclipse.wst.wsdl.ui=v200709112242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui
+
+! These bundles are currently being developed and released from the HEAD branch.
+plugin@org.eclipse.wst.wsi.ui=v200706062140,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsi/plugins/org.eclipse.wst.wsi.ui
 
 !**********
\ No newline at end of file
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 4e20023..5100e82 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -1,3 +1 @@
-wtpBuilderVersion=v200705310400
-
-
+wtpBuilderVersion=v200709060223
\ No newline at end of file
diff --git a/releng/maps/dependencies.properties b/releng/maps/dependencies.properties
index eb61a9c..7b7a026 100644
--- a/releng/maps/dependencies.properties
+++ b/releng/maps/dependencies.properties
@@ -34,8 +34,8 @@
 
 
 #######################################################################################
-orbitthirdpartymap.url  = http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823
-orbitthirdpartymap.file = orbitBundles-S200705301823.map
+orbitthirdpartymap.url  = http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011
+orbitthirdpartymap.file = orbitBundles-R200706192011.map
 orbitthirdpartymap.name = orbit thirdparty map
 orbitthirdpartymap.description = orbit thirdparty map
 
@@ -50,8 +50,8 @@
 dita.description = DITA-OT 1.2.1 Binary ASL Distribution
 #######################################################################################
 
-wtp.eclipse.build.id=3.3RC2
-wtp.eclipse.build.dir=S-3.3RC2-200705251350
+wtp.eclipse.build.id=M20070912-0800
+wtp.eclipse.build.dir=M20070912-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 RC2
-eclipse.description = Eclipse SDK v3.3 RC2
+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/S200705300200/
-emf.file = emf-sdo-xsd-SDK-2.3.0RC2.zip
-emf.name = EMF SDO XSD sdk v2.3 RC2
+emf.url  = http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.1/M200709120130/
+emf.file = emf-sdo-xsd-SDK-M200709120130.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.3RC2-200705291437
-gef.file = 	GEF-SDK-3.3RC2.zip
-gef.name = GEF SDK 3.3 RC2
+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.5RC2.zip
-dtp.name = DTP sdk v1.5 RC2
+dtp.url  = http://download.eclipse.org/datatools/downloads/drops/N_DTP_1.5.1
+dtp.file = dtp-sdk_1.5.1_N091107.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 b27376e..3352818 100644
--- a/releng/maps/jst-doc.map
+++ b/releng/maps/jst-doc.map
@@ -4,23 +4,23 @@
 
 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.ws.axis.ui.doc.user=v200705302225,: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=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.consumption.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
 
 !*************** ISV Docs
 
-plugin@org.eclipse.jst.doc.isv=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.doc.isv
+plugin@org.eclipse.jst.doc.isv=v200708290613,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.doc.isv
 
 !*************** Infopops
 
-plugin@org.eclipse.jst.j2ee.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.j2ee.infopop
-plugin@org.eclipse.jst.jsp.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.jsp.ui.infopop
-plugin@org.eclipse.jst.server.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.server.ui.infopop
-plugin@org.eclipse.jst.servlet.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.servlet.ui.infopop
-plugin@org.eclipse.jst.ws.axis.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.axis.infopop
-plugin@org.eclipse.jst.ws.consumption.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.consumption.infopop
-plugin@org.eclipse.jst.ws.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.infopop
+plugin@org.eclipse.jst.j2ee.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.j2ee.infopop
+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=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
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/jst.map b/releng/maps/jst.map
index 7d5bf55..302c21f 100644
--- a/releng/maps/jst.map
+++ b/releng/maps/jst.map
@@ -1,9 +1,9 @@
 !*************** jst product plugin and assembly features
 
-plugin@org.eclipse.jst=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/plugins/org.eclipse.jst
+plugin@org.eclipse.jst=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/plugins/org.eclipse.jst
 
-feature@org.eclipse.jst.sdk=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.sdk
-feature@org.eclipse.jst.tests=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.tests
-feature@org.eclipse.jst=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.feature
+feature@org.eclipse.jst.sdk=v200709110510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.sdk
+feature@org.eclipse.jst.tests=v200709120100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.tests
+feature@org.eclipse.jst=v200709110510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.feature
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/orbitBundles-R200706192011.map b/releng/maps/orbitBundles-R200706192011.map
new file mode 100644
index 0000000..a2e9ea2
--- /dev/null
+++ b/releng/maps/orbitBundles-R200706192011.map
@@ -0,0 +1,232 @@
+!*** This file was created on June 19, 2007 4:27:05 PM EDT
+plugin@com.ibm.icu,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu_3.4.5.jar
+
+plugin@com.ibm.icu,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu_3.6.0.20061215.jar
+
+plugin@com.ibm.icu,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu_3.6.1.v20070417.jar
+
+plugin@com.ibm.icu.base,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu.base_3.4.5.jar
+
+plugin@com.ibm.icu.base,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu.base_3.6.0.20061215.jar
+
+plugin@com.ibm.icu.base,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu.base_3.6.1.v20070417.jar
+
+plugin@com.ibm.icu.base.source,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu.base.source_3.4.5.zip,unpack=true
+
+plugin@com.ibm.icu.base.source,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu.base.source_3.6.0.20061215.zip,unpack=true
+
+plugin@com.ibm.icu.base.source,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu.base.source_3.6.1.v20070417.zip,unpack=true
+
+plugin@com.ibm.icu.source,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu.source_3.4.5.zip,unpack=true
+
+plugin@com.ibm.icu.source,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu.source_3.6.0.20061215.zip,unpack=true
+
+plugin@com.ibm.icu.source,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.ibm.icu.source_3.6.1.v20070417.zip,unpack=true
+
+plugin@com.jcraft.jsch,0.1.28=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.jcraft.jsch_0.1.28.jar
+
+plugin@com.jcraft.jsch,0.1.31=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/com.jcraft.jsch_0.1.31.jar
+
+plugin@javax.activation,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.activation_1.1.0.v200706111329.jar
+
+plugin@javax.mail,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.mail_1.4.0.v200706111329.jar
+
+plugin@javax.management,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.management_1.2.0.v200706111329.jar
+
+plugin@javax.management.remote,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.management.remote_1.0.0.v200706111329.jar
+
+plugin@javax.servlet,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.servlet_2.3.0.v200706111724.jar
+
+plugin@javax.servlet,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.servlet_2.4.0.v200706111738.jar
+
+plugin@javax.servlet.jsp,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.servlet.jsp_1.2.0.v200706111724.jar
+
+plugin@javax.servlet.jsp,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.servlet.jsp_2.0.0.v200706191603.jar
+
+plugin@javax.servlet.jsp.source,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.servlet.jsp.source_1.2.0.v200706111724.zip,unpack=true
+
+plugin@javax.servlet.jsp.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.servlet.jsp.source_2.0.0.v200706191603.zip,unpack=true
+
+plugin@javax.servlet.source,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.servlet.source_2.3.0.v200706111724.zip,unpack=true
+
+plugin@javax.servlet.source,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.servlet.source_2.4.0.v200706111738.zip,unpack=true
+
+plugin@javax.wsdl,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.wsdl_1.4.0.v200706111329.jar
+
+plugin@javax.wsdl,1.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.wsdl_1.5.1.v200706111418.jar
+
+plugin@javax.wsdl15,1.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.wsdl15_1.5.1.v200705290614.jar
+
+plugin@javax.xml.rpc,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.xml.rpc_1.1.0.v200706111329.zip,unpack=true
+
+plugin@javax.xml.soap,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/javax.xml.soap_1.2.0.v200706111329.zip,unpack=true
+
+plugin@net.sourceforge.lpg.lpgjavaruntime,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/net.sourceforge.lpg.lpgjavaruntime_1.0.0.v200706111724.jar
+
+plugin@net.sourceforge.lpg.lpgjavaruntime,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200706111738.jar
+
+plugin@net.sourceforge.lpg.lpgjavaruntime.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/net.sourceforge.lpg.lpgjavaruntime.source_1.0.0.v200706111724.zip,unpack=true
+
+plugin@net.sourceforge.lpg.lpgjavaruntime.source,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/net.sourceforge.lpg.lpgjavaruntime.source_1.1.0.v200706111738.zip,unpack=true
+
+plugin@net.sourceforge.mx4j,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/net.sourceforge.mx4j_3.0.1.v200706111329.jar
+
+plugin@net.sourceforge.mx4j.remote,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/net.sourceforge.mx4j.remote_3.0.1.v200706111329.jar
+
+plugin@org.apache.ant,1.6.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.ant_1.6.5.v200706080840.zip,unpack=true
+
+plugin@org.apache.ant,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.ant_1.7.0.v200706080842.zip,unpack=true
+
+plugin@org.apache.ant.source,1.6.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.ant.source_1.6.5.v200706080840.zip,unpack=true
+
+plugin@org.apache.ant.source,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.ant.source_1.7.0.v200706080842.zip,unpack=true
+
+plugin@org.apache.axis,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.axis_1.4.0.v200706191647.zip,unpack=true
+
+plugin@org.apache.batik.bridge,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.bridge_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.bridge.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.bridge.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.css,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.css_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.css.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.css.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.dom,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.dom_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.dom.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.dom.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.dom.svg,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.dom.svg_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.dom.svg.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.dom.svg.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.ext.awt,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.ext.awt_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.ext.awt.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.ext.awt.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.extension,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.extension_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.extension.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.extension.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.parser,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.parser_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.parser.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.parser.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.pdf,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.pdf_1.6.0.v200706111329.jar
+
+plugin@org.apache.batik.svggen,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.svggen_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.svggen.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.svggen.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.swing,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.swing_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.swing.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.swing.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.transcoder,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.transcoder_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.transcoder.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.transcoder.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.util,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.util_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.util.gui,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.util.gui_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.util.gui.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.util.gui.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.util.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.util.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.batik.xml,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.xml_1.6.0.v200706111724.jar
+
+plugin@org.apache.batik.xml.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.batik.xml.source_1.6.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.commons.codec,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.codec_1.2.0.v200706111724.jar
+
+plugin@org.apache.commons.codec,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.codec_1.3.0.v200706111738.jar
+
+plugin@org.apache.commons.codec.source,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.codec.source_1.2.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.commons.codec.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.codec.source_1.3.0.v200706111738.zip,unpack=true
+
+plugin@org.apache.commons.discovery,0.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.discovery_0.2.0.v200706111329.zip,unpack=true
+
+plugin@org.apache.commons.el,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.el_1.0.0.v200706111724.jar
+
+plugin@org.apache.commons.el.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.el.source_1.0.0.v200706111724.zip,unpack=true
+
+plugin@org.apache.commons.httpclient,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.httpclient_3.0.1.v200706111724.jar
+
+plugin@org.apache.commons.httpclient.source,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.httpclient.source_3.0.1.v200706111724.zip,unpack=true
+
+plugin@org.apache.commons.logging,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.logging_1.0.4.v200706111724.jar
+
+plugin@org.apache.commons.logging.source,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.logging.source_1.0.4.v200706111724.zip,unpack=true
+
+plugin@org.apache.commons.net,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.net_1.4.1.v200706111724.jar
+
+plugin@org.apache.commons.net.source,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.commons.net.source_1.4.1.v200706111724.zip,unpack=true
+
+plugin@org.apache.derby,10.1.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.derby_10.1.2.1_v200706111724.jar
+
+plugin@org.apache.derby.source,10.1.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.derby.source_10.1.2.1_v200706111724.zip,unpack=true
+
+plugin@org.apache.jasper,5.5.17=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.jasper_5.5.17.v200706111724.jar
+
+plugin@org.apache.jasper.source,5.5.17=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.jasper.source_5.5.17.v200706111724.zip,unpack=true
+
+plugin@org.apache.log4j,1.2.13=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.log4j_1.2.13.v200706111418.jar
+
+plugin@org.apache.log4j,1.2.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.log4j_1.2.8.v200706111329.jar
+
+plugin@org.apache.lucene,1.4.3=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.lucene_1.4.3.v200706111738.jar
+
+plugin@org.apache.lucene,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.lucene_1.9.1.v200706111724.jar
+
+plugin@org.apache.lucene.analysis,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.lucene.analysis_1.9.1.v200706181610.jar
+
+plugin@org.apache.lucene.analysis.source,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.lucene.analysis.source_1.9.1.v200706181610.zip,unpack=true
+
+plugin@org.apache.lucene.source,1.4.3=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.lucene.source_1.4.3.v200706111738.zip,unpack=true
+
+plugin@org.apache.lucene.source,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.lucene.source_1.9.1.v200706111724.zip,unpack=true
+
+plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.oro_2.0.8.v200706111724.jar
+
+plugin@org.apache.oro.source,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.oro.source_2.0.8.v200706111724.zip,unpack=true
+
+plugin@org.apache.ws.commons.util,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.ws.commons.util_1.0.0.v200706111329.jar
+
+plugin@org.apache.ws.jaxme,0.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.ws.jaxme_0.5.1.v200706111329.jar
+
+plugin@org.apache.wsil4j,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.wsil4j_1.0.0.v200706111329.jar
+
+plugin@org.apache.xerces,2.8.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.xerces_2.8.0.v200705301630.jar
+
+plugin@org.apache.xml.resolver,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.xml.resolver_1.1.0.v200705310020.jar
+
+plugin@org.apache.xmlrpc,3.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.apache.xmlrpc_3.0.0.v200706111329.jar
+
+plugin@org.junit,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.junit_3.8.1.v200706111724.zip,unpack=true
+
+plugin@org.junit,3.8.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.junit_3.8.2.v200706111738.zip,unpack=true
+
+plugin@org.junit.source,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.junit.source_3.8.1.v200706111724.zip,unpack=true
+
+plugin@org.junit.source,3.8.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.junit.source_3.8.2.v200706111738.zip,unpack=true
+
+plugin@org.mortbay.jetty,5.1.11=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.mortbay.jetty_5.1.11.v200706111724.jar
+
+plugin@org.mortbay.jetty.source,5.1.11=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.mortbay.jetty.source_5.1.11.v200706111724.zip,unpack=true
+
+plugin@org.mozilla.javascript,1.6.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.mozilla.javascript_1.6.2.v200706111329.jar
+
+plugin@org.uddi4j,2.0.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.uddi4j_2.0.5.v200706111329.jar
+
+plugin@org.w3c.css.sac,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.w3c.css.sac_1.3.0.v200706111724.jar
+
+plugin@org.w3c.css.sac.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.w3c.css.sac.source_1.3.0.v200706111724.zip,unpack=true
+
+plugin@org.w3c.dom.smil,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.w3c.dom.smil_1.0.0.v200706111724.jar
+
+plugin@org.w3c.dom.smil.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.w3c.dom.smil.source_1.0.0.v200706111724.zip,unpack=true
+
+plugin@org.w3c.dom.svg,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.w3c.dom.svg_1.1.0.v200706111724.jar
+
+plugin@org.w3c.dom.svg.source,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200706192011/bundles/org.w3c.dom.svg.source_1.1.0.v200706111724.zip,unpack=true
diff --git a/releng/maps/orbitBundles-S200705301823.map b/releng/maps/orbitBundles-S200705301823.map
deleted file mode 100644
index c72f614..0000000
--- a/releng/maps/orbitBundles-S200705301823.map
+++ /dev/null
@@ -1,214 +0,0 @@
-!*** This file was created on May 30, 2007 2:47:14 PM EDT
-plugin@com.ibm.icu,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu_3.4.5.jar
-
-plugin@com.ibm.icu,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu_3.6.0.20061215.jar
-
-plugin@com.ibm.icu,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu_3.6.1.v20070417.jar
-
-plugin@com.ibm.icu.base,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu.base_3.4.5.jar
-
-plugin@com.ibm.icu.base,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu.base_3.6.0.20061215.jar
-
-plugin@com.ibm.icu.base,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu.base_3.6.1.v20070417.jar
-
-plugin@com.ibm.icu.base.source,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu.base.source_3.4.5.zip,unpack=true
-
-plugin@com.ibm.icu.base.source,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu.base.source_3.6.0.20061215.zip,unpack=true
-
-plugin@com.ibm.icu.base.source,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu.base.source_3.6.1.v20070417.zip,unpack=true
-
-plugin@com.ibm.icu.source,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu.source_3.4.5.zip,unpack=true
-
-plugin@com.ibm.icu.source,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu.source_3.6.0.20061215.zip,unpack=true
-
-plugin@com.ibm.icu.source,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.ibm.icu.source_3.6.1.v20070417.zip,unpack=true
-
-plugin@com.jcraft.jsch,0.1.28=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.jcraft.jsch_0.1.28.jar
-
-plugin@com.jcraft.jsch,0.1.31=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/com.jcraft.jsch_0.1.31.jar
-
-plugin@javax.activation,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.activation_1.1.0.v2007053010.jar
-
-plugin@javax.mail,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.mail_1.4.0.v2007053010.jar
-
-plugin@javax.management,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.management_1.2.0.v200705101539.jar
-
-plugin@javax.management.remote,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.management.remote_1.0.0.v200705101539.jar
-
-plugin@javax.servlet,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.servlet_2.3.0.v200705231728.jar
-
-plugin@javax.servlet,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.servlet_2.4.0.v200705291052.jar
-
-plugin@javax.servlet.jsp,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.servlet.jsp_1.2.0.v200705231729.jar
-
-plugin@javax.servlet.jsp,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.servlet.jsp_2.0.0.v200705231728.jar
-
-plugin@javax.servlet.jsp.source,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.servlet.jsp.source_1.2.0.v200705231729.zip,unpack=true
-
-plugin@javax.servlet.jsp.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.servlet.jsp.source_2.0.0.v200705231728.zip,unpack=true
-
-plugin@javax.servlet.source,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.servlet.source_2.3.0.v200705231728.zip,unpack=true
-
-plugin@javax.servlet.source,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.servlet.source_2.4.0.v200705291052.zip,unpack=true
-
-plugin@javax.wsdl,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.wsdl_1.4.0.v200705290610.jar
-
-plugin@javax.wsdl,1.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.wsdl_1.5.1.v200705290627.jar
-
-plugin@javax.wsdl15,1.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.wsdl15_1.5.1.v200705290614.jar
-
-plugin@javax.xml.rpc,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.xml.rpc_1.1.0.v200705290438.zip,unpack=true
-
-plugin@javax.xml.soap,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/javax.xml.soap_1.2.0.v200705290438.zip,unpack=true
-
-plugin@net.sourceforge.lpg.lpgjavaruntime,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/net.sourceforge.lpg.lpgjavaruntime_1.0.0.v200705281837.jar
-
-plugin@net.sourceforge.lpg.lpgjavaruntime,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200705281831.jar
-
-plugin@net.sourceforge.lpg.lpgjavaruntime.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/net.sourceforge.lpg.lpgjavaruntime.source_1.0.0.v200705281837.zip,unpack=true
-
-plugin@net.sourceforge.lpg.lpgjavaruntime.source,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/net.sourceforge.lpg.lpgjavaruntime.source_1.1.0.v200705281831.zip,unpack=true
-
-plugin@net.sourceforge.mx4j,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/net.sourceforge.mx4j_3.0.1.v200704261300.jar
-
-plugin@net.sourceforge.mx4j.remote,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/net.sourceforge.mx4j.remote_3.0.1.v200704261300.jar
-
-plugin@org.apache.ant,1.6.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.ant_1.6.5.v200705232140.zip,unpack=true
-
-plugin@org.apache.ant,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.ant_1.7.0.v200705232135.zip,unpack=true
-
-plugin@org.apache.ant.source,1.6.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.ant.source_1.6.5.v200705232140.zip,unpack=true
-
-plugin@org.apache.ant.source,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.ant.source_1.7.0.v200705232135.zip,unpack=true
-
-plugin@org.apache.axis,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.axis_1.4.0.v200705290418.zip,unpack=true
-
-plugin@org.apache.batik.bridge,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.bridge_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.bridge.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.bridge.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.css,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.css_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.css.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.css.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.dom,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.dom_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.dom.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.dom.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.dom.svg,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.dom.svg_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.dom.svg.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.dom.svg.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.ext.awt,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.ext.awt_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.ext.awt.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.ext.awt.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.extension,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.extension_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.extension.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.extension.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.parser,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.parser_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.parser.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.parser.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.svggen,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.svggen_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.svggen.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.svggen.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.swing,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.swing_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.swing.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.swing.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.transcoder,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.transcoder_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.transcoder.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.transcoder.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.util,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.util_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.util.gui,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.util.gui_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.util.gui.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.util.gui.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.util.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.util.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.batik.xml,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.xml_1.6.0.v200705281827.jar
-
-plugin@org.apache.batik.xml.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.batik.xml.source_1.6.0.v200705281827.zip,unpack=true
-
-plugin@org.apache.commons.codec,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.commons.codec_1.2.0.v200704261300.jar
-
-plugin@org.apache.commons.discovery,0.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.commons.discovery_0.2.0.v200705290438.zip,unpack=true
-
-plugin@org.apache.commons.el,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.commons.el_1.0.0.v200705231731.jar
-
-plugin@org.apache.commons.el.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.commons.el.source_1.0.0.v200705231731.zip,unpack=true
-
-plugin@org.apache.commons.httpclient,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.commons.httpclient_3.0.1.v200703281019.jar
-
-plugin@org.apache.commons.logging,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.commons.logging_1.0.4.v200705231731.jar
-
-plugin@org.apache.commons.logging.source,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.commons.logging.source_1.0.4.v200705231731.zip,unpack=true
-
-plugin@org.apache.commons.net,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.commons.net_1.4.1.v200703150010.jar
-
-plugin@org.apache.derby,10.1.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.derby_10.1.2.1_v200705091015.jar
-
-plugin@org.apache.jasper,5.5.17=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.jasper_5.5.17.v200705231731.jar
-
-plugin@org.apache.jasper.source,5.5.17=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.jasper.source_5.5.17.v200705231731.zip,unpack=true
-
-plugin@org.apache.log4j,1.2.13=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.log4j_1.2.13.v200705290438.jar
-
-plugin@org.apache.lucene,1.4.3=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.lucene_1.4.3.v200705231735.jar
-
-plugin@org.apache.lucene,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.lucene_1.9.1.v200705231731.jar
-
-plugin@org.apache.lucene.analysis,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.lucene.analysis_1.9.1.v200705231731.jar
-
-plugin@org.apache.lucene.analysis.source,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.lucene.analysis.source_1.9.1.v200705231731.zip,unpack=true
-
-plugin@org.apache.lucene.source,1.4.3=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.lucene.source_1.4.3.v200705231735.zip,unpack=true
-
-plugin@org.apache.lucene.source,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.lucene.source_1.9.1.v200705231731.zip,unpack=true
-
-plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.oro_2.0.8.v200703150010.jar
-
-plugin@org.apache.ws.commons.util,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.ws.commons.util_1.0.0.v200705101539.jar
-
-plugin@org.apache.ws.jaxme,0.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.ws.jaxme_0.5.1.v200704261300.jar
-
-plugin@org.apache.wsil4j,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.wsil4j_1.0.0.v200705290418.jar
-
-plugin@org.apache.xerces,2.8.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.xerces_2.8.0.v200705301630.jar
-
-plugin@org.apache.xml.resolver,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.xml.resolver_1.1.0.v200702082200.jar
-
-plugin@org.apache.xmlrpc,3.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.apache.xmlrpc_3.0.0.v200704261300.jar
-
-plugin@org.junit,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.junit_3.8.1.v200705231736.zip,unpack=true
-
-plugin@org.junit,3.8.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.junit_3.8.2.v200705250844.zip,unpack=true
-
-plugin@org.junit.source,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.junit.source_3.8.1.v200705231736.zip,unpack=true
-
-plugin@org.junit.source,3.8.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.junit.source_3.8.2.v200705250844.zip,unpack=true
-
-plugin@org.mortbay.jetty,5.1.11=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.mortbay.jetty_5.1.11.v200705231735.jar
-
-plugin@org.mortbay.jetty.source,5.1.11=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.mortbay.jetty.source_5.1.11.v200705231735.zip,unpack=true
-
-plugin@org.mozilla.javascript,1.6.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.mozilla.javascript_1.6.2.v200705300553.jar
-
-plugin@org.uddi4j,2.0.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.uddi4j_2.0.5.v200705290438.jar
-
-plugin@org.w3c.css.sac,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.w3c.css.sac_1.3.0.v200705281827.jar
-
-plugin@org.w3c.css.sac.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.w3c.css.sac.source_1.3.0.v200705281827.zip,unpack=true
-
-plugin@org.w3c.dom.smil,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.w3c.dom.smil_1.0.0.v200705281827.jar
-
-plugin@org.w3c.dom.smil.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.w3c.dom.smil.source_1.0.0.v200705281827.zip,unpack=true
-
-plugin@org.w3c.dom.svg,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.w3c.dom.svg_1.1.0.v200705281827.jar
-
-plugin@org.w3c.dom.svg.source,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200705301823/bundles/org.w3c.dom.svg.source_1.1.0.v200705281827.zip,unpack=true
diff --git a/releng/maps/wst-doc.map b/releng/maps/wst-doc.map
index 2365c3b..440365f 100644
--- a/releng/maps/wst-doc.map
+++ b/releng/maps/wst-doc.map
@@ -13,29 +13,29 @@
 plugin@org.eclipse.wst.sse.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sse.doc.user
 plugin@org.eclipse.wst.webtools.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.webtools.doc.user
 plugin@org.eclipse.wst.wsdl.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.wsdl.ui.doc.user
-plugin@org.eclipse.wst.wsi.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.wsi.ui.doc.user
+plugin@org.eclipse.wst.wsi.ui.doc.user=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.wsi.ui.doc.user
 plugin@org.eclipse.wst.xmleditor.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.xmleditor.doc.user
 plugin@org.eclipse.wst.xsdeditor.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.xsdeditor.doc.user
 
-plugin@org.eclipse.wst.command.env.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.command.env.doc.user
+plugin@org.eclipse.wst.command.env.doc.user=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.command.env.doc.user
 
 
 !*************** ISV Docs
 
-plugin@org.eclipse.wst.doc.isv=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.doc.isv
+plugin@org.eclipse.wst.doc.isv=v200708291250,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.doc.isv
 
 !*************** Infopops
 
-plugin@org.eclipse.wst.command.env.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.command.env.infopop
-plugin@org.eclipse.wst.common.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.common.infopop
-plugin@org.eclipse.wst.dtd.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.dtd.ui.infopop
-plugin@org.eclipse.wst.html.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.html.ui.infopop
-plugin@org.eclipse.wst.javascript.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.javascript.ui.infopop
+plugin@org.eclipse.wst.command.env.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.command.env.infopop
+plugin@org.eclipse.wst.common.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.common.infopop
+plugin@org.eclipse.wst.dtd.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.dtd.ui.infopop
+plugin@org.eclipse.wst.html.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.html.ui.infopop
+plugin@org.eclipse.wst.javascript.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.javascript.ui.infopop
 plugin@org.eclipse.wst.server.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.server.ui.infopop
-plugin@org.eclipse.wst.sse.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sse.ui.infopop
-plugin@org.eclipse.wst.validation.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.validation.infopop
-plugin@org.eclipse.wst.web.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.web.ui.infopop
-plugin@org.eclipse.wst.ws.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.ws.infopop
-plugin@org.eclipse.wst.xml.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.xml.ui.infopop
+plugin@org.eclipse.wst.sse.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sse.ui.infopop
+plugin@org.eclipse.wst.validation.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.validation.infopop
+plugin@org.eclipse.wst.web.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.web.ui.infopop
+plugin@org.eclipse.wst.ws.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.ws.infopop
+plugin@org.eclipse.wst.xml.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.xml.ui.infopop
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/wst.map b/releng/maps/wst.map
index b375059..16b9f2a 100644
--- a/releng/maps/wst.map
+++ b/releng/maps/wst.map
@@ -1,9 +1,14 @@
 !*************** wst product plugin and assembly features
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-plugin@org.eclipse.wst=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/plugins/org.eclipse.wst
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
 
-feature@org.eclipse.wst.sdk=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.sdk
-feature@org.eclipse.wst.tests.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.feature
-feature@org.eclipse.wst=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.feature
+plugin@org.eclipse.wst=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/plugins/org.eclipse.wst
+
+feature@org.eclipse.wst.sdk=v200709110510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.sdk
+feature@org.eclipse.wst.tests.feature=v200709111138,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.feature
+feature@org.eclipse.wst=v200709110510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.feature
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/wtp-feature-jst-doc.map b/releng/maps/wtp-feature-jst-doc.map
index d96758a..b28d0aa 100644
--- a/releng/maps/wtp-feature-jst-doc.map
+++ b/releng/maps/wtp-feature-jst-doc.map
@@ -1,6 +1,12 @@
 !*************** wtp-feature-jst-doc.map
 
-feature@org.eclipse.jst.doc.isv.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/features/org.eclipse.jst.doc.isv.feature
+! This map file is for 
+! WTP 2.0.x maintenance releases
+
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch:
+
+feature@org.eclipse.jst.doc.isv.feature=v200709111122,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/features/org.eclipse.jst.doc.isv.feature
 feature@org.eclipse.jst.doc.user.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/features/org.eclipse.jst.doc.user.feature
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/wtp-feature-wst-doc.map b/releng/maps/wtp-feature-wst-doc.map
index 05773bb..eb11b9d 100644
--- a/releng/maps/wtp-feature-wst-doc.map
+++ b/releng/maps/wtp-feature-wst-doc.map
@@ -1,6 +1,6 @@
 !*************** wtp-feature-wst-doc.map
 
-feature@org.eclipse.wst.doc.isv.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/features/org.eclipse.wst.doc.isv.feature
+feature@org.eclipse.wst.doc.isv.feature=v200709120100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/features/org.eclipse.wst.doc.isv.feature
 feature@org.eclipse.wst.doc.user.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/features/org.eclipse.wst.doc.user.feature
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/wtp-releng.map b/releng/maps/wtp-releng.map
index 8439d91..2ccab43 100644
--- a/releng/maps/wtp-releng.map
+++ b/releng/maps/wtp-releng.map
@@ -1,9 +1,13 @@
 !*************** wtp-releng.map
 ! This map file is for releng oriented plugins and tests 
 
-feature@org.eclipse.wtp.releng.tests.feature=v200706041905,: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=v200706020611,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.wtp/org.eclipse.wtp.releng.tests
-plugin@org.eclipse.wtp.releng.tools=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,releng.wtptools/org.eclipse.wtp.releng.tools
+feature@org.eclipse.wtp.releng.tests.feature=v200709120100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.wtp/org.eclipse.wtp.releng.tests.feature
+plugin@org.eclipse.callisto.tools.versionchecker=v200709110445,:pserver:anonymous@dev.eclipse.org:/cvsroot/callisto,,org.eclipse.callisto.tools.versionchecker
+plugin@org.eclipse.wtp.releng.tests=v200709110740,: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
+
+plugin@org.eclipse.wtp.releng.tools.component.core=v200709100832,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,releng.wtptools/api/org.eclipse.wtp.releng.tools.component.core
+plugin@org.eclipse.wtp.releng.tools.component.ui=v200709100832,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,releng.wtptools/api/org.eclipse.wtp.releng.tools.component.ui
+plugin@org.eclipse.wtp.releng.wtpbuilder=v200709100832,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,releng.wtptools/api/org.eclipse.wtp.releng.wtpbuilder
 
 !***************
\ No newline at end of file