diff --git a/releng.common/.project b/releng.common/.project
new file mode 100644
index 0000000..06d9316
--- /dev/null
+++ b/releng.common/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>releng.common R2_0_maintenance</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng.common/maps/jst-common-component-features.map b/releng.common/maps/jst-common-component-features.map
index 10faf1a..977f0ae 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=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/features/org.eclipse.jst.common_core.feature
-feature@org.eclipse.jst.common_sdk.feature=v200703280045,: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,,common/features/org.eclipse.jst.common_core.feature
+feature@org.eclipse.jst.common_sdk.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,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 eb8d897..b6841ac 100644
--- a/releng.common/maps/jst-common.map
+++ b/releng.common/maps/jst-common.map
@@ -1,10 +1,19 @@
 !*************** jst-common.map
 
-plugin@org.eclipse.jst.common.annotations.controller=v200702210353,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.controller
-plugin@org.eclipse.jst.common.annotations.core=v200702210353,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.core
-plugin@org.eclipse.jst.common.annotations.ui=v200611230506,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.annotations.ui
-plugin@org.eclipse.jst.common.frameworks=v200704022115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.frameworks
-plugin@org.eclipse.jst.common.project.facet.core=v200702121724,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/common/plugins/org.eclipse.jst.common.project.facet.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.jst.common.annotations.controller=v200708301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.common.annotations.controller
+plugin@org.eclipse.jst.common.annotations.core=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.common.annotations.core
+plugin@org.eclipse.jst.common.annotations.ui=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.common.annotations.ui
+plugin@org.eclipse.jst.common.frameworks=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.common.frameworks
+
+! These bundles are currently being developed and released 
+! from the HEAD stream:
+
+plugin@org.eclipse.jst.common.project.facet.core=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,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 3d21ad7..e4b321c 100644
--- a/releng.common/maps/wst-common-component-features.map
+++ b/releng.common/maps/wst-common-component-features.map
@@ -1,8 +1,13 @@
 !*************** wst-common-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.wst.common_core.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_core.feature
-feature@org.eclipse.wst.common_sdk.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_sdk.feature
-feature@org.eclipse.wst.common_tests.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_tests.feature
-feature@org.eclipse.wst.common_ui.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/features/org.eclipse.wst.common_ui.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.wst.common_core.feature=v200709110622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_core.feature
+feature@org.eclipse.wst.common_sdk.feature=v200709110622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_sdk.feature
+feature@org.eclipse.wst.common_tests.feature=v200709110622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_tests.feature
+feature@org.eclipse.wst.common_ui.feature=v200709110622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,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 897f8e1..2f98128 100644
--- a/releng.common/maps/wst-common-core.map
+++ b/releng.common/maps/wst-common-core.map
@@ -1,20 +1,31 @@
 !*************** wst-common-core.map
 
-plugin@org.eclipse.wst.command.env.core=v200703281725,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.core
-plugin@org.eclipse.wst.command.env=v200703281725,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env
+! This map file is for 
+! WTP 2.0.x maintenance releases
 
-plugin@org.eclipse.wst.common.emf=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emf
-plugin@org.eclipse.wst.common.emfworkbench.integration=v200703240614,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.emfworkbench.integration
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch:
 
-plugin@org.eclipse.wst.common.environment=v200703312112,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.environment
+plugin@org.eclipse.wst.common.emf=v200709131115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.emf
+plugin@org.eclipse.wst.common.emfworkbench.integration=v200711080030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.emfworkbench.integration
 
-plugin@org.eclipse.wst.common.frameworks=v200704041830,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.frameworks
-plugin@org.eclipse.wst.common.modulecore=v200703291130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.modulecore
-plugin@org.eclipse.wst.common.project.facet.core=v200704061751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.core
-plugin@org.eclipse.wst.common.uriresolver=v200703240614,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.uriresolver
+plugin@org.eclipse.wst.common.frameworks=v200710221900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.frameworks
+plugin@org.eclipse.wst.common.modulecore=v200711080030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.modulecore
 
-plugin@org.eclipse.wst.internet.cache=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.cache
+plugin@org.eclipse.wst.validation=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.validation
 
-plugin@org.eclipse.wst.validation=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation
+plugin@org.eclipse.wst.command.env.core=v200707302047,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.command.env.core
+plugin@org.eclipse.wst.command.env=v200710161954,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.command.env
+
+plugin@org.eclipse.wst.common.environment=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.environment
+
+plugin@org.eclipse.wst.internet.cache=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.internet.cache
+
+! These bundles are currently being developed and released 
+! from the HEAD stream:
+
+
+plugin@org.eclipse.wst.common.project.facet.core=v200801082013,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.project.facet.core
+plugin@org.eclipse.wst.common.uriresolver=v200710291445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.uriresolver
 
 !***************
\ 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 c306ba5..bd49e75 100644
--- a/releng.common/maps/wst-common-tests.map
+++ b/releng.common/maps/wst-common-tests.map
@@ -1,14 +1,23 @@
 !*************** wst-common-tests.map
 
-plugin@org.eclipse.wst.common.tests=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests
-plugin@org.eclipse.wst.common.tests.collector=v200702190305,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.collector
-plugin@org.eclipse.wst.common.tests.ui=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.tests.ui
+! This map file is for 
+! WTP 2.0.x maintenance releases
 
-plugin@org.eclipse.wst.common.tests.performance=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/performance-tests/org.eclipse.wst.common.tests.performance
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch:
+
+plugin@org.eclipse.wst.common.tests=v200710312300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.tests
+plugin@org.eclipse.wst.common.tests.collector=v200706030600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.tests.collector
+plugin@org.eclipse.wst.common.tests.ui=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.tests.ui
+
+! These bundles are currently being developed and released 
+! from the HEAD stream:
+
+plugin@org.eclipse.wst.common.tests.performance=v200706071556,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.tests.performance
 
 
-plugin@org.eclipse.wst.common.snippets.tests=v200704101727,: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=v200703051903,: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=v200703051903,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/tests/org.eclipse.wst.common.project.facet.ui.tests
+plugin@org.eclipse.wst.common.snippets.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,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,,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,,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 e765950..6df94fa 100644
--- a/releng.common/maps/wst-common-ui.map
+++ b/releng.common/maps/wst-common-ui.map
@@ -1,12 +1,22 @@
 !*************** wst-common-ui.map
 
-plugin@org.eclipse.wst.command.env.ui=v200703312112,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/command/plugins/org.eclipse.wst.command.env.ui
-plugin@org.eclipse.wst.common.frameworks.ui=v200704092340,: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=v200703051903,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.project.facet.ui
-plugin@org.eclipse.wst.common.snippets=v200704101727,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.snippets
-plugin@org.eclipse.wst.common.ui.properties=v200703312112,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.ui.properties
-plugin@org.eclipse.wst.common.ui=v200703312112,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.ui
-plugin@org.eclipse.wst.validation.ui=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/validation/plugins/org.eclipse.wst.validation.ui
-plugin@org.eclipse.wst.common.core=v200703240614,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/common/plugins/org.eclipse.wst.common.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.common.frameworks.ui=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.frameworks.ui
+plugin@org.eclipse.wst.validation.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.validation.ui
+plugin@org.eclipse.wst.command.env.ui=v200709052219,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.command.env.ui
+
+! These bundles are currently being developed and released 
+! from the HEAD stream:
+
+plugin@org.eclipse.wst.common.project.facet.ui=v200708232226,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.project.facet.ui
+plugin@org.eclipse.wst.common.snippets=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.snippets
+plugin@org.eclipse.wst.common.ui.properties=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.ui.properties
+plugin@org.eclipse.wst.common.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.ui
+plugin@org.eclipse.wst.common.core=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.core
 
 !***************
\ No newline at end of file
diff --git a/releng.dali/.project b/releng.dali/.project
index 65177c3..5bed061 100644
--- a/releng.dali/.project
+++ b/releng.dali/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng.dali</name>
+	<name>releng.dali R1_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng.dali/maps/dali.map b/releng.dali/maps/dali.map
index 5fb9dab..d8d9269 100644
--- a/releng.dali/maps/dali.map
+++ b/releng.dali/maps/dali.map
@@ -1,8 +1,10 @@
 !*************** dali.map
 
-feature@org.eclipse.jpa=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpa
-feature@org.eclipse.jpa.sdk=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpa.sdk
+feature@org.eclipse.jpt=v200709140000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpt
+feature@org.eclipse.jpt.sdk=v200709140000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpt.sdk
+feature@org.eclipse.jpt.tests=v200709140000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpt.tests
 
-plugin@org.eclipse.jpa=v200704090000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/plugins/org.eclipse.jpa
+plugin@org.eclipse.jpt=v200709140000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/plugins/org.eclipse.jpt
 
+!
 !*************** 
