diff --git a/releng.common/maps/jst-common-component-features.map b/releng.common/maps/jst-common-component-features.map
index 3a66646..f706a5c 100644
--- a/releng.common/maps/jst-common-component-features.map
+++ b/releng.common/maps/jst-common-component-features.map
@@ -1,6 +1,6 @@
 !*************** jst-common-component-features.map
 
-feature@org.eclipse.jst.common_core.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/features/org.eclipse.jst.common_core.feature
-feature@org.eclipse.jst.common_sdk.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/features/org.eclipse.jst.common_sdk.feature
+feature@org.eclipse.jst.common_core.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/features/org.eclipse.jst.common_core.feature
+feature@org.eclipse.jst.common_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/features/org.eclipse.jst.common_sdk.feature
 
 !*************** 
\ No newline at end of file
diff --git a/releng.common/maps/jst-common.map b/releng.common/maps/jst-common.map
index ec90299..309158d 100644
--- a/releng.common/maps/jst-common.map
+++ b/releng.common/maps/jst-common.map
@@ -1,11 +1,10 @@
 !*************** jst-common.map
 
-plugin@org.eclipse.jst.common.annotations.controller=v200604111941,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.controller
-plugin@org.eclipse.jst.common.annotations.core=v200604111941,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.core
-plugin@org.eclipse.jst.common.annotations.ui=v200603271859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.ui
-plugin@org.eclipse.jst.common.frameworks=v200607251457,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.frameworks
-plugin@org.eclipse.jst.common.navigator.java=v200605111842,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.navigator.java
-plugin@org.eclipse.jst.common.project.facet.core=v200602070050,: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=v200709122200,: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 aedf3bb..f5aacab 100644
--- a/releng.common/maps/wst-common-component-features.map
+++ b/releng.common/maps/wst-common-component-features.map
@@ -1,9 +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=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_core.feature
-feature@org.eclipse.wst.common_sdk.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_sdk.feature
-feature@org.eclipse.wst.common_tests.feature=v200602130300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_tests.feature
-feature@org.eclipse.wst.common_ui.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_ui.feature
-feature@org.eclipse.wst.common_userdoc.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_userdoc.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 2ba09a4..b87848a 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=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.core
-plugin@org.eclipse.wst.command.env=v200603071635,: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=v200605101345,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
-plugin@org.eclipse.wst.common.emfworkbench.integration=v200604190008,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
+plugin@org.eclipse.wst.common.emf=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
+plugin@org.eclipse.wst.common.emfworkbench.integration=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
 
-plugin@org.eclipse.wst.common.environment=v200602151541,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.environment
+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=v200605101345,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
-plugin@org.eclipse.wst.common.modulecore=v200605121701,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
-plugin@org.eclipse.wst.common.project.facet.core=v200607251457,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.core
-plugin@org.eclipse.wst.common.uriresolver=v200601310800,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.uriresolver
+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=v200709122200,: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=v200602131700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.cache
+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=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation
+plugin@org.eclipse.wst.validation=v200709122200,: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 dc514a6..7375bcd 100644
--- a/releng.common/maps/wst-common-tests.map
+++ b/releng.common/maps/wst-common-tests.map
@@ -1,12 +1,14 @@
 !*************** wst-common-tests.map
 
-plugin@org.eclipse.wst.common.tests=v200603160230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
-plugin@org.eclipse.wst.common.tests.collector=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.collector
-plugin@org.eclipse.wst.common.tests.ui=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.ui
+plugin@org.eclipse.wst.common.tests=v200707301730,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
+plugin@org.eclipse.wst.common.tests.collector=v200706030600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.collector
+plugin@org.eclipse.wst.common.tests.ui=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.ui
 
-plugin@org.eclipse.wst.common.tests.performance=v200602150410,: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=v20051130_2240,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.snippets.tests
+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=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 4c2eb2f..e8fba72 100644
--- a/releng.common/maps/wst-common-ui.map
+++ b/releng.common/maps/wst-common-ui.map
@@ -1,15 +1,12 @@
 !*************** wst-common-ui.map
 