\ No newline at end of file
diff --git a/releng.dali/maps/dali.tests.map b/releng.dali/maps/dali.tests.map
deleted file mode 100644
index 3e5e174..0000000
--- a/releng.dali/maps/dali.tests.map
+++ /dev/null
@@ -1,5 +0,0 @@
-!*************** dali.tests.map
-
-feature@org.eclipse.jpa.tests=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/assembly/features/org.eclipse.jpa.tests
-
-!*************** 
diff --git a/releng.dali/maps/jpa.map b/releng.dali/maps/jpa.map
deleted file mode 100644
index f7efe94..0000000
--- a/releng.dali/maps/jpa.map
+++ /dev/null
@@ -1,13 +0,0 @@
-!*************** jpa.map
-
-feature@org.eclipse.jpa.feature=v200704090001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpa.feature
-feature@org.eclipse.jpa_sdk.feature=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpa_sdk.feature
-
-plugin@org.eclipse.jpa.utility=v200703280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.utility
-plugin@org.eclipse.jpa.db=v200703280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.db
-plugin@org.eclipse.jpa.db.ui=v200703060000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.db.ui
-plugin@org.eclipse.jpa.gen=v200703280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.gen
-plugin@org.eclipse.jpa.core=v200704030000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.core
-plugin@org.eclipse.jpa.ui=v200704020000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpa.ui
-
-!***************
\ No newline at end of file
diff --git a/releng.dali/maps/jpa.tests.map b/releng.dali/maps/jpa.tests.map
deleted file mode 100644
index 0ee815c..0000000
--- a/releng.dali/maps/jpa.tests.map
+++ /dev/null
@@ -1,8 +0,0 @@
-!*************** jpa.tests.map
-
-feature@org.eclipse.jpa.tests.feature=v200703070000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpa.tests.feature
-
-plugin@org.eclipse.jpa.utility.tests=v200703280000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpa.utility.tests
-plugin@org.eclipse.jpa.core.tests=v200704030000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpa.core.tests
-
-!*************** 
\ No newline at end of file
diff --git a/releng.dali/maps/jpt.map b/releng.dali/maps/jpt.map
new file mode 100644
index 0000000..e497c05
--- /dev/null
+++ b/releng.dali/maps/jpt.map
@@ -0,0 +1,14 @@
+!*************** jpt.map
+
+feature@org.eclipse.jpt.feature=v200709130000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpt.feature
+feature@org.eclipse.jpt_sdk.feature=v200709130000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpt_sdk.feature
+
+plugin@org.eclipse.jpt.utility=v200709140000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.utility
+plugin@org.eclipse.jpt.db=v200709100000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.db
+plugin@org.eclipse.jpt.db.ui=v200705300001,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.db.ui
+plugin@org.eclipse.jpt.gen=v200712060100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.gen
+plugin@org.eclipse.jpt.core=v200712060100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.core
+plugin@org.eclipse.jpt.ui=v200711140100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui
+plugin@org.eclipse.jpt.doc.user=v200709120000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.doc.user
+
+!***************
\ No newline at end of file
diff --git a/releng.dali/maps/jpt.tests.map b/releng.dali/maps/jpt.tests.map
new file mode 100644
index 0000000..da3e8fc
--- /dev/null
+++ b/releng.dali/maps/jpt.tests.map
@@ -0,0 +1,8 @@
+!*************** jpt.tests.map
+
+feature@org.eclipse.jpt.tests.feature=v200709130000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/features/org.eclipse.jpt.tests.feature
+
+plugin@org.eclipse.jpt.utility.tests=v200709120000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpt.utility.tests
+plugin@org.eclipse.jpt.core.tests=v200709100000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jpa/components/jpa/tests/org.eclipse.jpt.core.tests
+
+!*************** 
\ No newline at end of file
diff --git a/releng.ejbtools/.project b/releng.ejbtools/.project
new file mode 100644
index 0000000..2297e49
--- /dev/null
+++ b/releng.ejbtools/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>releng.ejbtools R2_0_maintenance</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng.ejbtools/maps/jst-enterprise-component-features.map b/releng.ejbtools/maps/jst-enterprise-component-features.map
index 7859eb3..97146f8 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=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_core.feature
-feature@org.eclipse.jst.enterprise_sdk.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_sdk.feature
-feature@org.eclipse.jst.enterprise_tests.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_tests.feature
-feature@org.eclipse.jst.enterprise_ui.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/features/org.eclipse.jst.enterprise_ui.feature
-feature@org.eclipse.jst.enterprise_userdoc.feature=v200703280045,: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,,jeetools/features/org.eclipse.jst.enterprise_core.feature
+feature@org.eclipse.jst.enterprise_sdk.feature=v200709110523,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_sdk.feature
+feature@org.eclipse.jst.enterprise_tests.feature=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_tests.feature
+feature@org.eclipse.jst.enterprise_ui.feature=v200709130705,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_ui.feature
+feature@org.eclipse.jst.enterprise_userdoc.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_userdoc.feature
 
 !*************** 
\ No newline at end of file
diff --git a/releng.jeetools/.project b/releng.jeetools/.project
new file mode 100644
index 0000000..039ddd5
--- /dev/null
+++ b/releng.jeetools/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>releng.jeetools R2_0_maintenance</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng.jeetools/maps/jst-j2ee-advanced.map b/releng.jeetools/maps/jst-j2ee-advanced.map
index 0a47366..607752a 100644
--- a/releng.jeetools/maps/jst-j2ee-advanced.map
+++ b/releng.jeetools/maps/jst-j2ee-advanced.map
@@ -1,18 +1,28 @@
 !*************** jst-j2ee-advanced.map
 
-plugin@org.eclipse.jst.j2ee.ejb=v200703290015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ejb
-plugin@org.eclipse.jst.ejb.ui=v200702211330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
-plugin@org.eclipse.jst.j2ee.jca=v200703290015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca
-plugin@org.eclipse.jst.j2ee.webservice=v200704041830,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice
-plugin@org.eclipse.jst.j2ee.webservice.ui=v200703200431,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.webservice.ui
-plugin@org.eclipse.jst.j2ee.jca.ui=v200703290015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.jca.ui
+! This map file is for
+! WTP 2.0.x maintenance releases
 
-plugin@org.eclipse.jst.j2ee.ejb.annotation.model=v200704020530,: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=v200704020530,: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=v200704020600,: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=v200704020530,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet
-plugin@org.eclipse.jst.j2ee.xdoclet.runtime=v200701300433,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ejb/plugins/org.eclipse.jst.j2ee.xdoclet.runtime
+! These bundles are currently being developed and released
+! from the R2_0_maintenance branch:
 
-plugin@org.eclipse.jst.jee.ejb=v200704041830,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
-plugin@org.eclipse.jst.jee.ui=v200704041830,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.ui
+plugin@org.eclipse.jst.j2ee.ejb=v200710161115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb
+plugin@org.eclipse.jst.ejb.ui=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.ejb.ui
+plugin@org.eclipse.jst.j2ee.jca=v200710221900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.jca
+plugin@org.eclipse.jst.j2ee.webservice=v200710172300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.webservice
+plugin@org.eclipse.jst.j2ee.webservice.ui=v200710312300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.webservice.ui
+plugin@org.eclipse.jst.j2ee.jca.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.jca.ui
+
+plugin@org.eclipse.jst.jee.ejb=v200711080030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.jee.ejb
+plugin@org.eclipse.jst.jee.ui=v200711062330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee.ui
+
+! These bundles are currently being developed and released
+! from the HEAD stream:
+
+plugin@org.eclipse.jst.j2ee.ejb.annotation.model=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb.annotation.model
+plugin@org.eclipse.jst.j2ee.ejb.annotations.emitter=v200708301745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter
+plugin@org.eclipse.jst.j2ee.ejb.annotations.ui=v200706191638,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui
+plugin@org.eclipse.jst.j2ee.ejb.annotations.xdoclet=v200712151529,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet
+plugin@org.eclipse.jst.j2ee.xdoclet.runtime=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.xdoclet.runtime
+
 !***************
\ 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 27025f7..29c0ad1 100644
--- a/releng.jeetools/maps/jst-j2ee-basic-tests.map
+++ b/releng.jeetools/maps/jst-j2ee-basic-tests.map
@@ -1,11 +1,17 @@
 !*************** jst-j2ee-basic-tests.map
 
-plugin@org.eclipse.jst.j2ee.core.tests=v200703241504,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.core.tests
-plugin@org.eclipse.jst.j2ee.tests=v200703291500,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests
-plugin@org.eclipse.jst.servlet.tests=v200703290015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/tests/org.eclipse.jst.servlet.tests
-plugin@org.eclipse.jst.validation.sample=v200606011728,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.sample
-plugin@org.eclipse.jst.validation.test=v200703232245,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.validation.test
-plugin@org.eclipse.jst.j2ee.core.tests.performance=v200607271225,: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=v200606011728,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/tests/org.eclipse.jst.j2ee.tests.performance
+! 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.jst.j2ee.core.tests=v200710312300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.core.tests
+plugin@org.eclipse.jst.j2ee.tests=v200711151630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.tests
+plugin@org.eclipse.jst.servlet.tests=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.servlet.tests
+plugin@org.eclipse.jst.validation.sample=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.validation.sample
+plugin@org.eclipse.jst.validation.test=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.validation.test
+plugin@org.eclipse.jst.j2ee.core.tests.performance=v200707121230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.core.tests.performance
+plugin@org.eclipse.jst.j2ee.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/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 01edfac..bae5b54 100644
--- a/releng.jeetools/maps/jst-j2ee-basic.map
+++ b/releng.jeetools/maps/jst-j2ee-basic.map
@@ -1,16 +1,22 @@
 !*************** jst-j2ee-basic.map
 
-plugin@org.eclipse.jst.j2ee.navigator.ui=v200704020600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.navigator.ui
-plugin@org.eclipse.jst.j2ee.ui=v200704061716,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.ui
+! This map file is for 
+! WTP 2.0.x maintenance releases
 
-plugin@org.eclipse.jst.j2ee=v200704061627,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee
-plugin@org.eclipse.jst.j2ee.core=v200704041830,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v200703290015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.j2ee.web
-plugin@org.eclipse.jst.servlet.ui=v200702210353,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/servlet/plugins/org.eclipse.jst.servlet.ui
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch:
 
-! temporary, to be removed soon
-plugin@org.eclipse.equinox.servlet.api=v20060717,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.equinox.servlet.api
+plugin@org.eclipse.jst.j2ee.navigator.ui=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.navigator.ui
+plugin@org.eclipse.jst.j2ee.ui=v200801111545,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.ui
 
-plugin@org.eclipse.jst.jee=v200704041830,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee
-plugin@org.eclipse.jst.jee.web=v200704041830,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/j2ee/plugins/org.eclipse.jst.jee.web
+plugin@org.eclipse.jst.j2ee=v200711080030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee
+plugin@org.eclipse.jst.j2ee.core=v200710172300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.core
+plugin@org.eclipse.jst.j2ee.web=v200711062330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.servlet.ui=v200710051600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.servlet.ui
+
+plugin@org.eclipse.jst.jee=v200711080030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee
+plugin@org.eclipse.jst.jee.web=v200711080030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee.web
+
+plugin@org.eclipse.jst.standard.schemas=v200706221355,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.standard.schemas
+
 !***************
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-jem.map b/releng.jeetools/maps/jst-jem.map
index c6b16b1..ecfaa35 100644
--- a/releng.jeetools/maps/jst-jem.map
+++ b/releng.jeetools/maps/jst-jem.map
@@ -1,10 +1,16 @@
 !*************** jst-jem.map
 
-bundle@org.eclipse.jem=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem
-bundle@org.eclipse.jem.beaninfo=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.beaninfo
-bundle@org.eclipse.jem.proxy=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.proxy
-bundle@org.eclipse.jem.ui=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.ui
-bundle@org.eclipse.jem.util=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.util
-bundle@org.eclipse.jem.workbench=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/org.eclipse.jem.workbench
-bundle@org.eclipse.jem.tests=v200704010330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jem/tests/org.eclipse.jem.tests
+! 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.jem=v200709051030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem
+plugin@org.eclipse.jem.beaninfo=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem.beaninfo
+plugin@org.eclipse.jem.proxy=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem.proxy
+plugin@org.eclipse.jem.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem.ui
+plugin@org.eclipse.jem.util=v200710051600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.jem.util
+plugin@org.eclipse.jem.workbench=v200710051600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem.workbench
+plugin@org.eclipse.jem.tests=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/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 5fcac72..717a6db 100644
--- a/releng.jeetools/maps/jst-web-component-features.map
+++ b/releng.jeetools/maps/jst-web-component-features.map
@@ -1,8 +1,18 @@
 !*************** jst-web-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.jst.web_core.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_core.feature
-feature@org.eclipse.jst.web_sdk.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_sdk.feature
-feature@org.eclipse.jst.web_tests.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_tests.feature
-feature@org.eclipse.jst.web_ui.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/features/org.eclipse.jst.web_ui.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.jst.web_core.feature=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_core.feature
+feature@org.eclipse.jst.web_sdk.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_sdk.feature
+feature@org.eclipse.jst.web_tests.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_tests.feature
+feature@org.eclipse.jst.web_ui.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_ui.feature
+
+feature@org.eclipse.jst.web_userdoc.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_userdoc.feature
+
+feature@org.eclipse.jst.webpageeditor.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.webpageeditor.feature
+feature@org.eclipse.jst.webpageeditor_sdk.feature=v200709110605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.jsf/.project b/releng.jsf/.project
index 29c420a..232e47d 100644
--- a/releng.jsf/.project
+++ b/releng.jsf/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng-jsf</name>
+	<name>releng.jsf  R1_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng.jsf/maps/jsf-doc.map b/releng.jsf/maps/jsf-doc.map
index 87bfc1e..5272a88 100644
--- a/releng.jsf/maps/jsf-doc.map
+++ b/releng.jsf/maps/jsf-doc.map
@@ -1,9 +1,14 @@
 !*************** wtp jsf  docs map
+! This map file is for 
+! WTP 2.0.1 maintenance releases  
 
-feature@org.eclipse.jst.jsf.doc.feature=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/features/org.eclipse.jst.jsf.doc.feature
+! These bundles are currently being developed and released 
+! from the Root1_0_maintenance branch
 
-plugin@org.eclipse.jst.jsf.doc.user=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.user
-plugin@org.eclipse.jst.jsf.doc.dev=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.dev
+feature@org.eclipse.jst.jsf.doc.feature=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/features/org.eclipse.jst.jsf.doc.feature
+
+plugin@org.eclipse.jst.jsf.doc.user=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.user
+plugin@org.eclipse.jst.jsf.doc.dev=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.dev
 
 
 !*************** 
\ No newline at end of file
diff --git a/releng.jsf/maps/jsf.map b/releng.jsf/maps/jsf.map
index 40ca715..0a1fc98 100644
--- a/releng.jsf/maps/jsf.map
+++ b/releng.jsf/maps/jsf.map
@@ -1,7 +1,12 @@
 !*************** jsf product plugin and assembly features
+! This map file is for 
+! WTP 2.0.1 maintenance releases  
 
-plugin@org.eclipse.jsf=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/plugins/org.eclipse.jsf.branding
+! These bundles are currently being developed and released 
+! from the Root1_0_maintenance branch
 
-feature@org.eclipse.jsf=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/features/org.eclipse.jsf.feature
+plugin@org.eclipse.jsf=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/plugins/org.eclipse.jsf.branding
+
+feature@org.eclipse.jsf=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/features/org.eclipse.jsf.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.jsf/maps/wtp.jsf.map b/releng.jsf/maps/wtp.jsf.map
index 141247f..5ce0bba 100644
--- a/releng.jsf/maps/wtp.jsf.map
+++ b/releng.jsf/maps/wtp.jsf.map
@@ -1,22 +1,25 @@
 !*************** jsf product plugins and features
+! This map file is for 
+! WTP 2.0.1 maintenance releases  
 
+! These bundles are currently being developed and released 
+! from the Root1_0_maintenance branch
 
-plugin@org.eclipse.jst.jsf.core=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.core
-plugin@org.eclipse.jst.jsf.ui=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.ui
+plugin@org.eclipse.jst.jsf.core=v20071019,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.core
+plugin@org.eclipse.jst.jsf.ui=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.ui
 
-plugin@org.eclipse.jst.jsf.facesconfig=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig
-plugin@org.eclipse.jst.jsf.facesconfig.ui=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui
-plugin@org.eclipse.jst.jsf.common=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common
-plugin@org.eclipse.jst.jsf.common.ui=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.ui
+plugin@org.eclipse.jst.jsf.facesconfig=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig
+plugin@org.eclipse.jst.jsf.facesconfig.ui=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui
+plugin@org.eclipse.jst.jsf.common=v20071019,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common
+plugin@org.eclipse.jst.jsf.common.ui=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.ui
 
-plugin@org.eclipse.jst.jsf.standard.tagsupport=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
+plugin@org.eclipse.jst.jsf.standard.tagsupport=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
 
-plugin@org.eclipse.jst.pagedesigner=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner
-plugin@org.eclipse.jst.pagedesigner.jsf.ui=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui
-plugin@org.eclipse.jst.pagedesigner.jsp.core=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core
+plugin@org.eclipse.jst.pagedesigner=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner
+plugin@org.eclipse.jst.pagedesigner.jsf.ui=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui
+plugin@org.eclipse.jst.pagedesigner.jsp.core=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core
 
-
-feature@org.eclipse.jst.jsf.feature=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.feature
-feature@org.eclipse.jst.jsf_sdk.feature=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf_sdk.feature
+feature@org.eclipse.jst.jsf.feature=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.feature
+feature@org.eclipse.jst.jsf_sdk.feature=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf_sdk.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.jsf/maps/wtp.jsf.tests.map b/releng.jsf/maps/wtp.jsf.tests.map
index 26f5620..81b4a78 100644
--- a/releng.jsf/maps/wtp.jsf.tests.map
+++ b/releng.jsf/maps/wtp.jsf.tests.map
@@ -1,13 +1,20 @@
 !*************** wtp jsf tests map
+! This map file is for 
+! WTP 2.0.1 maintenance releases  
 
-feature@org.eclipse.jst.jsf.tests.feature=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.tests.feature
+! These bundles are currently being developed and released 
+! from the Root1_0_maintenance branch
 
-plugin@org.eclipse.jst.jsf.core.tests=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.core.tests
-plugin@org.eclipse.jst.jsf.ui.tests=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.ui.tests
 
-plugin@org.eclipse.jst.jsf.metadata.tests=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadata.tests
-plugin@org.eclipse.jst.jsf.contentassist.tests=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.contentassist.tests
-plugin@org.eclipse.jst.jsf.metadataprocessingtests2=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2
-plugin@org.eclipse.jst.jsf.test.util=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.test.util
+feature@org.eclipse.jst.jsf.tests.feature=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.tests.feature
 