-plugin@org.eclipse.wst.command.env.ui=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.ui
-plugin@org.eclipse.wst.common.frameworks.ui=v200603102027,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks.ui
-plugin@org.eclipse.wst.common.navigator.views=v200603242204,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.navigator.views
-plugin@org.eclipse.wst.common.navigator.workbench=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.navigator.workbench
-plugin@org.eclipse.wst.common.project.facet.ui=v200604061638,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.ui
-plugin@org.eclipse.wst.common.snippets=v200602062130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.snippets
-plugin@org.eclipse.wst.common.ui.properties=v200602061610,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.ui.properties
-plugin@org.eclipse.wst.common.ui=v200602061610,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.ui
-plugin@org.eclipse.wst.validation.ui=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation.ui
-
-plugin@org.eclipse.wst.internet.proxy=v200602061953,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.proxy
+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=v200709122200,: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=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=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.datatools/maps/wst-database-component-features.map b/releng.datatools/maps/wst-database-component-features.map
deleted file mode 100644
index 512d5f5..0000000
--- a/releng.datatools/maps/wst-database-component-features.map
+++ /dev/null
@@ -1,11 +0,0 @@
-!*************** wst-database-component-features.map
-
-feature@org.eclipse.wst.rdb_core.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/features/org.eclipse.wst.rdb_core.feature
-feature@org.eclipse.wst.rdb_sdk.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/features/org.eclipse.wst.rdb_sdk.feature
-feature@org.eclipse.wst.rdb_tests.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/features/org.eclipse.wst.rdb_tests.feature
-feature@org.eclipse.wst.rdb_ui.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/features/org.eclipse.wst.rdb_ui.feature
-feature@org.eclipse.wst.rdb_userdoc.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/features/org.eclipse.wst.rdb_userdoc.feature
-
-feature@org.eclipse.wst.rdb_adapters.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/features/org.eclipse.wst.rdb_adapters.feature
-
-!*************** 
\ No newline at end of file
diff --git a/releng.datatools/maps/wst-database-core.map b/releng.datatools/maps/wst-database-core.map
deleted file mode 100644
index b612390..0000000
--- a/releng.datatools/maps/wst-database-core.map
+++ /dev/null
@@ -1,8 +0,0 @@
-!*************** wst-database-core.map
-
-plugin@org.eclipse.wst.rdb.core=v200603300011,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.core
-
-plugin@org.eclipse.wst.rdb.models.dbdefinition=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.models.dbdefinition
-plugin@org.eclipse.wst.rdb.models.sql=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.models.sql
-
-!***************
\ No newline at end of file
diff --git a/releng.datatools/maps/wst-database-productadapters.map b/releng.datatools/maps/wst-database-productadapters.map
deleted file mode 100644
index 0a7a510..0000000
--- a/releng.datatools/maps/wst-database-productadapters.map
+++ /dev/null
@@ -1,18 +0,0 @@
-!*************** wst-database-productadapters.map
-
-plugin@org.eclipse.wst.rdb.dbdefinition.db2.iseries=v200602061923,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.dbdefinition.db2.iseries
-plugin@org.eclipse.wst.rdb.dbdefinition.db2.luw=v200602061923,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.dbdefinition.db2.luw
-plugin@org.eclipse.wst.rdb.dbdefinition.db2.zseries=v200602061923,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.dbdefinition.db2.zseries
-plugin@org.eclipse.wst.rdb.dbdefinition.derby=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.dbdefinition.derby
-plugin@org.eclipse.wst.rdb.dbdefinition.informix=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.dbdefinition.informix
-plugin@org.eclipse.wst.rdb.dbdefinition.mysql=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.dbdefinition.mysql
-plugin@org.eclipse.wst.rdb.dbdefinition.oracle=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.dbdefinition.oracle
-plugin@org.eclipse.wst.rdb.dbdefinition.sqlserver=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.dbdefinition.sqlserver
-plugin@org.eclipse.wst.rdb.dbdefinition.sybase=v200603300011,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.dbdefinition.sybase
-
-plugin@org.eclipse.wst.rdb.derby.ui=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.derby.ui
-plugin@org.eclipse.wst.rdb.derby=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.derby
-
-plugin@org.eclipse.wst.rdb.mysql=v200604031853,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.mysql
-
-!***************
\ No newline at end of file
diff --git a/releng.datatools/maps/wst-database-tests.map b/releng.datatools/maps/wst-database-tests.map
deleted file mode 100644
index ebd4531..0000000
--- a/releng.datatools/maps/wst-database-tests.map
+++ /dev/null
@@ -1,5 +0,0 @@
-!*************** wst-database-tests.map
-
-plugin@org.eclipse.wst.rdb.tests.performance=v20051114_1000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/tests/org.eclipse.wst.rdb.tests.performance
-
-!***************
\ No newline at end of file
diff --git a/releng.datatools/maps/wst-database-ui.map b/releng.datatools/maps/wst-database-ui.map
deleted file mode 100644
index 03b1635..0000000
--- a/releng.datatools/maps/wst-database-ui.map
+++ /dev/null
@@ -1,21 +0,0 @@
-!*************** wst-database-ui.map
-
-plugin@org.eclipse.wst.rdb.connection.ui=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.connection.ui
-plugin@org.eclipse.wst.rdb.core.ui=v200603170004,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.core.ui
-
-plugin@org.eclipse.wst.rdb.data.core=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.data.core
-
-plugin@org.eclipse.wst.rdb.data.ui=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.data.ui
-
-plugin@org.eclipse.wst.rdb.fe.ui=v200603300011,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.fe.ui
-plugin@org.eclipse.wst.rdb.fe.ui.actions=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.fe.ui.actions
-
-plugin@org.eclipse.wst.rdb.models.sql.edit=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.models.sql.edit
-
-plugin@org.eclipse.wst.rdb.outputview=v200603170004,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.outputview
-plugin@org.eclipse.wst.rdb.server.extensions=v200603170004,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.server.extensions
-plugin@org.eclipse.wst.rdb.server.ui=v200603142343,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.server.ui
-plugin@org.eclipse.wst.rdb.sqleditor=v200603170004,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.sqleditor
-plugin@org.eclipse.wst.rdb.sqlscrapbook=v200602061859,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/rdb/plugins/org.eclipse.wst.rdb.sqlscrapbook
-
-!***************
\ 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 32dcae9..1718e84 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=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_core.feature
-feature@org.eclipse.jst.enterprise_sdk.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_sdk.feature
-feature@org.eclipse.jst.enterprise_tests.feature=v200602131710,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_tests.feature
-feature@org.eclipse.jst.enterprise_ui.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_ui.feature
-feature@org.eclipse.jst.enterprise_userdoc.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_userdoc.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.jst.enterprise_core.feature=v200709130705,: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=v200709130705,: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 11d4b1b..aa08747 100644
--- a/releng.jeetools/maps/jst-j2ee-advanced.map
+++ b/releng.jeetools/maps/jst-j2ee-advanced.map
@@ -1,17 +1,18 @@
 !*************** jst-j2ee-advanced.map
 