+plugin@org.eclipse.jst.jsf.core.tests=v20070918,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.core.tests
+plugin@org.eclipse.jst.jsf.ui.tests=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.ui.tests
+
+plugin@org.eclipse.jst.jsf.metadata.tests=v20070913,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadata.tests
+plugin@org.eclipse.jst.jsf.contentassist.tests=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.contentassist.tests
+plugin@org.eclipse.jst.jsf.metadataprocessingtests2=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2
+plugin@org.eclipse.jst.jsf.test.util=v20070918,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.test.util
+plugin@org.eclipse.jst.jsf.context.symbol.tests=v20070912,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests
+plugin@org.eclipse.jst.jsf.designtime.tests=v20070921,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.designtime.tests
 !*************** 
\ No newline at end of file
diff --git a/releng.servertools/.project b/releng.servertools/.project
new file mode 100644
index 0000000..298810d
--- /dev/null
+++ b/releng.servertools/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>releng.servertools R2_0_maintenance</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng.servertools/maps/jst-server-component-features.map b/releng.servertools/maps/jst-server-component-features.map
index c6d8ac3..44d9e11 100644
--- a/releng.servertools/maps/jst-server-component-features.map
+++ b/releng.servertools/maps/jst-server-component-features.map
@@ -1,11 +1,16 @@
 !*************** jst-server-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.jst.server_core.feature=v20070328,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_core.feature
-feature@org.eclipse.jst.server_sdk.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_sdk.feature
-feature@org.eclipse.jst.server_tests.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_tests.feature
-feature@org.eclipse.jst.server_ui.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_ui.feature
-feature@org.eclipse.jst.server_userdoc.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_userdoc.feature
-feature@org.eclipse.jst.server_adapters.feature=v200703280045,: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=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/features/org.eclipse.jst.server_adapters.sdk.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.jst.server_core.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_core.feature
+feature@org.eclipse.jst.server_sdk.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_sdk.feature
+feature@org.eclipse.jst.server_tests.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_tests.feature
+feature@org.eclipse.jst.server_ui.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_ui.feature
+feature@org.eclipse.jst.server_userdoc.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_userdoc.feature
+feature@org.eclipse.jst.server_adapters.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_adapters.feature
+feature@org.eclipse.jst.server_adapters.sdk.feature=v200709110550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/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 ba12a96..61ce90d 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=v20070306,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/tests/org.eclipse.jst.server.core.tests
-plugin@org.eclipse.jst.server.ui.tests=v20070306,: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,,servertools/tests/org.eclipse.jst.server.core.tests
+plugin@org.eclipse.jst.server.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.jst.server.ui.tests
 
-plugin@org.eclipse.jst.server.tomcat.core.tests=v20070223,: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=v20070223,: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=v20070223,: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,,servertools/tests/org.eclipse.jst.server.tomcat.core.tests
+plugin@org.eclipse.jst.server.tomcat.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.jst.server.tomcat.ui.tests
+plugin@org.eclipse.jst.server.tomcat.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.jst.server.tomcat.tests.performance
 
-plugin@org.eclipse.jst.server.generic.tests=v20070328b,: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,,servertools/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 499f109..cc2387d 100644
--- a/releng.servertools/maps/jst-server.map
+++ b/releng.servertools/maps/jst-server.map
@@ -1,23 +1,22 @@
 !*************** jst-server.map
 
-plugin@org.eclipse.jst.server.core=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.core
-plugin@org.eclipse.jst.server.ui=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.ui
-plugin@org.eclipse.jst.server.preview=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.preview
+plugin@org.eclipse.jst.server.core=v20070829b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.core
+plugin@org.eclipse.jst.server.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.ui
+plugin@org.eclipse.jst.server.preview.adapter=v20071017b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.preview.adapter
 
-plugin@org.eclipse.jst.server.generic.core=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.core
-plugin@org.eclipse.jst.server.generic.ui=v200701211504,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.ui
+plugin@org.eclipse.jst.server.generic.core=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.core
+plugin@org.eclipse.jst.server.generic.ui=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.ui
 
-plugin@org.eclipse.jst.server.tomcat.core=v20070409,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.core
-plugin@org.eclipse.jst.server.tomcat.ui=v20070328c,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.ui
+plugin@org.eclipse.jst.server.tomcat.core=v20071023,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.tomcat.core
+plugin@org.eclipse.jst.server.tomcat.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.tomcat.ui
 
-plugin@org.eclipse.jst.server.websphere.core=v20070211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.websphere.core
-plugin@org.eclipse.jst.server.generic.jboss=v20070211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.jboss
-plugin@org.eclipse.jst.server.generic.jonas=v20070211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.jonas
-plugin@org.eclipse.jst.server.generic.weblogic=v20070211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.weblogic
-plugin@org.eclipse.jst.server.generic.oc4j=v20070211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.oc4j
+plugin@org.eclipse.jst.server.websphere.core=v20070608,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.websphere.core
+plugin@org.eclipse.jst.server.generic.jboss=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.jboss
+plugin@org.eclipse.jst.server.generic.jonas=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.jonas
+plugin@org.eclipse.jst.server.generic.oc4j=v200709061325,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.oc4j
 
-plugin@org.eclipse.jst.server.installable=v20070117,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/server/plugins/org.eclipse.jst.server.installable
+plugin@org.eclipse.jst.server.installable=v20070608,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/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
+plugin@org.apache.cactus=v200606181221,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/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
index 8f64749..fc22267 100644
--- a/releng.servertools/maps/wst-server-component-features.map
+++ b/releng.servertools/maps/wst-server-component-features.map
@@ -1,9 +1,16 @@
 !*************** wst-server-component-features.map
+! This map file is for 
+! WTP 2.0.x maintenance releases  
 
-feature@org.eclipse.wst.server_core.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_core.feature
-feature@org.eclipse.wst.server_sdk.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_sdk.feature
-feature@org.eclipse.wst.server_tests.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_tests.feature
-feature@org.eclipse.wst.server_ui.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_ui.feature
-feature@org.eclipse.wst.server_userdoc.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/features/org.eclipse.wst.server_userdoc.feature
+! These bundles are currently being developed and released 
+! from the R2_0_maintenance branch
+
+feature@org.eclipse.wst.server_core.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_core.feature
+feature@org.eclipse.wst.server_sdk.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_sdk.feature
+feature@org.eclipse.wst.server_tests.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_tests.feature
+feature@org.eclipse.wst.server_ui.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_ui.feature
+feature@org.eclipse.wst.server_userdoc.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_userdoc.feature
+feature@org.eclipse.wst.server_adapters.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_adapters.feature
+feature@org.eclipse.wst.server_adapters.sdk.feature=v200709110637,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/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 75b8af3..f484f0b 100644
--- a/releng.servertools/maps/wst-server-core.map
+++ b/releng.servertools/maps/wst-server-core.map
@@ -1,9 +1,11 @@
 !*************** wst-server.map
 
-plugin@org.eclipse.wst.internet.monitor.core=v20070328,: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,,servertools/plugins/org.eclipse.wst.internet.monitor.core
 
-plugin@org.eclipse.wst.server.core=v20070403,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.core
-plugin@org.eclipse.wst.server.http.core=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.http.core
+plugin@org.eclipse.wst.server.core=v20080108b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.core
+plugin@org.eclipse.wst.server.http.core=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.http.core
 
+plugin@org.eclipse.wst.server.preview=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.preview
+plugin@org.eclipse.wst.server.preview.adapter=v20070814b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/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 d3ef55e..0847e55 100644
--- a/releng.servertools/maps/wst-server-tests.map
+++ b/releng.servertools/maps/wst-server-tests.map
@@ -1,13 +1,13 @@
 !*************** wst-server-tests.map
 
-plugin@org.eclipse.wst.internet.monitor.core.tests=v20070306,: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=v20070306,: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,,servertools/tests/org.eclipse.wst.internet.monitor.core.tests
+plugin@org.eclipse.wst.internet.monitor.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.internet.monitor.ui.tests
 
-plugin@org.eclipse.wst.server.core.tests=v20070328b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.core.tests
-plugin@org.eclipse.wst.server.ui.tests=v20070306,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.ui.tests
-plugin@org.eclipse.wst.server.tests.performance=v20070306,: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=v20070321,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/tests/org.eclipse.wst.server.http.core.tests
+plugin@org.eclipse.wst.server.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.server.core.tests
+plugin@org.eclipse.wst.server.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.server.ui.tests
+plugin@org.eclipse.wst.server.tests.performance=v20070611,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.server.tests.performance
+plugin@org.eclipse.wst.server.http.core.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.server.http.core.tests
 
-plugin@org.eclipse.wst.internet.cache.tests=v200702112100,: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,,common/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 cdafd6f..c6b4428 100644
--- a/releng.servertools/maps/wst-server-ui.map
+++ b/releng.servertools/maps/wst-server-ui.map
@@ -1,9 +1,9 @@
 !*************** wst-server.map
 
-plugin@org.eclipse.wst.internet.monitor.ui=v20070306,: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,,servertools/plugins/org.eclipse.wst.internet.monitor.ui
 
-plugin@org.eclipse.wst.server.ui=v20070403,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.ui
-plugin@org.eclipse.wst.server.http.ui=v20070404,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/server/plugins/org.eclipse.wst.server.http.ui
+plugin@org.eclipse.wst.server.ui=v20071031b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.ui
+plugin@org.eclipse.wst.server.http.ui=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.http.ui
 
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/.project b/releng.sourceediting/.project
new file mode 100644
index 0000000..1815e93
--- /dev/null
+++ b/releng.sourceediting/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>releng.sourceediting R2_0_maintenance</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng.sourceediting/maps/jst-jsp-tests.map b/releng.sourceediting/maps/jst-jsp-tests.map
index 17080a9..6788c41 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=v200704101709,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.core.tests
-plugin@org.eclipse.jst.jsp.ui.tests=v200704101709,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/tests/org.eclipse.jst.jsp.ui.tests
-plugin@org.eclipse.jst.jsp.tests.encoding=v200704101709,: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=v200704101709,: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,,sourceediting/tests/org.eclipse.jst.jsp.core.tests
+plugin@org.eclipse.jst.jsp.ui.tests=v200709181730,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/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,,sourceediting/tests/org.eclipse.jst.jsp.tests.encoding
+plugin@org.eclipse.jst.jsp.ui.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/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 ddf7f90..fc922e9 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=v200704101709,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/jsp/plugins/org.eclipse.jst.jsp.core
-plugin@org.eclipse.jst.jsp.ui=v200704101709,: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=v200709181730,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.jsp.core
+plugin@org.eclipse.jst.jsp.ui=v200709061102,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/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 49659f5..a7fd497 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=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_core.feature
-feature@org.eclipse.wst.web_sdk.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_sdk.feature
-feature@org.eclipse.wst.web_tests.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_tests.feature
-feature@org.eclipse.wst.web_ui.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/features/org.eclipse.wst.web_ui.feature
-feature@org.eclipse.wst.web_userdoc.feature=v200703280045,: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,,jeetools/features/org.eclipse.wst.web_core.feature
+feature@org.eclipse.wst.web_sdk.feature=v200709111200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_sdk.feature
+feature@org.eclipse.wst.web_tests.feature=v200709111200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_tests.feature
+feature@org.eclipse.wst.web_ui.feature=v200709111200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_ui.feature
+feature@org.eclipse.wst.web_userdoc.feature=v200709111200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/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 fdca211..dd6017b 100644
--- a/releng.sourceediting/maps/wst-web-core.map
+++ b/releng.sourceediting/maps/wst-web-core.map
@@ -1,8 +1,13 @@
 !*************** 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=v200703201029,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web
-plugin@org.eclipse.wst.css.core=v200704012321,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/plugins/org.eclipse.wst.css.core
-plugin@org.eclipse.wst.html.core=v200704012122,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/plugins/org.eclipse.wst.html.core
-plugin@org.eclipse.wst.javascript.core=v200703280731,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/javascript/plugins/org.eclipse.wst.javascript.core
+plugin@org.eclipse.wst.css.core=v200710121808,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.core
+plugin@org.eclipse.wst.html.core=v200801092102,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.core
+plugin@org.eclipse.wst.javascript.core=v200706071955,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.javascript.core
+plugin@org.eclipse.wst.web=v200711150430,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/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 06afd80..ae4820c 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=v200703271345,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.core.tests
-plugin@org.eclipse.wst.css.tests.encoding=v200703280410,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/tests/org.eclipse.wst.css.tests.encoding
-plugin@org.eclipse.wst.css.ui.tests=v200611032108,: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=v200704092340,: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=v200710121808,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.core.tests
+plugin@org.eclipse.wst.css.tests.encoding=v200706071955,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.tests.encoding
+plugin@org.eclipse.wst.css.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.ui.tests
+plugin@org.eclipse.wst.css.ui.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.ui.tests.performance
 
-plugin@org.eclipse.wst.html.core.tests=v200703290237,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.core.tests
-plugin@org.eclipse.wst.html.ui.tests=v200611032108,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/tests/org.eclipse.wst.html.ui.tests
-plugin@org.eclipse.wst.html.tests.encoding=v200611032108,: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=v200704092340,: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=v200709190340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.core.tests
+plugin@org.eclipse.wst.html.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.ui.tests
+plugin@org.eclipse.wst.html.tests.encoding=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.tests.encoding
+plugin@org.eclipse.wst.html.ui.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/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 70fa3ed..a5e4323 100644
--- a/releng.sourceediting/maps/wst-web-ui.map
+++ b/releng.sourceediting/maps/wst-web-ui.map
@@ -1,9 +1,14 @@
 !*************** wst-web-ui.map
 
-plugin@org.eclipse.wst.web.ui=v200702141345,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/web/plugins/org.eclipse.wst.web.ui
-plugin@org.eclipse.wst.css.ui=v200704012122,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/css/plugins/org.eclipse.wst.css.ui
-plugin@org.eclipse.wst.html.ui=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/html/plugins/org.eclipse.wst.html.ui
-plugin@org.eclipse.wst.javascript.ui=v200704012122,: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,,sourceediting/plugins/org.eclipse.wst.css.ui
+plugin@org.eclipse.wst.html.ui=v200708292012,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.ui
+plugin@org.eclipse.wst.javascript.ui=v200709112242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.javascript.ui
+plugin@org.eclipse.wst.web.ui=v200706071630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/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 64485c9..f372b32 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=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_core.feature
-feature@org.eclipse.wst.xml_sdk.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_sdk.feature
-feature@org.eclipse.wst.xml_tests.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_tests.feature
-feature@org.eclipse.wst.xml_ui.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/features/org.eclipse.wst.xml_ui.feature
-feature@org.eclipse.wst.xml_userdoc.feature=v200703280045,: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,,sourceediting/features/org.eclipse.wst.xml_core.feature
+feature@org.eclipse.wst.xml_sdk.feature=v200709110650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_sdk.feature
+feature@org.eclipse.wst.xml_tests.feature=v200709110650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_tests.feature
+feature@org.eclipse.wst.xml_ui.feature=v200709110650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_ui.feature
+feature@org.eclipse.wst.xml_userdoc.feature=v200709110650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/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 ecc32f4..f34e636 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=v200704012122,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.core
-plugin@org.eclipse.wst.sse.core=v200703241528,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.core
-plugin@org.eclipse.wst.xml.core=v200704012122,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.core
-plugin@org.eclipse.wst.xsd.core=v200704012122,: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,,sourceediting/plugins/org.eclipse.wst.dtd.core
+plugin@org.eclipse.wst.sse.core=v200710301256,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
+plugin@org.eclipse.wst.xml.core=v200712180216,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.core
+plugin@org.eclipse.wst.xsd.core=v200710011705,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/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 3221071..838b49a 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=v200702150445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/tests/org.eclipse.wst.sse.core.tests
-plugin@org.eclipse.wst.sse.ui.tests=v200611032108,: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=v200702150445,: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,,sourceediting/tests/org.eclipse.wst.sse.core.tests
+plugin@org.eclipse.wst.sse.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.sse.ui.tests
+plugin@org.eclipse.wst.sse.ui.tests.performance=v200706071955,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.sse.ui.tests.performance
 
-plugin@org.eclipse.wst.xml.core.tests=v200703290237,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.core.tests
-plugin@org.eclipse.wst.xml.ui.tests=v200702150445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.ui.tests
-plugin@org.eclipse.wst.xml.tests.encoding=v200702150514,: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=v200702150445,: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=v200702150445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/tests/org.eclipse.wst.xml.validation.tests
+plugin@org.eclipse.wst.xml.core.tests=v200712180216,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.core.tests
+plugin@org.eclipse.wst.xml.ui.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.ui.tests
+plugin@org.eclipse.wst.xml.tests.encoding=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.tests.encoding
+plugin@org.eclipse.wst.xml.ui.tests.performance=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.ui.tests.performance
+plugin@org.eclipse.wst.xml.validation.tests=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.validation.tests
 
-plugin@org.eclipse.wst.dtd.ui.tests=v200702150445,: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,,sourceediting/tests/org.eclipse.wst.dtd.ui.tests
 
-plugin@org.eclipse.wst.xsd.validation.tests=v200702150445,: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,,sourceediting/tests/org.eclipse.wst.xsd.validation.tests
 
-plugin@org.eclipse.wst.xsd.tests.performance=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xsd/tests/org.eclipse.wst.xsd.tests.performance
+plugin@org.eclipse.wst.xsd.tests.performance=v200709131251,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.tests.performance
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-xml-ui.map b/releng.sourceediting/maps/wst-xml-ui.map
index db97e32..b1fdae8 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=v200704012122,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/dtd/plugins/org.eclipse.wst.dtd.ui
-plugin@org.eclipse.wst.sse.ui=v200704100736,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/sse/plugins/org.eclipse.wst.sse.ui
-plugin@org.eclipse.wst.xml.ui=v200704012122,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/xml/plugins/org.eclipse.wst.xml.ui
-plugin@org.eclipse.wst.xsd.ui=v200704012122,: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,,sourceediting/plugins/org.eclipse.wst.dtd.ui
+plugin@org.eclipse.wst.sse.ui=v200710171732,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.ui
+plugin@org.eclipse.wst.xml.ui=v200710291732,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.ui
+plugin@org.eclipse.wst.xsd.ui=v200709112242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.ui
 
 !*************** 
\ No newline at end of file
diff --git a/releng.webservices/.project b/releng.webservices/.project
new file mode 100644
index 0000000..7f16fd7
--- /dev/null
+++ b/releng.webservices/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>releng.webservices R2_0_maintenance</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng.webservices/maps/jst-ws-tests.map b/releng.webservices/maps/jst-ws-tests.map
index 2ded406..b1283f4 100644
--- a/releng.webservices/maps/jst-ws-tests.map
+++ b/releng.webservices/maps/jst-ws-tests.map
@@ -1,8 +1,12 @@
 !*************** jst-ws-tests.map
+! This map file is for the 
+! WTP 2.0.x maintenance release.
 