-plugin@org.eclipse.jst.j2ee.ejb=v200604101825,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
-plugin@org.eclipse.jst.ejb.ui=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
-plugin@org.eclipse.jst.j2ee.jca=v200604101825,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
-plugin@org.eclipse.jst.j2ee.webservice=v200604191828,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
-plugin@org.eclipse.jst.j2ee.webservice.ui=v200603242204,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice.ui
-plugin@org.eclipse.jst.j2ee.jca.ui=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca.ui
+plugin@org.eclipse.jst.j2ee.ejb=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
+plugin@org.eclipse.jst.ejb.ui=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
+plugin@org.eclipse.jst.j2ee.jca=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
+plugin@org.eclipse.jst.j2ee.webservice=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
+plugin@org.eclipse.jst.j2ee.webservice.ui=v200709122200,: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=v200607221326,: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=v200604101825,: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=v200604070552,: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=v200607221326,: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=v200602111615,: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=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
+plugin@org.eclipse.jst.jee.ui=v200709122200,: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 616841c..afd4e79 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=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests
-plugin@org.eclipse.jst.j2ee.tests=v200604111941,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
-plugin@org.eclipse.jst.servlet.tests=v200604191828,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
-plugin@org.eclipse.jst.validation.sample=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.sample
-plugin@org.eclipse.jst.validation.test=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.test
-plugin@org.eclipse.jst.j2ee.core.tests.performance=v200602070050,: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=v200602070050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests.performance
+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=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
+plugin@org.eclipse.jst.servlet.tests=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
+plugin@org.eclipse.jst.validation.sample=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.sample
+plugin@org.eclipse.jst.validation.test=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.test
+plugin@org.eclipse.jst.j2ee.core.tests.performance=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 ccfab7d..fb793c2 100644
--- a/releng.jeetools/maps/jst-j2ee-basic.map
+++ b/releng.jeetools/maps/jst-j2ee-basic.map
@@ -1,11 +1,16 @@
 !*************** jst-j2ee-basic.map
 
-plugin@org.eclipse.jst.j2ee.navigator.ui=v200603162001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
-plugin@org.eclipse.jst.j2ee.ui=v200605181036,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
+plugin@org.eclipse.jst.j2ee.navigator.ui=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
+plugin@org.eclipse.jst.j2ee.ui=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
 
-plugin@org.eclipse.jst.j2ee=v200606052202,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
-plugin@org.eclipse.jst.j2ee.core=v200607251457,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v200605211951,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
-plugin@org.eclipse.jst.servlet.ui=v200603132232,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
+plugin@org.eclipse.jst.j2ee=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
+plugin@org.eclipse.jst.j2ee.core=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
+plugin@org.eclipse.jst.j2ee.web=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.servlet.ui=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
+
+plugin@org.eclipse.jst.jee=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
+plugin@org.eclipse.jst.jee.web=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.web
+
+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
new file mode 100644
index 0000000..ced2bc0
--- /dev/null
+++ b/releng.jeetools/maps/jst-jem.map
@@ -0,0 +1,10 @@
+!*************** jst-jem.map
+
+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=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=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 f94c6bc..d660a2d 100644
--- a/releng.jeetools/maps/jst-web-component-features.map
+++ b/releng.jeetools/maps/jst-web-component-features.map
@@ -1,9 +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=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_core.feature
-feature@org.eclipse.jst.web_sdk.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_sdk.feature
-feature@org.eclipse.jst.web_tests.feature=v200602130345,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_tests.feature
-feature@org.eclipse.jst.web_ui.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_ui.feature
-feature@org.eclipse.jst.web_userdoc.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_userdoc.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.jst.web_core.feature=v200709122200,: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.servertools/maps/jst-server-component-features.map b/releng.servertools/maps/jst-server-component-features.map
index 3aeb0b0..805d4df 100644
--- a/releng.servertools/maps/jst-server-component-features.map
+++ b/releng.servertools/maps/jst-server-component-features.map
@@ -1,10 +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=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_core.feature
-feature@org.eclipse.jst.server_sdk.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_sdk.feature
-feature@org.eclipse.jst.server_tests.feature=v200602130400,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_tests.feature
-feature@org.eclipse.jst.server_ui.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_ui.feature
-feature@org.eclipse.jst.server_userdoc.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_userdoc.feature
-feature@org.eclipse.jst.server_adapters.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_adapters.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-tests.map b/releng.servertools/maps/jst-server-tests.map
index 7de036a..f99ffd5 100644
--- a/releng.servertools/maps/jst-server-tests.map
+++ b/releng.servertools/maps/jst-server-tests.map
@@ -1,12 +1,12 @@
 !*************** jst-server-tests.map
 
-plugin@org.eclipse.jst.server.core.tests=v20051129,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.core.tests
-plugin@org.eclipse.jst.server.ui.tests=v20051121,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.ui.tests
+plugin@org.eclipse.jst.server.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.core.tests
+plugin@org.eclipse.jst.server.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.ui.tests
 
-plugin@org.eclipse.jst.server.tomcat.core.tests=v20060312,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.core.tests
-plugin@org.eclipse.jst.server.tomcat.ui.tests=v20051121,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.ui.tests
-plugin@org.eclipse.jst.server.tomcat.tests.performance=v20051121,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.tests.performance
+plugin@org.eclipse.jst.server.tomcat.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.core.tests
+plugin@org.eclipse.jst.server.tomcat.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.ui.tests
+plugin@org.eclipse.jst.server.tomcat.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.tests.performance
 
-plugin@org.eclipse.jst.server.generic.tests=v20060125,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.generic.tests
+plugin@org.eclipse.jst.server.generic.tests=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.generic.tests
 
 !***************
\ No newline at end of file
diff --git a/releng.servertools/maps/jst-server.map b/releng.servertools/maps/jst-server.map
index a376b45..b76dbe0 100644
--- a/releng.servertools/maps/jst-server.map
+++ b/releng.servertools/maps/jst-server.map
@@ -1,15 +1,22 @@
 !*************** jst-server.map
 
-plugin@org.eclipse.jst.server.core=v200605162034,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.core
-plugin@org.eclipse.jst.server.ui=v20060402,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.ui
+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=v20070814b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.preview.adapter
 
-plugin@org.eclipse.jst.server.tomcat.core=v20060402,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.core
-plugin@org.eclipse.jst.server.tomcat.ui=v20060402,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.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.generic.core=v200602112126,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.core
-plugin@org.eclipse.jst.server.generic.ui=v200602131705,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.ui
-plugin@org.eclipse.jst.server.generic.serverdefinitions=v200603162041,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.serverdefinitions
+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=v20060131b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.websphere.core
+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=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
 
 !***************