-plugin@org.eclipse.jst.ws.tests=v200703290251,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.tests
-plugin@org.eclipse.jst.ws.tests.performance=v200703211956,: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=v200612111951,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/tests/org.eclipse.jst.ws.axis.consumption.core.tests
+! These bundles are currently being developed and released from the R2_0_maintenance branch.
+
+plugin@org.eclipse.jst.ws.tests=v200712182039,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.jst.ws.tests
+plugin@org.eclipse.jst.ws.tests.performance=v200708131547,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.jst.ws.tests.performance
+plugin@org.eclipse.jst.ws.axis.consumption.core.tests=v200707111738,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/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 bc9fedb..bbfc8fe 100644
--- a/releng.webservices/maps/jst-ws.map
+++ b/releng.webservices/maps/jst-ws.map
@@ -1,14 +1,26 @@
 !*************** jst-ws.map
+! This map file is for the 
+! WTP 2.0.x maintenance release.
 
-plugin@org.eclipse.jst.ws=v200703290251,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws
-plugin@org.eclipse.jst.ws.axis.consumption.core=v200702121600,: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=v200703281434,: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=v200703290251,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.axis.creation.ui
-plugin@org.eclipse.jst.ws.consumption=v200704031708,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.consumption
-plugin@org.eclipse.jst.ws.consumption.ui=v200703290251,: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=v200606130315,: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=v200703290251,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.creation.ui
-plugin@org.eclipse.jst.ws.uddiregistry=v200702121600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.uddiregistry
-plugin@org.eclipse.jst.ws.ui=v200703290251,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/ws/plugins/org.eclipse.jst.ws.ui
+! These bundles are currently being developed and released from the R2_0_maintenance branch.
+
+plugin@org.eclipse.jst.ws=v200712220541,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws
+plugin@org.eclipse.jst.ws.axis.consumption.core=v200708151945,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis.consumption.core
+plugin@org.eclipse.jst.ws.axis.consumption.ui=v200711022100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis.consumption.ui
+plugin@org.eclipse.jst.ws.axis.creation.ui=v200711281741,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis.creation.ui
+plugin@org.eclipse.jst.ws.consumption=v200711222108,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.consumption
+plugin@org.eclipse.jst.ws.consumption.ui=v200712220541,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.consumption.ui
+plugin@org.eclipse.jst.ws.creation.ejb.ui=v200706030600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.creation.ejb.ui
+plugin@org.eclipse.jst.ws.creation.ui=v200712220541,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.creation.ui
+plugin@org.eclipse.jst.ws.uddiregistry=v200705311743,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.uddiregistry
+plugin@org.eclipse.jst.ws.ui=v200708202218,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.ui
+
+!*** Axis2 plugins
+plugin@org.eclipse.jst.ws.axis2.consumption.core=v200711232023,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.consumption.core
+plugin@org.eclipse.jst.ws.axis2.consumption.ui=v200709121418,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.consumption.ui
+plugin@org.eclipse.jst.ws.axis2.core=v200711232023,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.core
+plugin@org.eclipse.jst.ws.axis2.creation.core=v200710311655,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.creation.core
+plugin@org.eclipse.jst.ws.axis2.creation.ui=v200710311655,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.creation.ui
+plugin@org.eclipse.jst.ws.axis2.ui=v200708282350,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/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 369c4bc..7c31a54 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=v200703291854,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_core.feature
-feature@org.eclipse.wst.ws_sdk.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_sdk.feature
-feature@org.eclipse.wst.ws_tests.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_tests.feature
-feature@org.eclipse.wst.ws_ui.feature=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/features/org.eclipse.wst.ws_ui.feature
-feature@org.eclipse.wst.ws_userdoc.feature=v200703280045,: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,,webservices/features/org.eclipse.wst.ws_core.feature
+feature@org.eclipse.wst.ws_sdk.feature=v200709051445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_sdk.feature
+feature@org.eclipse.wst.ws_tests.feature=v200709120100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_tests.feature
+feature@org.eclipse.wst.ws_ui.feature=v200709051445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_ui.feature
+feature@org.eclipse.wst.ws_userdoc.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/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 7a44ce5..9e319e0 100644
--- a/releng.webservices/maps/wst-ws-core.map
+++ b/releng.webservices/maps/wst-ws-core.map
@@ -1,10 +1,18 @@
 !*************** wst-ws-core.map
+! This map file is for the 
+! WTP 2.0.x maintenance release.
 
-plugin@org.eclipse.wst.ws=v200703290251,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws
-plugin@org.eclipse.wst.ws.parser=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.parser
+! These bundles are currently being developed and released from the R2_0_maintenance branch.
 
-plugin@org.eclipse.wst.wsdl=v200703201116,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl
-plugin@org.eclipse.wst.wsdl.validation=v200701260315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl.validation
-plugin@org.eclipse.wst.wsi=v200702021430,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsi/plugins/org.eclipse.wst.wsi
+plugin@org.eclipse.wst.ws=v200711140435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.ws
+plugin@org.eclipse.wst.ws.parser=v200706061845,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.ws.parser
+
+
+! These bundles are currently being developed and released from HEAD.
+
+plugin@org.eclipse.wst.wsdl=v200707201214,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.wsdl
+plugin@org.eclipse.wst.wsdl.validation=v200706062140,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.wsdl.validation
+plugin@org.eclipse.wst.wsi=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/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 52d1926..86c65e3 100644
--- a/releng.webservices/maps/wst-ws-tests.map
+++ b/releng.webservices/maps/wst-ws-tests.map
@@ -1,12 +1,19 @@
 !*************** wst-ws-tests.map
+! This map file is for the 
+! WTP 2.0.x maintenance release.
 
-plugin@org.eclipse.wst.wsdl.tests=v200703201116,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests
-plugin@org.eclipse.wst.wsdl.tests.ui=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests.ui
-plugin@org.eclipse.wst.wsdl.validation.tests=v200701260315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.validation.tests
-plugin@org.eclipse.wst.wsi.tests=v20070124,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsi/tests/org.eclipse.wst.wsi.tests
+! These bundles are currently being developed and released from the R2_0_maintenance branch.
 
-plugin@org.eclipse.wst.wsdl.tests.performance=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/tests/org.eclipse.wst.wsdl.tests.performance
+plugin@org.eclipse.wst.ws.tests=v200709052219,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.ws.tests
 
-plugin@org.eclipse.wst.ws.tests=v200704092340,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/tests/org.eclipse.wst.ws.tests
+! These bundles are currently being developed and released from HEAD.
+
+plugin@org.eclipse.wst.wsdl.tests=v200707201214,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsdl.tests
+plugin@org.eclipse.wst.wsdl.tests.ui=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsdl.tests.ui
+plugin@org.eclipse.wst.wsdl.validation.tests=v200706062140,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsdl.validation.tests
+plugin@org.eclipse.wst.wsi.tests=v200705310330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsi.tests
+
+plugin@org.eclipse.wst.wsdl.tests.performance=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsdl.tests.performance
+
 
 !***************
\ 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 227dceb..4dd4e35 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=v200703290251,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/ws/plugins/org.eclipse.wst.ws.ui
-plugin@org.eclipse.wst.ws.explorer=v200703290251,: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=v200703142216,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui
-plugin@org.eclipse.wst.wsi.ui=v200703072029,: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,,webservices/plugins/org.eclipse.wst.ws.ui
+plugin@org.eclipse.wst.ws.explorer=v200711022007,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.ws.explorer
+plugin@org.eclipse.wst.wsdl.ui=v200710171849,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.wsdl.ui
+
+! These bundles are currently being developed and released from HEAD.
+plugin@org.eclipse.wst.wsi.ui=v200706062140,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.wsi.ui
 
 !**********
\ No newline at end of file
diff --git a/releng/.project b/releng/.project
index 9838d30..649ff20 100644
--- a/releng/.project
+++ b/releng/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng</name>
+	<name>releng R2_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng/.settings/org.eclipse.core.resources.prefs b/releng/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3391259
--- /dev/null
+++ b/releng/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Mon Dec 17 18:14:20 EST 2007
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-1
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg
index 1f7de4c..2efd260 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -1,2 +1,33 @@
-wtpBuilderVersion=v200704091825
+builderVersion=v200801111751
 
+eclipse.builder=org.eclipse.releng.basebuilder
+eclipse.builder.version=RC4_33
+# uncomment if its desired to 'force' fetch of eclipse builder
+# (if not already defined from elsewhere)
+eclipse.builder.fetch=true
+
+# WTP specific builder
+wtpBuildTools.url=http://download.eclipse.org/webtools/wtpBuildTools/drops/R3.0/T-T20080103173003-20080103173003/updateSite/plugins
+wtpBuildTools.file=org.eclipse.wtp.releng.tools_1.0.0.v200801031730.jar
+
+#   This parameter is specific to the compiler
+#   being used (JDT Compiler, in our case).
+#   'showversion' causes the version of JDT Compiler to be
+#   printed to the compiler log file.
+#compilerArg=-showversion -encoding ISO-8859-1 -warn:-discouraged,serial,raw
+compilerArg=-showversion -encoding ISO-8859-1 -warn:-serial,raw,typeHiding,unchecked
+
+#############################################################
+# Other inline resolved properties
+pde.builder.path=${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}
+# Beginning with 33M5, the startup.jar was removed. Currently, in basebuilder,
+# this launcher is provided without version number. If we ever move to use plain
+# eclipse, we'll need a bit of script find and rename (or set the variable).
+# to ever "go backwards" this one variable could be ${pde.builder.path}/startup.jar
+eclipse.launcher=${pde.builder.path}/plugins/org.eclipse.equinox.launcher.jar
+#eclipse.launcher=${pde.builder.path}/startup.jar
+
+# in 3.2 based builds, pde's directory no longer has version number
+#pde.build.scripts=${pde.builder.path}/plugins/org.eclipse.pde.build_${eclipse.base.version}/scripts
+pde.build.scripts=${pde.builder.path}/plugins/org.eclipse.pde.build/scripts
+buildDirectory=${env.PROJECT_PROJECTS}/${projectname}/workdir
diff --git a/releng/maps/dependencies.properties b/releng/maps/dependencies.properties
index 157bcd3..603fdb7 100644
--- a/releng/maps/dependencies.properties
+++ b/releng/maps/dependencies.properties
@@ -32,30 +32,25 @@
 # wtp.description = WTP 0.7 SDK distribution
 #######################################################################################
 