\ No newline at end of file
diff --git a/releng.servertools/maps/wst-server-component-features.map b/releng.servertools/maps/wst-server-component-features.map
new file mode 100644
index 0000000..b9fc37d
--- /dev/null
+++ b/releng.servertools/maps/wst-server-component-features.map
@@ -0,0 +1,16 @@
+!*************** wst-server-component-features.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
+
+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 daf5fd8..8220a5e 100644
--- a/releng.servertools/maps/wst-server-core.map
+++ b/releng.servertools/maps/wst-server-core.map
@@ -1,7 +1,11 @@
 !*************** wst-server.map
 
-plugin@org.eclipse.wst.internet.monitor.core=v20060312,: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=v20060516c,: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=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 d12449f..558f76f 100644
--- a/releng.servertools/maps/wst-server-tests.map
+++ b/releng.servertools/maps/wst-server-tests.map
@@ -1,12 +1,13 @@
 !*************** wst-server-tests.map
 
-plugin@org.eclipse.wst.internet.monitor.core.tests=v20051102_0220,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/tests/org.eclipse.wst.internet.monitor.core.tests
-plugin@org.eclipse.wst.internet.monitor.ui.tests=v20051102_0220,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/tests/org.eclipse.wst.internet.monitor.ui.tests
+plugin@org.eclipse.wst.internet.monitor.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/tests/org.eclipse.wst.internet.monitor.core.tests
+plugin@org.eclipse.wst.internet.monitor.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/tests/org.eclipse.wst.internet.monitor.ui.tests
 
-plugin@org.eclipse.wst.server.core.tests=v20060312,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.core.tests
-plugin@org.eclipse.wst.server.ui.tests=v20060312,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.ui.tests
-plugin@org.eclipse.wst.server.tests.performance=v20051129,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.tests.performance
+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=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=v20051102_0220,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/tests/org.eclipse.wst.internet.cache.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
 
 !***************
\ No newline at end of file
diff --git a/releng.servertools/maps/wst-server-ui.map b/releng.servertools/maps/wst-server-ui.map
index 9f81496..6e8edf7 100644
--- a/releng.servertools/maps/wst-server-ui.map
+++ b/releng.servertools/maps/wst-server-ui.map
@@ -1,7 +1,9 @@
 !*************** wst-server.map
 
-plugin@org.eclipse.wst.internet.monitor.ui=v20060312,: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=v20060516c,: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
+
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/jst-jsp-tests.map b/releng.sourceediting/maps/jst-jsp-tests.map
index 3af4c18..75a0167 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=v20051207_2145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.core.tests
-plugin@org.eclipse.jst.jsp.ui.tests=v20051129_0030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests
-plugin@org.eclipse.jst.jsp.tests.encoding=v20051129_0030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.tests.encoding
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
 
-plugin@org.eclipse.jst.jsp.ui.tests.performance=v20051102_0220,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests.performance
+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=v200709122337,: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 fd07a66..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=v200603150657,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.core
-plugin@org.eclipse.jst.jsp.ui=v200604040555,: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 2dee0b0..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=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_core.feature
-feature@org.eclipse.wst.web_sdk.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_sdk.feature
-feature@org.eclipse.wst.web_tests.feature=v200602130215,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_tests.feature
-feature@org.eclipse.wst.web_ui.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_ui.feature
-feature@org.eclipse.wst.web_userdoc.feature=v200604280000,: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 f28e4c0..230e8aa 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=v200603160007,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web
-plugin@org.eclipse.wst.css.core=v200602062135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/plugins/org.eclipse.wst.css.core
-plugin@org.eclipse.wst.html.core=v200602062135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/plugins/org.eclipse.wst.html.core
-plugin@org.eclipse.wst.javascript.core=v200602062135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/javascript/plugins/org.eclipse.wst.javascript.core
+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=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
 
+! These bundles are currently being developed and released 
+! from the HEAD stream:
+
+plugin@org.eclipse.wst.web=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-web-tests.map b/releng.sourceediting/maps/wst-web-tests.map
index 060e0ab..7192f4a 100644
--- a/releng.sourceediting/maps/wst-web-tests.map
+++ b/releng.sourceediting/maps/wst-web-tests.map
@@ -1,13 +1,13 @@
 !*************** wst-web-tests.map
 
-plugin@org.eclipse.wst.css.core.tests=v20051129_0031,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.core.tests
-plugin@org.eclipse.wst.css.tests.encoding=v20051129_0031,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.tests.encoding
-plugin@org.eclipse.wst.css.ui.tests=v20051129_1533,: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=v20051102_0220,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.ui.tests.performance
+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=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
 
-plugin@org.eclipse.wst.html.core.tests=v20051129_0031,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.core.tests
-plugin@org.eclipse.wst.html.ui.tests=v20051129_0031,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.ui.tests
-plugin@org.eclipse.wst.html.tests.encoding=v20051129_0031,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.tests.encoding
-plugin@org.eclipse.wst.html.ui.tests.performance=v20051102_0220,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.ui.tests.performance
+plugin@org.eclipse.wst.html.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.core.tests
+plugin@org.eclipse.wst.html.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.ui.tests
+plugin@org.eclipse.wst.html.tests.encoding=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.tests.encoding
+plugin@org.eclipse.wst.html.ui.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.ui.tests.performance
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-web-ui.map b/releng.sourceediting/maps/wst-web-ui.map
index d23b3d3..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=v200607251457,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web.ui
-plugin@org.eclipse.wst.css.ui=v200602062135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/plugins/org.eclipse.wst.css.ui
-plugin@org.eclipse.wst.html.ui=v200604040555,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/plugins/org.eclipse.wst.html.ui
-plugin@org.eclipse.wst.javascript.ui=v200602062135,: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 da2daa7..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=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_core.feature
-feature@org.eclipse.wst.xml_sdk.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_sdk.feature
-feature@org.eclipse.wst.xml_tests.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_tests.feature
-feature@org.eclipse.wst.xml_ui.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_ui.feature
-feature@org.eclipse.wst.xml_userdoc.feature=v200604280000,: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 f6761ce..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
 