-wtpBuildTools.url  = http://download.eclipse.org/webtools/wtpBuildTools/drops/R2.0/T-T200704090413-200704090413/updateSite/plugins
-wtpBuildTools.file = org.eclipse.wtp.releng.tools_1.0.0.v200704090411.jar
-wtpBuildTools.name = wtp build tools
-wtpBuildTools.description = wtp build tools
 
 #######################################################################################
-orbitthirdpartymap.url  = http://download.eclipse.org/tools/orbit/downloads/drops/S200703161546
-orbitthirdpartymap.file = orbitBundles-S200703161546.map
+
+orbitthirdpartyzip.build.dir = R200706192011
+orbitthirdpartyzip.build.id = R200706192011
+
+orbitthirdpartyzip.mirror.prefixuri = /tools/orbit/downloads/drops/${orbitthirdpartyzip.build.dir}
+orbitthirdpartyzip.url  = http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
+orbitthirdpartyzip.file = orbit-${orbitthirdpartyzip.build.id}.zip
+orbitthirdpartyzip.name = Orbit thirdparty zip
+orbitthirdpartyzip.description = Orbit thirdparty zip
+orbitthirdpartyzip.build.home = http://download.eclipse.org/tools/orbit/
+
+
+orbitthirdpartymap.url  = http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
+orbitthirdpartymap.file = orbitBundles-${orbitthirdpartyzip.build.id}.map
 orbitthirdpartymap.name = orbit thirdparty map
 orbitthirdpartymap.description = orbit thirdparty map
 
-#######################################################################################
-thirdparty.url  = http://download.eclipse.org/webtools/downloads/drops/R2.0/T-T200704052007-200704052007
-thirdparty.file = wtp-thirdpartyAssembly-T-T200704052007-200704052007.zip
-thirdparty.name = wst thirdparty jars
-thirdparty.description = wst thirdparty jars
-#######################################################################################
-
-#######################################################################################
-orbitthirdparty.url  = http://download.eclipse.org/tools/orbit/downloads/drops/S200703161546
-orbitthirdparty.file = orbit-S200703161546.zip
-orbitthirdparty.name = orbit thirdparty jars
-orbitthirdparty.description = orbit thirdparty jars
-#######################################################################################
 
 #######################################################################################
 # SourceForge DITA-OT
@@ -68,22 +63,23 @@
 dita.description = DITA-OT 1.2.1 Binary ASL Distribution
 #######################################################################################
 
-wtp.eclipse.build.id=3.3M6
-wtp.eclipse.build.dir=S-3.3M6-200703231616
+wtp.eclipse.build.id=M20071205-0800
+wtp.eclipse.build.dir=M20071205-0800
+eclipse.name = Eclipse SDK v3.3.2
+eclipse.description = Eclipse SDK v3.3.2
 
 #######################################################################################
 # 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/${wtp.eclipse.build.dir}
-#eclipse.releng.url = http://archive.eclipse.org/webtools/downloads/drivers
+eclipse.mirror.prefixuri=/eclipse/downloads/drops/${wtp.eclipse.build.dir}
+eclipse.url  = http://download.eclipse.org${eclipse.mirror.prefixuri}
 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 M6
-eclipse.description = Eclipse SDK v3.3 M6
+eclipse.build.home = http://download.eclipse.org/eclipse/downloads/
 
 #######################################################################################
 
@@ -93,27 +89,38 @@
 # Eclipse Test Framework will be used for testing and building the tests
 # groupID : eclipseTestFramework
 
-eclipseTestFramework.url  = http://download.eclipse.org/eclipse/downloads/drops/${wtp.eclipse.build.dir}
-#eclipseTestFramework.releng.url = http://archive.eclipse.org/webtools/downloads/drivers
-
+eclipseTestFramework.url  = http://download.eclipse.org${eclipse.mirror.prefixuri}
 eclipseTestFramework.file = eclipse-test-framework-${wtp.eclipse.build.id}.zip
 
-eclipseTestFramework.name = Eclipse test framework v3.3 Stream
-eclipseTestFramework.description = Eclipse test framework v3.3 Stream
+eclipseTestFramework.name = Eclipse test framework v3.3.1 Stream
+eclipseTestFramework.description = Eclipse test framework v3.3.1 Stream
 
 #######################################################################################
 
 #######################################################################################
+# Eclipse releng tool 
+# purely a handy link for committers
+
+eclipsereleng.url  = http://download.eclipse.org${eclipse.mirror.prefixuri}
+eclipsereleng.file = org.eclipse.releng.tools-${wtp.eclipse.build.id}.zip
+eclipsereleng.name = Eclipse releng tool v3.4 Stream
+eclipsereleng.description = ${eclipsereleng.name}
+}
+#######################################################################################
+
+#######################################################################################
 # Eclipse Modeling Framework (EMF) Dependency
 # EMF zip to be downloaded
 # EMF SDO XSD SDK will be used for building the distribution
 # groupID : emf
 
+emf.mirror.prefixuri = /modeling/emf/emf/downloads/drops/2.3.2/M200711272020
+emf.file = emf-sdo-xsd-SDK-M200711272020.zip
+emf.name = EMF SDO XSD sdk v2.3.2 
 
-emf.url  = http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.3.0/S200703291501/
-emf.file = emf-sdo-xsd-SDK-2.3.0M6.zip
-emf.name = EMF SDO XSD sdk v2.3 M6
+emf.url  = http://download.eclipse.org${emf.mirror.prefixuri}
 emf.description = ${emf.name}
+emf.build.home = http://www.eclipse.org/modeling/emf/downloads/
 
 #######################################################################################
 
@@ -123,10 +130,13 @@
 # GEF SDK will be used for building the distribution
 # groupID : gef
 
-gef.url  = http://download.eclipse.org/tools/gef/downloads/drops/S-3.3M6-200703300740
-gef.file = 	GEF-SDK-3.3M6.zip
-gef.name = GEF SDK 3.3 M6
+gef.mirror.prefixuri= /tools/gef/downloads/drops/R-3.3.1-200709241000
+gef.file = GEF-SDK-3.3.1.zip
+gef.name = GEF-SDK-3.3.1.zip
+
+gef.url  = http://download.eclipse.org${gef.mirror.prefixuri}
 gef.description = ${gef.name}
+gef.build.home = http://download.eclipse.org/tools/gef/downloads/
 
 #######################################################################################
 
@@ -136,10 +146,13 @@
 # DTP SDK will be used for building the distribution
 # groupID : dtp
 
-dtp.url  = http://download.eclipse.org/datatools/downloads/1.5
-dtp.file = dtp-sdk_1.5M6.zip
-dtp.name = DTP sdk v1.5 M6
+dtp.mirror.prefixuri = /datatools/downloads/1.5
+dtp.file = dtp-sdk_1.5.1_101607.zip
+dtp.name = DTP sdk v1.5.1
+
+dtp.url  = http://download.eclipse.org${dtp.mirror.prefixuri}
 dtp.description = ${dtp.name}
+dtp.build.home = http://www.eclipse.org/datatools/downloads.html
 
 #######################################################################################
 
@@ -155,14 +168,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}
 #######################################################################################
 
 #######################################################################################
diff --git a/releng/maps/jst-doc.map b/releng/maps/jst-doc.map
index 8a2e6d1..9740e6a 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=v200609221652,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ejb.doc.user
-plugin@org.eclipse.jst.j2ee.doc.user=v200704050356,: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=v200609221652,: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=v200609221652,: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=v200609221652,: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=v200609221652,: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,,ejbtools/docs/org.eclipse.jst.ejb.doc.user
+plugin@org.eclipse.jst.j2ee.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/docs/org.eclipse.jst.j2ee.doc.user
+plugin@org.eclipse.jst.server.ui.doc.user=v200708161939,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.jst.server.ui.doc.user
+plugin@org.eclipse.jst.ws.axis.ui.doc.user=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/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,,webservices/docs/org.eclipse.jst.ws.consumption.ui.doc.user
+plugin@org.eclipse.jst.ws.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.doc.user
 
 !*************** ISV Docs
 
-plugin@org.eclipse.jst.doc.isv=v200703251954,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.doc.isv
+plugin@org.eclipse.jst.doc.isv=v200712120948,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/docs/org.eclipse.jst.doc.isv
 
 !*************** Infopops
 