-plugin@org.eclipse.wst.dtd.core=v200602041933,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.core
-plugin@org.eclipse.wst.sse.core=v200602041933,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.core
-plugin@org.eclipse.wst.xml.core=v200604050855,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.core
-plugin@org.eclipse.wst.xsd.core=v200602060215,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/plugins/org.eclipse.wst.xsd.core
+! This map file is for 
+! WTP 2.0.x maintenance releases
+
+! 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=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 30b4ab1..04cc4dd 100644
--- a/releng.sourceediting/maps/wst-xml-tests.map
+++ b/releng.sourceediting/maps/wst-xml-tests.map
@@ -1,19 +1,19 @@
 !*************** wst-xml-tests.map
 
-plugin@org.eclipse.wst.sse.core.tests=v20051129_0031,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.core.tests
-plugin@org.eclipse.wst.sse.ui.tests=v20051209_1800,: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=v20051102_0220,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.ui.tests.performance
+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=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=v20051206_0900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.core.tests
-plugin@org.eclipse.wst.xml.ui.tests=v20051209_1800,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.ui.tests
-plugin@org.eclipse.wst.xml.tests.encoding=v200602060233,: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=v20051102_0220,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.ui.tests.performance
-plugin@org.eclipse.wst.xml.validation.tests=v200604050855,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.validation.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
+plugin@org.eclipse.wst.xml.validation.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.validation.tests
 
-plugin@org.eclipse.wst.dtd.ui.tests=v20051129_0031,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/dtd/tests/org.eclipse.wst.dtd.ui.tests
+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=v200603141907,: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=v20060123_1720,: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-thirdparty.map b/releng.sourceediting/maps/wst-xml-thirdparty.map
deleted file mode 100644
index 834b206..0000000
--- a/releng.sourceediting/maps/wst-xml-thirdparty.map
+++ /dev/null
@@ -1,6 +0,0 @@
-!*************** wst-xml-thirdparty.map
-
-plugin@org.apache.xerces=v200602052214,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/thirdparty/org.apache.xerces
-feature@org.apache.xerces.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/thirdparty/org.apache.xerces.feature
-
-!***************
\ 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 9372a4e..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
 
-plugin@org.eclipse.wst.dtd.ui=v200602041933,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.ui
-plugin@org.eclipse.wst.sse.ui=v200602041933,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.ui
-plugin@org.eclipse.wst.xml.ui=v200604050855,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.ui
-plugin@org.eclipse.wst.xsd.ui=v200602061610,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/plugins/org.eclipse.wst.xsd.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.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=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 38e9b94..bb03207 100644
--- a/releng.webservices/maps/jst-ws-tests.map
+++ b/releng.webservices/maps/jst-ws-tests.map
@@ -1,6 +1,8 @@
 !*************** jst-ws-tests.map
 
-plugin@org.eclipse.jst.ws.tests=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests
-plugin@org.eclipse.jst.ws.tests.performance=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests.performance
+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 7d21412..2d30ea9 100644
--- a/releng.webservices/maps/jst-ws.map
+++ b/releng.webservices/maps/jst-ws.map
@@ -1,14 +1,22 @@
 !*************** jst-ws.map
 
-plugin@org.eclipse.jst.ws=v200603071635,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws
-plugin@org.eclipse.jst.ws.axis.consumption.core=v200602062208,: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=v200602062208,: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=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis.creation.ui
-plugin@org.eclipse.jst.ws.consumption=v200602271844,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.consumption
-plugin@org.eclipse.jst.ws.consumption.ui=v20060412140,: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=v200602062000,: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=v200602061953,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.creation.ui
-plugin@org.eclipse.jst.ws.uddiregistry=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.uddiregistry
-plugin@org.eclipse.jst.ws.ui=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.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=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=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=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=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 92146e6..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=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_core.feature
-feature@org.eclipse.wst.ws_sdk.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_sdk.feature
-feature@org.eclipse.wst.ws_tests.feature=v200602130310,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_tests.feature
-feature@org.eclipse.wst.ws_ui.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_ui.feature
-feature@org.eclipse.wst.ws_userdoc.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_userdoc.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 289fbe2..8e4a056 100644
--- a/releng.webservices/maps/wst-ws-core.map
+++ b/releng.webservices/maps/wst-ws-core.map
@@ -1,10 +1,11 @@
 !*************** wst-ws-core.map
 
-plugin@org.eclipse.wst.ws=v200602061953,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws
-plugin@org.eclipse.wst.ws.parser=v200602062000,: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=v200602061610,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl
-plugin@org.eclipse.wst.wsdl.validation=v200603152158,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl.validation
-plugin@org.eclipse.wst.wsi=v200605232210,: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 4cf77a7..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=v20051207_1314,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests
-plugin@org.eclipse.wst.wsdl.tests.ui=v20051102_0220,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests.ui
-plugin@org.eclipse.wst.wsdl.validation.tests=v200603152147,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.validation.tests
-plugin@org.eclipse.wst.wsi.tests=v20060210,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsi/tests/org.eclipse.wst.wsi.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=v20060203_2148,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests.performance
+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=v20051206_1637,: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 dd95fc9..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=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.ui
-plugin@org.eclipse.wst.ws.explorer=v200602061953,: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=v200604061534,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui
-plugin@org.eclipse.wst.wsi.ui=v200601280245,: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 6a0cf85..649ff20 100644
--- a/releng/.project
+++ b/releng/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.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 08fb820..5100e82 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -1 +1 @@
-wtpBuilderVersion=v200607290930_M103
\ No newline at end of file
+wtpBuilderVersion=v200709060223
\ No newline at end of file
diff --git a/releng/maps/dependencies.properties b/releng/maps/dependencies.properties
index 3de4d58..bdb9b2a 100644
--- a/releng/maps/dependencies.properties
+++ b/releng/maps/dependencies.properties
@@ -8,14 +8,14 @@
 #       See the next description for the file
 # file: Name of the library that is used.  If the library is platform dependent
 #       it must have suffixes such as: file.linux.gtk.x86
-#       These suffixes are the same as those useb by releng baseos,basews,basearch
+#       These suffixes are the same as those used by releng baseos,basews,basearch
 #            baseos= linux or win32
 #            basews= gtk or win32
 #            basearch=x86
 # name:  A short user readable name for the library.
 # description:  One line description for the library.
 # autodownload: [optional] default true.  Set this to false if the file cannot be
-#                downloaded automatically (i.e. requies license accept click through).
+#                downloaded automatically (i.e. requires license accept click through).
 #                If autodownload is false, and the library is not avaialbe in the local
 #                repository (cache).  User must download the library and copy it into
 #                the local repository. 
@@ -23,7 +23,7 @@
 #                        that can get deleted from their original URLs.  Releng will use
 #                        the local cache, original url, releng.url in that order to get the
 #                        the dependency.  If a releng.url is not provided, the library will
-#                        always be requested from itrs original site.
+#                        always be requested from its original site.
 # 
 # Example:
 # wtp.url  = http://download.eclipse.org/webtools/downloads/drops/R-0.7-200507290654
@@ -34,6 +34,12 @@
 
 
 #######################################################################################
+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
+
+#######################################################################################
 # SourceForge DITA-OT
 # DITA zip to be downloaded
 # DITA will be used for Eclipse Help
@@ -44,18 +50,23 @@
 dita.description = DITA-OT 1.2.1 Binary ASL Distribution
 #######################################################################################
 
+wtp.eclipse.build.id=M20070912-0800
+wtp.eclipse.build.dir=M20070912-0800
+
 #######################################################################################
 # Eclipse SDK Dependency
 # Eclipse zip to be downloaded
 # Eclipse SDK will be used for building the distribution
 # groupID : eclipse
-eclipse.url  = http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600
-eclipse.file.linux-gtk-x86=eclipse-SDK-3.1.2-linux-gtk.tar.gz
-eclipse.file.linux-gtk-ppc=eclipse-SDK-3.1.2-linux-gtk-ppc.tar.gz
-eclipse.file.win32-win32-x86=eclipse-SDK-3.1.2-win32.zip
-eclipse.file.macosx-carbon-ppc=eclipse-SDK-3.1.2-macosx-carbon.tar.gz
-eclipse.name = Eclipse SDK v3.1.2
-eclipse.description = Eclipse SDK v3.1.2
+eclipse.url  = http://download.eclipse.org/eclipse/downloads/drops/${wtp.eclipse.build.dir}
+#eclipse.releng.url = http://archive.eclipse.org/webtools/downloads/drivers
+eclipse.file.linux-gtk-x86=eclipse-SDK-${wtp.eclipse.build.id}-linux-gtk.tar.gz
+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.1
+eclipse.description = Eclipse SDK v3.3.1
+
 #######################################################################################
 
 #######################################################################################
@@ -63,10 +74,15 @@
 # Eclipse Test Framework support zip to be downloaded
 # Eclipse Test Framework will be used for testing and building the tests
 # groupID : eclipseTestFramework
-eclipseTestFramework.url  = http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600
-eclipseTestFramework.file = eclipse-test-framework-3.1.2.zip
-eclipseTestFramework.name = Eclipse test framework v3.1.2
-eclipseTestFramework.description = Eclipse test framework v3.1.2
+
+eclipseTestFramework.url  = http://download.eclipse.org/eclipse/downloads/drops/${wtp.eclipse.build.dir}
+#eclipseTestFramework.releng.url = http://archive.eclipse.org/webtools/downloads/drivers
+
+eclipseTestFramework.file = eclipse-test-framework-${wtp.eclipse.build.id}.zip
+
+eclipseTestFramework.name = Eclipse test framework v3.3.1 Stream
+eclipseTestFramework.description = Eclipse test framework v3.3.1 Stream
+
 #######################################################################################
 
 #######################################################################################
@@ -74,11 +90,13 @@
 # EMF zip to be downloaded
 # EMF SDO XSD SDK will be used for building the distribution
 # groupID : emf
-emf.url  = http://download.eclipse.org/tools/emf/downloads/drops/2.1.2/R200601191349
-emf.releng.url = http://download.eclipse.org/webtools/downloads/drivers/
-emf.file = emf-sdo-xsd-SDK-2.1.2.zip
-emf.name = EMF SDO XSD sdk v2.1.2
-emf.description = EMF XSD SDO sdk bundle v2.1.2
+
+
+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}
+
 #######################################################################################
 
 #######################################################################################
@@ -86,25 +104,26 @@
 # GEF zip to be downloaded
 # GEF SDK will be used for building the distribution
 # groupID : gef
-gef.url  = http://download.eclipse.org/tools/gef/downloads/drops/R-3.1.1-200509301327
-gef.releng.url = http://download.eclipse.org/webtools/downloads/drivers/
-gef.file = GEF-SDK-3.1.1.zip
-gef.name = GEF sdk v3.1.1
-gef.description = GEF sdk  v3.1.1
+
+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}
+
 #######################################################################################
 
 #######################################################################################
-# Java EMF Model (JEM) Dependency
-# JEM zip to be downloaded
-# JEM SDK will be used for building the distribution
-# groupID : jem
-jem.url  = http://download.eclipse.org/tools/ve/downloads/drops/R-1.1.0.1-200509071822
-jem.releng.url = http://download.eclipse.org/webtools/downloads/drivers/
-jem.file = JEM-SDK-1.1.0.1.zip
-jem.name = JEM sdk v1.1.0.1
-jem.description = JEM sdk v1.1.0.1
-#######################################################################################
+# Eclipse Data Tools Platform (DTP) Dependency
+# DTP zip to be downloaded
+# DTP SDK will be used for building the distribution
+# groupID : dtp
 