-plugin@org.eclipse.jst.j2ee.infopop=v200611161440,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.j2ee.infopop
-plugin@org.eclipse.jst.jsp.ui.infopop=v200605040115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.jsp.ui.infopop
-plugin@org.eclipse.jst.server.ui.infopop=v200605040115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.server.ui.infopop
-plugin@org.eclipse.jst.servlet.ui.infopop=v200606130315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.servlet.ui.infopop
-plugin@org.eclipse.jst.ws.axis.infopop=v200605152241,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.axis.infopop
-plugin@org.eclipse.jst.ws.consumption.infopop=v20070131,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/plugins/org.eclipse.jst.ws.consumption.infopop
-plugin@org.eclipse.jst.ws.infopop=v200605162034,: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,,jeetools/docs/org.eclipse.jst.j2ee.infopop
+plugin@org.eclipse.jst.jsp.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.jst.jsp.ui.infopop
+plugin@org.eclipse.jst.server.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.jst.server.ui.infopop
+plugin@org.eclipse.jst.servlet.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/docs/org.eclipse.jst.servlet.ui.infopop
+plugin@org.eclipse.jst.ws.axis.infopop=v200708222303,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.axis.infopop
+plugin@org.eclipse.jst.ws.consumption.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.consumption.infopop
+plugin@org.eclipse.jst.ws.infopop=v200709190403,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.infopop
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/jst.map b/releng/maps/jst.map
index 4517c37..47b8757 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=v200702280324,: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,,webtools.releng/assembly/plugins/org.eclipse.jst
 
-feature@org.eclipse.jst.sdk=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.sdk
-feature@org.eclipse.jst.tests=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/assembly/features/org.eclipse.jst.tests
-feature@org.eclipse.jst=v200703280045,: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,,webtools.releng/assembly/features/org.eclipse.jst.sdk
+feature@org.eclipse.jst.tests=v200709120100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.jst.tests
+feature@org.eclipse.jst=v200709110510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/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 2dff7b3..4493e00 100644
--- a/releng/maps/wst-doc.map
+++ b/releng/maps/wst-doc.map
@@ -2,40 +2,40 @@
 
 !*************** End User Docs
 
-plugin@org.eclipse.wst.datatools.connection.ui.doc.user=v200608302305,: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=v200608302305,: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=v200608302305,: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=v200608302305,: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=v200704052047,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.doc.user
-plugin@org.eclipse.wst.dtdeditor.doc.user=v200703241514,: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=v200704050456,: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=v200608302305,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sqleditor.doc.user
-plugin@org.eclipse.wst.sse.doc.user=v200703241514,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sse.doc.user
-plugin@org.eclipse.wst.webtools.doc.user=v200609221652,: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=v200609221652,: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=v200609221652,: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=v200704050501,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.xmleditor.doc.user
-plugin@org.eclipse.wst.xsdeditor.doc.user=v200704050441,: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,,datatools/docs/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,,datatools/docs/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,,datatools/docs/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,,datatools/docs/org.eclipse.wst.datatools.server.ui.doc.user
+plugin@org.eclipse.wst.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/docs/org.eclipse.wst.doc.user
+plugin@org.eclipse.wst.dtdeditor.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.dtdeditor.doc.user
+plugin@org.eclipse.wst.server.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.wst.server.ui.doc.user
+plugin@org.eclipse.wst.sqleditor.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,datatools/docs/org.eclipse.wst.sqleditor.doc.user
+plugin@org.eclipse.wst.sse.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.sse.doc.user
+plugin@org.eclipse.wst.webtools.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/docs/org.eclipse.wst.webtools.doc.user
+plugin@org.eclipse.wst.wsdl.ui.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.wst.wsdl.ui.doc.user
+plugin@org.eclipse.wst.wsi.ui.doc.user=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.wst.wsi.ui.doc.user
+plugin@org.eclipse.wst.xmleditor.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.xmleditor.doc.user
+plugin@org.eclipse.wst.xsdeditor.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.xsdeditor.doc.user
 
-plugin@org.eclipse.wst.command.env.doc.user=v200611161425,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.command.env.doc.user
+plugin@org.eclipse.wst.command.env.doc.user=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/docs/org.eclipse.wst.command.env.doc.user
 
 
 !*************** ISV Docs
 
-plugin@org.eclipse.wst.doc.isv=v200703251858,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.doc.isv
+plugin@org.eclipse.wst.doc.isv=v200712120948,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/docs/org.eclipse.wst.doc.isv
 
 !*************** Infopops
 
-plugin@org.eclipse.wst.command.env.infopop=v200605070230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.command.env.infopop
-plugin@org.eclipse.wst.common.infopop=v200605270041,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.common.infopop
-plugin@org.eclipse.wst.dtd.ui.infopop=v200605040131,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.dtd.ui.infopop
-plugin@org.eclipse.wst.html.ui.infopop=v200605040131,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.html.ui.infopop
-plugin@org.eclipse.wst.javascript.ui.infopop=v200605040131,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.javascript.ui.infopop
-plugin@org.eclipse.wst.server.ui.infopop=v200704050413,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.server.ui.infopop
-plugin@org.eclipse.wst.sse.ui.infopop=v200605040131,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.sse.ui.infopop
-plugin@org.eclipse.wst.validation.infopop=v200609292131,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.validation.infopop
-plugin@org.eclipse.wst.web.ui.infopop=v200605070230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.web.ui.infopop
-plugin@org.eclipse.wst.ws.infopop=v20070131,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/plugins/org.eclipse.wst.ws.infopop
-plugin@org.eclipse.wst.xml.ui.infopop=v200605040131,: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,,common/docs/org.eclipse.wst.command.env.infopop
+plugin@org.eclipse.wst.common.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.infopop
+plugin@org.eclipse.wst.dtd.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.dtd.ui.infopop
+plugin@org.eclipse.wst.html.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.html.ui.infopop
+plugin@org.eclipse.wst.javascript.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.javascript.ui.infopop
+plugin@org.eclipse.wst.server.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.wst.server.ui.infopop
+plugin@org.eclipse.wst.sse.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.sse.ui.infopop
+plugin@org.eclipse.wst.validation.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/docs/org.eclipse.wst.validation.infopop
+plugin@org.eclipse.wst.web.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/docs/org.eclipse.wst.web.ui.infopop
+plugin@org.eclipse.wst.ws.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.wst.ws.infopop
+plugin@org.eclipse.wst.xml.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.xml.ui.infopop
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/wst-web-thirdparty.map b/releng/maps/wst-web-thirdparty.map
index a0cc6b4..1aefb8b 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=v200608230302,: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,,sourceediting/plugins/org.eclipse.wst.standard.schemas
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/wst.map b/releng/maps/wst.map
index 43270bc..04c54f3 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=v200610230930,: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=v200704060050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.sdk
-feature@org.eclipse.wst.tests.feature=v200704060050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.feature
-feature@org.eclipse.wst=v200704060050,: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,,webtools.releng/assembly/plugins/org.eclipse.wst
+
+feature@org.eclipse.wst.sdk=v200709110510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.wst.sdk
+feature@org.eclipse.wst.tests.feature=v200709111138,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.wst.tests.feature
+feature@org.eclipse.wst=v200709110510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/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 ca09fa1..68b0254 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=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jst/components/doc/features/org.eclipse.jst.doc.isv.feature
-feature@org.eclipse.jst.doc.user.feature=v200701300510,: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,,webtools.releng/features/org.eclipse.jst.doc.isv.feature
+feature@org.eclipse.jst.doc.user.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/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 b80a3dd..6970e2a 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=v200703280045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,wst/components/doc/features/org.eclipse.wst.doc.isv.feature
-feature@org.eclipse.wst.doc.user.feature=v200703280045,: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,,webtools.releng/features/org.eclipse.wst.doc.isv.feature
+feature@org.eclipse.wst.doc.user.feature=v200706041905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/features/org.eclipse.wst.doc.user.feature
 
 !***************
\ No newline at end of file
diff --git a/releng/maps/wtp-releng.map b/releng/maps/wtp-releng.map
index 0099c14..d7d4348 100644
--- a/releng/maps/wtp-releng.map
+++ b/releng/maps/wtp-releng.map
@@ -1,9 +1,13 @@
 !*************** wtp-releng.map
 ! This map file is for releng oriented plugins and tests 
 
-feature@org.eclipse.wtp.releng.tests.feature=v200702250733,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.wtp/org.eclipse.wtp.releng.tests.feature
-plugin@org.eclipse.callisto.tools.versionchecker=v200702040010,:pserver:anonymous@dev.eclipse.org:/cvsroot/callisto,,org.eclipse.callisto.tools.versionchecker
-plugin@org.eclipse.wtp.releng.tests=v200703191250,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.wtp/org.eclipse.wtp.releng.tests
-plugin@org.eclipse.wtp.releng.tools=v200704100230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,releng.builder/tools/org.eclipse.wtp.releng.tools
+feature@org.eclipse.wtp.releng.tests.feature=v200709120100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/features/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,,webtools.releng/tests/org.eclipse.wtp.releng.tests
+plugin@org.eclipse.wtp.releng.tools=v200706111751,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/plugins/org.eclipse.wtp.releng.tools
+
+plugin@org.eclipse.wtp.releng.tools.component.core=v200709100832,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/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,,webtools.releng/releng.wtptools/api/org.eclipse.wtp.releng.tools.component.ui
+plugin@org.eclipse.wtp.releng.wtpbuilder=v200709100832,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/releng.wtptools/api/org.eclipse.wtp.releng.wtpbuilder
 
 !***************
\ No newline at end of file