+dtp.url  = http://download.eclipse.org/datatools/downloads/drops/N_DTP_1.5.1
+dtp.file = dtp-sdk_1.5.1_N091207.zip
+dtp.name = DTP sdk v1.5.1
+dtp.description = ${dtp.name}
+
+#######################################################################################
 
 #######################################################################################
 # Jakarta Tomcat Dependency
@@ -118,14 +137,14 @@
 #######################################################################################
 
 #######################################################################################
-# Jakarta Tomcat Dependency
+# Apache Tomcat Dependency
 # tomcat zip to be downloaded
 # Tomcat will be used for testing the distribution
 # groupID : tomcat.4
-tomcat.4.url  = http://www.apache.org/dist/tomcat/tomcat-4/v4.1.31/bin/
-tomcat.4.file = jakarta-tomcat-4.1.31.zip
-tomcat.4.name = Jakarta Tomcat v4.1.31
-tomcat.4.description = Jakarta Tomcat v4.1.31
+tomcat.4.url  = http://www.apache.org/dist/tomcat/tomcat-4/v4.1.36/bin/
+tomcat.4.file = apache-tomcat-4.1.36.zip
+tomcat.4.name = Apache Tomcat v4.1.36
+tomcat.4.description = ${tomcat.4.name}
 #######################################################################################
 
 #######################################################################################
@@ -174,28 +193,6 @@
 derby.description = Apache Derby 10.0.2.1
 #######################################################################################
 
-#######################################################################################
-# TPTP
-# Eclipse TPTP Dependency
-# TPTP will be used for API scanning
-# groupID : tptp
-tptp.url  = http://download.eclipse.org/tptp/4.0.0/TPTP-4.0.0-200507181519
-tptp.releng.url  = http://download.eclipse.org/webtools/downloads/drivers
-tptp.file.linux-gtk-x86= tptpdc.linux_ia32-TPTP-4.0.0-200507181519.zip
-tptp.file.linux-gtk-ppc= tptpdc.linux_ppc64-TPTP-4.0.0-200507181519.zip
-tptp.file.win32-win32-x86 = tptpdc.win_ia32-TPTP-4.0.0-200507181519.zip
-tptp.name = TPTP DC v4.0
-tptp.description = TPTP DC v4.0
-
-piagent.url  = http://download.eclipse.org/tptp/4.0.0/TPTP-4.0.0-200507181519
-piagent.releng.url  = http://download.eclipse.org/webtools/downloads/drivers
-piagent.file.linux-gtk-x86= tptpdc.linux_ia32-TPTP-4.0.0-200507181519.zip
-piagent.file.linux-gtk-ppc= tptpdc.linux_ppc64-TPTP-4.0.0-200507181519.zip
-piagent.file.win32-win32-x86 = tptpdc.win_ia32-TPTP-4.0.0-200507181519.zip
-piagent.name = TPTP DC v4.0
-piagent.description = TPTP DC v4.0
-#######################################################################################
-
 #URL to Web Tools downloads
 # non-mirrored site: webtoolsDownloadURL=http://download.eclipse.org/webtools/downloads/drops
 # use mirrored site as follows:
diff --git a/releng/maps/jst-doc.map b/releng/maps/jst-doc.map
index 971b719..3352818 100644
--- a/releng/maps/jst-doc.map
+++ b/releng/maps/jst-doc.map
@@ -2,25 +2,25 @@
 
 !*************** End User Docs
 
-plugin@org.eclipse.jst.ejb.doc.user=v200602140535,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ejb.doc.user
-plugin@org.eclipse.jst.j2ee.doc.user=v200603151728,: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=v200602140535,: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=v200603141929,: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=v200602140535,: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=v200603300335,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.doc.user
+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=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=v200603170730,: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=v200603151700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.j2ee.infopop
-plugin@org.eclipse.jst.jsp.ui.infopop=v200603141929,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.jsp.ui.infopop
-plugin@org.eclipse.jst.server.ui.infopop=v200603141929,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.server.ui.infopop
-plugin@org.eclipse.jst.servlet.ui.infopop=v200604040620,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.servlet.ui.infopop
-plugin@org.eclipse.jst.ws.axis.infopop=v200602140535,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.axis.infopop
-plugin@org.eclipse.jst.ws.consumption.infopop=v200603141929,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.consumption.infopop
-plugin@org.eclipse.jst.ws.infopop=v200602140535,: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 f8c23ad..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=v200602130115,: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=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.sdk
-feature@org.eclipse.jst.tests=v200602130105,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.tests
-feature@org.eclipse.jst=v200607290745,: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/wst-doc.map b/releng/maps/wst-doc.map
index aeb071d..440365f 100644
--- a/releng/maps/wst-doc.map
+++ b/releng/maps/wst-doc.map
@@ -2,44 +2,40 @@
 
 !*************** End User Docs
 
-plugin@org.eclipse.wst.datatools.connection.ui.doc.user=v200602130315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.datatools.connection.ui.doc.user
-plugin@org.eclipse.wst.datatools.data.ui.doc.user=v200602130315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.datatools.data.ui.doc.user
-plugin@org.eclipse.wst.datatools.fe.ui.doc.user=v200602130315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.datatools.fe.ui.doc.user
-plugin@org.eclipse.wst.datatools.server.ui.doc.user=v200602151541,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.datatools.server.ui.doc.user
-plugin@org.eclipse.wst.doc.user=v200602130315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.doc.user
-plugin@org.eclipse.wst.dtdeditor.doc.user=v200603300330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.dtdeditor.doc.user
-plugin@org.eclipse.wst.server.ui.doc.user=v200603151710,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.server.ui.doc.user
-plugin@org.eclipse.wst.sqleditor.doc.user=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sqleditor.doc.user
-plugin@org.eclipse.wst.sse.doc.user=v200602130310,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sse.doc.user
-plugin@org.eclipse.wst.webtools.doc.user=v200604050350,: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=v200602140544,: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=v200603141929,: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=v200603300330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.xmleditor.doc.user
-plugin@org.eclipse.wst.xsdeditor.doc.user=v200603300330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.xsdeditor.doc.user
+plugin@org.eclipse.wst.datatools.connection.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.datatools.connection.ui.doc.user
+plugin@org.eclipse.wst.datatools.data.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.datatools.data.ui.doc.user
+plugin@org.eclipse.wst.datatools.fe.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.datatools.fe.ui.doc.user
+plugin@org.eclipse.wst.datatools.server.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.datatools.server.ui.doc.user
+plugin@org.eclipse.wst.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.doc.user
+plugin@org.eclipse.wst.dtdeditor.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.dtdeditor.doc.user
+plugin@org.eclipse.wst.server.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.server.ui.doc.user
+plugin@org.eclipse.wst.sqleditor.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sqleditor.doc.user
+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=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=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=v200603152237,: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=v200603141929,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.command.env.infopop
-plugin@org.eclipse.wst.common.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.common.infopop
-plugin@org.eclipse.wst.dtd.ui.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.dtd.ui.infopop
-plugin@org.eclipse.wst.html.ui.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.html.ui.infopop
-plugin@org.eclipse.wst.internet.proxy.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.internet.proxy.infopop
-plugin@org.eclipse.wst.javascript.ui.infopop=v200603141929,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.javascript.ui.infopop
-plugin@org.eclipse.wst.rdb.connection.ui.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.rdb.connection.ui.infopop
-plugin@org.eclipse.wst.rdb.fe.ui.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.rdb.fe.ui.infopop
-plugin@org.eclipse.wst.rdb.outputview.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.rdb.outputview.infopop
-plugin@org.eclipse.wst.rdb.server.ui.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.rdb.server.ui.infopop
-plugin@org.eclipse.wst.rdb.sqleditor.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.rdb.sqleditor.infopop
-plugin@org.eclipse.wst.server.ui.infopop=v200603141929,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.server.ui.infopop
-plugin@org.eclipse.wst.sse.ui.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sse.ui.infopop
-plugin@org.eclipse.wst.validation.infopop=v200603141929,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.validation.infopop
-plugin@org.eclipse.wst.web.ui.infopop=v200602130315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.web.ui.infopop
-plugin@org.eclipse.wst.ws.infopop=v200602151541,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.ws.infopop
-plugin@org.eclipse.wst.xml.ui.infopop=v200602140544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.xml.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=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-server-componenet-features.map b/releng/maps/wst-server-componenet-features.map
deleted file mode 100644
index 3205785..0000000
--- a/releng/maps/wst-server-componenet-features.map
+++ /dev/null
@@ -1,9 +0,0 @@
-!*************** wst-server-componenet-features.map
-
-feature@org.eclipse.wst.server_core.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_core.feature
-feature@org.eclipse.wst.server_sdk.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_sdk.feature
-feature@org.eclipse.wst.server_tests.feature=v200602130300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_tests.feature
-feature@org.eclipse.wst.server_ui.feature=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_ui.feature
-feature@org.eclipse.wst.server_userdoc.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_userdoc.feature
-
-!*************** 
\ No newline at end of file
diff --git a/releng/maps/wst-web-thirdparty.map b/releng/maps/wst-web-thirdparty.map
index 41cbd73..39f475c 100644
--- a/releng/maps/wst-web-thirdparty.map
+++ b/releng/maps/wst-web-thirdparty.map
@@ -1,5 +1,5 @@
-!*************** wst-web-thirdparty.map
+!***************  wst-web-thirdparty.map
 
-plugin@org.eclipse.wst.html.standard.dtds=v200602130315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/thirdparty/org.eclipse.wst.html.standard.dtds
+plugin@org.eclipse.wst.standard.schemas=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.standard.schemas
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/wst-ws-thirdparty.map b/releng/maps/wst-ws-thirdparty.map
deleted file mode 100644
index f5cbdaa..0000000
--- a/releng/maps/wst-ws-thirdparty.map
+++ /dev/null
@@ -1,14 +0,0 @@
-!*************** wst-ws-thirdparty.map
-
-plugin@org.apache.wsil4j=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/thirdparty/org.apache.wsil4j
-plugin@org.uddi4j=v200602062000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/thirdparty/org.uddi4j
-plugin@org.wsdl4j=v200602131706,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/thirdparty/org.wsdl4j
-plugin@org.apache.axis=v200602062208,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/thirdparty/org.apache.axis
-
-
-feature@org.apache.wsil4j.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.apache.wsil4j.feature
-feature@org.uddi4j.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.uddi4j.feature
-feature@org.wsdl4j.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.wsdl4j.feature
-feature@org.apache.axis.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.apache.axis.feature
-
-!***************
\ No newline at end of file
diff --git a/releng/maps/wst.map b/releng/maps/wst.map
index cf59abd..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=v200602130115,: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=v200607290745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.sdk
-feature@org.eclipse.wst.tests.feature=v200602130105,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.feature
-feature@org.eclipse.wst=v200607290745,: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 9d859d3..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=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/features/org.eclipse.jst.doc.isv.feature
-feature@org.eclipse.jst.doc.user.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/features/org.eclipse.jst.doc.user.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 548856a..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=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/features/org.eclipse.wst.doc.isv.feature
-feature@org.eclipse.wst.doc.user.feature=v200604280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/features/org.eclipse.wst.doc.user.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
new file mode 100644
index 0000000..2ccab43
--- /dev/null
+++ b/releng/maps/wtp-releng.map
@@ -0,0 +1,13 @@
+!*************** wtp-releng.map
+! This map file is for releng oriented plugins and tests 
+
+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