diff --git a/releng.common/.project b/releng.common/.project
index 06d9316..dfd1c51 100644
--- a/releng.common/.project
+++ b/releng.common/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng.common R2_0_maintenance</name>
+	<name>releng.common R3_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng.common/.settings/org.eclipse.core.resources.prefs b/releng.common/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3391259
--- /dev/null
+++ b/releng.common/.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.common/maps/common-docs.map b/releng.common/maps/common-docs.map
index 2eddea6..06e7dbb 100644
--- a/releng.common/maps/common-docs.map
+++ b/releng.common/maps/common-docs.map
@@ -1,7 +1,14 @@
+!*************** common-docs.map
+! This map file is for 
+! WTP 3.0 releases  
+
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
 
 
-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
-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.validation.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/docs/org.eclipse.wst.validation.infopop
-
+plugin@org.eclipse.wst.command.env.doc.user=v200806092138,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/docs/org.eclipse.wst.command.env.doc.user
+plugin@org.eclipse.wst.command.env.infopop=v200805301544,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/docs/org.eclipse.wst.command.env.infopop
+plugin@org.eclipse.wst.common.infopop=v200805301550,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.infopop
+plugin@org.eclipse.wst.validation.infopop=v200806041506,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/docs/org.eclipse.wst.validation.infopop
+plugin@org.eclipse.wst.common.api.doc=v200807181737,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/docs/org.eclipse.wst.common.api.doc
+plugin@org.eclipse.wst.validation.doc.isv=v200805221201,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/docs/org.eclipse.wst.validation.doc.isv
\ No newline at end of file
diff --git a/releng.common/maps/common-fproj.map b/releng.common/maps/common-fproj.map
new file mode 100644
index 0000000..4ad0d66
--- /dev/null
+++ b/releng.common/maps/common-fproj.map
@@ -0,0 +1,14 @@
+!*************** common-fproj.map
+! This map file is for 
+! WTP 3.0 releases  
+
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
+
+plugin@org.eclipse.wst.common.project.facet.core=v200807031821,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.project.facet.core
+plugin@org.eclipse.wst.common.project.facet.ui=v200807231834,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.project.facet.ui
+plugin@org.eclipse.wst.common.project.facet.doc.api=v200807031821,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.project.facet.doc.api
+plugin@org.eclipse.jst.common.project.facet.core=v200807031821,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.jst.common.project.facet.core
+plugin@org.eclipse.jst.common.project.facet.ui=v200807031821,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.jst.common.project.facet.ui
+
+!***************
\ No newline at end of file
diff --git a/releng.common/maps/jst-common-component-features.map b/releng.common/maps/jst-common-component-features.map
index 977f0ae..7bd032c 100644
--- a/releng.common/maps/jst-common-component-features.map
+++ b/releng.common/maps/jst-common-component-features.map
@@ -1,6 +1,11 @@
 !*************** jst-common-component-features.map
+! This map file is for 
+! WTP 3.0 releases  
 
-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
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
+
+feature@org.eclipse.jst.common_core.feature=v200807220252,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.jst.common_core.feature
+feature@org.eclipse.jst.common_sdk.feature=v200807220252,: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 b6841ac..20e5888 100644
--- a/releng.common/maps/jst-common.map
+++ b/releng.common/maps/jst-common.map
@@ -1,19 +1,13 @@
 !*************** jst-common.map
-
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch:
+! from the R3_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
+plugin@org.eclipse.jst.common.annotations.controller=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.common.annotations.controller
+plugin@org.eclipse.jst.common.annotations.core=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.common.annotations.core
+plugin@org.eclipse.jst.common.annotations.ui=v200806010600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.common.annotations.ui
+plugin@org.eclipse.jst.common.frameworks=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.common.frameworks
 
 !***************
\ 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 b11ba10..882cbf9 100644
--- a/releng.common/maps/wst-common-component-features.map
+++ b/releng.common/maps/wst-common-component-features.map
@@ -1,13 +1,13 @@
 !*************** wst-common-component-features.map
 ! This map file is for 
-! WTP 2.0.x maintenance releases  
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! from the R3_0_maintenance branch
 
-feature@org.eclipse.wst.common_core.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_core.feature
-feature@org.eclipse.wst.common_sdk.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_sdk.feature
-feature@org.eclipse.wst.common_tests.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_tests.feature
-feature@org.eclipse.wst.common_ui.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_ui.feature
+feature@org.eclipse.wst.common_core.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_core.feature
+feature@org.eclipse.wst.common_sdk.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_sdk.feature
+feature@org.eclipse.wst.common_tests.feature=v200806092130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/features/org.eclipse.wst.common_tests.feature
+feature@org.eclipse.wst.common_ui.feature=v200807220139,: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 c853746..61e7028 100644
--- a/releng.common/maps/wst-common-core.map
+++ b/releng.common/maps/wst-common-core.map
@@ -1,32 +1,27 @@
 !*************** wst-common-core.map
-
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch:
+! from the R3_0_maintenance branch
 
-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=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.emfworkbench.integration
+plugin@org.eclipse.wst.command.env.core=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.command.env.core
+plugin@org.eclipse.wst.command.env=v200807231700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.command.env
 
-plugin@org.eclipse.wst.common.frameworks=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.frameworks
-plugin@org.eclipse.wst.common.modulecore=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.modulecore
+plugin@org.eclipse.wst.common.emf=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.emf
+plugin@org.eclipse.wst.common.emfworkbench.integration=v200807031600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.emfworkbench.integration
 
-plugin@org.eclipse.wst.validation=v200709122200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.validation
+plugin@org.eclipse.wst.common.environment=v200807161459,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.environment
 
-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.frameworks=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.frameworks
+plugin@org.eclipse.wst.common.modulecore=v200807031600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.modulecore
+plugin@org.eclipse.wst.common.uriresolver=v200805140415,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.uriresolver
 
-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=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.internet.cache
 
-plugin@org.eclipse.wst.internet.cache=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.internet.cache
+plugin@org.eclipse.wst.validation=v200807211449,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.validation
 
-plugin@org.eclipse.wst.common.uriresolver=v200802200327,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.uriresolver
+plugin@org.eclipse.jem.util=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.jem.util
 
-! These bundles are currently being developed and released 
-! from the HEAD stream:
-
-
-plugin@org.eclipse.wst.common.project.facet.core=v200802200327,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.project.facet.core
 
 !***************
\ 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 0e9f22b..27a511a 100644
--- a/releng.common/maps/wst-common-tests.map
+++ b/releng.common/maps/wst-common-tests.map
@@ -1,23 +1,23 @@
 !*************** wst-common-tests.map
-
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch:
+! from the R3_0_maintenance branch
 
-plugin@org.eclipse.wst.common.tests=v200802192030,: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
+plugin@org.eclipse.wst.common.tests=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.tests
+plugin@org.eclipse.wst.common.tests.collector=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.tests.collector
+plugin@org.eclipse.wst.common.tests.validation=v200805141418,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.tests.validation
+plugin@org.eclipse.wst.common.tests.validation.guard=v200804231156,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.tests.validation.guard
+plugin@org.eclipse.wst.common.tests.ui=v200806010700,: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.tests.performance=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.tests.performance
 
 
-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
+plugin@org.eclipse.wst.common.snippets.tests=v200806010700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.snippets.tests
+plugin@org.eclipse.wst.common.project.facet.core.tests=v200805140020,: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=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.common.project.facet.ui.tests
+
+plugin@org.eclipse.wst.internet.cache.tests=v200805140020,: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.common/maps/wst-common-ui.map b/releng.common/maps/wst-common-ui.map
index 6df94fa..9d7942d 100644
--- a/releng.common/maps/wst-common-ui.map
+++ b/releng.common/maps/wst-common-ui.map
@@ -1,22 +1,16 @@
 !*************** wst-common-ui.map
-
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch:
+! from the R3_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
+plugin@org.eclipse.wst.command.env.ui=v200807162242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.command.env.ui
+plugin@org.eclipse.wst.common.frameworks.ui=v200805221400,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.frameworks.ui
+plugin@org.eclipse.wst.common.snippets=v200805140415,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.snippets
+plugin@org.eclipse.wst.common.ui.properties=v200710181927,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.ui.properties
+plugin@org.eclipse.wst.common.ui=v200805140415,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.ui
+plugin@org.eclipse.wst.validation.ui=v200807211449,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.validation.ui
+plugin@org.eclipse.wst.common.core=v200806010600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/plugins/org.eclipse.wst.common.core
 
 !***************
\ No newline at end of file
diff --git a/releng.ejbtools/.project b/releng.ejbtools/.project
index 2297e49..c9b04b8 100644
--- a/releng.ejbtools/.project
+++ b/releng.ejbtools/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng.ejbtools R2_0_maintenance</name>
+	<name>releng.ejbtools  R3_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng.ejbtools/.settings/org.eclipse.core.resources.prefs b/releng.ejbtools/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3391259
--- /dev/null
+++ b/releng.ejbtools/.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.ejbtools/maps/jst-ejbtools-docs.map b/releng.ejbtools/maps/jst-ejbtools-docs.map
new file mode 100644
index 0000000..1165fa6
--- /dev/null
+++ b/releng.ejbtools/maps/jst-ejbtools-docs.map
@@ -0,0 +1,9 @@
+!*************** jst-ejbtools-docs.map
+
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the HEAD stream
+
+plugin@org.eclipse.jst.ejb.doc.user=v200805152320,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/docs/org.eclipse.jst.ejb.doc.user
+plugin@org.eclipse.jst.ejb.ui.infopop=v200805222207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/docs/org.eclipse.jst.ejb.ui.infopop
+
+!***************
diff --git a/releng.ejbtools/maps/jst-ejbtools-xdoclet.map b/releng.ejbtools/maps/jst-ejbtools-xdoclet.map
new file mode 100644
index 0000000..82471f0
--- /dev/null
+++ b/releng.ejbtools/maps/jst-ejbtools-xdoclet.map
@@ -0,0 +1,11 @@
+!*************** jst-ejbtools-xdoclet.map
+
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the R3_0_maintenance stream
+
+plugin@org.eclipse.jst.j2ee.ejb.annotation.model=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb.annotation.model
+plugin@org.eclipse.jst.j2ee.ejb.annotations.emitter=v200805140135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb.annotations.emitter
+plugin@org.eclipse.jst.j2ee.ejb.annotations.ui=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui
+plugin@org.eclipse.jst.j2ee.ejb.annotations.xdoclet=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet
+
+!***************
diff --git a/releng.ejbtools/maps/jst-ejbtools.map b/releng.ejbtools/maps/jst-ejbtools.map
new file mode 100644
index 0000000..d72dd4a
--- /dev/null
+++ b/releng.ejbtools/maps/jst-ejbtools.map
@@ -0,0 +1,11 @@
+!*************** jst-ejbtools.map
+
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the R3_0_maintenance stream
+
+plugin@org.eclipse.jst.j2ee.ejb=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb
+plugin@org.eclipse.jst.ejb.ui=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.ejb.ui
+
+plugin@org.eclipse.jst.jee.ejb=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.jee.ejb
+
+!***************
\ No newline at end of file
diff --git a/releng.ejbtools/maps/jst-enterprise-component-features.map b/releng.ejbtools/maps/jst-enterprise-component-features.map
index 4d06224..bda51be 100644
--- a/releng.ejbtools/maps/jst-enterprise-component-features.map
+++ b/releng.ejbtools/maps/jst-enterprise-component-features.map
@@ -1,14 +1,14 @@
 !*************** jst-enterprise-component-features.map
 ! This map file is for 
-! WTP 2.0.x maintenance releases  
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! from the R3_0_maintenance Stream
 
-feature@org.eclipse.jst.enterprise_core.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_core.feature
-feature@org.eclipse.jst.enterprise_sdk.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_sdk.feature
-feature@org.eclipse.jst.enterprise_tests.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_tests.feature
-feature@org.eclipse.jst.enterprise_ui.feature=v200802150100,: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
+feature@org.eclipse.jst.enterprise_core.feature=v200807220252,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_core.feature
+feature@org.eclipse.jst.enterprise_sdk.feature=v200807220252,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_sdk.feature
+feature@org.eclipse.jst.enterprise_tests.feature=v200802240543,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_tests.feature
+feature@org.eclipse.jst.enterprise_ui.feature=v200807220252,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.jst.enterprise_ui.feature
+feature@org.eclipse.jst.enterprise_userdoc.feature=v200712031330,: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
index 039ddd5..86d0d31 100644
--- a/releng.jeetools/.project
+++ b/releng.jeetools/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng.jeetools R2_0_maintenance</name>
+	<name>releng.jeetools R3_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng.jeetools/.settings/org.eclipse.core.resources.prefs b/releng.jeetools/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3391259
--- /dev/null
+++ b/releng.jeetools/.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.jeetools/maps/jeetools-docs.map b/releng.jeetools/maps/jeetools-docs.map
index 5238472..733a31c 100644
--- a/releng.jeetools/maps/jeetools-docs.map
+++ b/releng.jeetools/maps/jeetools-docs.map
@@ -1,10 +1,4 @@
-
-
-
-
-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.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.j2ee.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/docs/org.eclipse.jst.j2ee.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.wst.web.ui.infopop=v200805140415,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/docs/org.eclipse.wst.web.ui.infopop
+plugin@org.eclipse.jst.servlet.ui.infopop=v200805140415,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/docs/org.eclipse.jst.servlet.ui.infopop
+plugin@org.eclipse.jst.j2ee.infopop=v200805140415,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/docs/org.eclipse.jst.j2ee.infopop
+plugin@org.eclipse.jst.j2ee.doc.user=v200805281506,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/docs/org.eclipse.jst.j2ee.doc.user
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-j2ee-advanced.map b/releng.jeetools/maps/jst-j2ee-advanced.map
index 7f7754d..9559d6b 100644
--- a/releng.jeetools/maps/jst-j2ee-advanced.map
+++ b/releng.jeetools/maps/jst-j2ee-advanced.map
@@ -1,30 +1,16 @@
 !*************** jst-j2ee-advanced.map
+! This map file is for 
+! WTP 3.0 releases  
 
-! This map file is for
-! WTP 2.0.x maintenance releases
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
 
-! These bundles are currently being developed and released
-! from the R2_0_maintenance branch:
+plugin@org.eclipse.jst.j2ee.jca=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.jca
+plugin@org.eclipse.jst.j2ee.webservice=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.webservice
+plugin@org.eclipse.jst.j2ee.webservice.ui=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.webservice.ui
+plugin@org.eclipse.jst.j2ee.jca.ui=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.jca.ui
 
-plugin@org.eclipse.jst.j2ee.ejb=v200802192030,: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=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.jca
-plugin@org.eclipse.jst.j2ee.webservice=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.webservice
-plugin@org.eclipse.jst.j2ee.webservice.ui=v200802192030,: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.j2ee.xdoclet.runtime=v200805140135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.xdoclet.runtime
 
-plugin@org.eclipse.jst.jee.ejb=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.jee.ejb
-plugin@org.eclipse.jst.jee.ui=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee.ui
-
-plugin@org.eclipse.jst.j2ee.ejb.annotations.xdoclet=v200802201934,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet
-
-
-! 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.xdoclet.runtime=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,ejbtools/plugins/org.eclipse.jst.j2ee.xdoclet.runtime
-
+plugin@org.eclipse.jst.jee.ui=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee.ui
 !***************
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-j2ee-basic-tests.map b/releng.jeetools/maps/jst-j2ee-basic-tests.map
index 5f7f6f3..4032e59 100644
--- a/releng.jeetools/maps/jst-j2ee-basic-tests.map
+++ b/releng.jeetools/maps/jst-j2ee-basic-tests.map
@@ -1,17 +1,16 @@
 !*************** jst-j2ee-basic-tests.map
-
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch:
+! from the R3_0_maintenance branch
 
-plugin@org.eclipse.jst.j2ee.core.tests=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.core.tests
-plugin@org.eclipse.jst.j2ee.tests=v200802192030,: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
+plugin@org.eclipse.jst.j2ee.core.tests=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.core.tests
+plugin@org.eclipse.jst.j2ee.tests=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.tests
+plugin@org.eclipse.jst.servlet.tests=v200806010600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.servlet.tests
+plugin@org.eclipse.jst.validation.sample=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.validation.sample
+plugin@org.eclipse.jst.validation.test=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.validation.test
+plugin@org.eclipse.jst.j2ee.core.tests.performance=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.core.tests.performance
+plugin@org.eclipse.jst.j2ee.tests.performance=v200805140020,: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 23f51d7..e050ca9 100644
--- a/releng.jeetools/maps/jst-j2ee-basic.map
+++ b/releng.jeetools/maps/jst-j2ee-basic.map
@@ -1,20 +1,19 @@
 !*************** jst-j2ee-basic.map
-
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch:
+! from the R3_0_maintenance branch
 
-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=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.ui
+plugin@org.eclipse.jst.j2ee.navigator.ui=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.navigator.ui
+plugin@org.eclipse.jst.j2ee.ui=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.ui
 
-plugin@org.eclipse.jst.j2ee=v200806252211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee
-plugin@org.eclipse.jst.j2ee.core=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.core
-plugin@org.eclipse.jst.j2ee.web=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.web
-plugin@org.eclipse.jst.servlet.ui=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.servlet.ui
+plugin@org.eclipse.jst.j2ee=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee
+plugin@org.eclipse.jst.j2ee.core=v200807031600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.core
+plugin@org.eclipse.jst.j2ee.web=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.web
+plugin@org.eclipse.jst.servlet.ui=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.servlet.ui
 
-plugin@org.eclipse.jst.jee=v200806261300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee
-plugin@org.eclipse.jst.jee.web=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee.web
+plugin@org.eclipse.jst.jee=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee
+plugin@org.eclipse.jst.jee.web=v200805140020,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee.web
 
 !***************
\ No newline at end of file
diff --git a/releng.jeetools/maps/jst-jem.map b/releng.jeetools/maps/jst-jem.map
index 5530e97..56caae2 100644
--- a/releng.jeetools/maps/jst-jem.map
+++ b/releng.jeetools/maps/jst-jem.map
@@ -1,16 +1,14 @@
 !*************** jst-jem.map
+! This map file is for
+! WTP 3.0 releases
 
-! This map file is for 
-! WTP 2.0.x maintenance releases
+! These bundles are currently being developed and released
+! from the R3_0_maintenance branch
 
-! 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=v200802192030,: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
+plugin@org.eclipse.jem=v200806201600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem
+plugin@org.eclipse.jem.beaninfo=v200806051600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem.beaninfo
+plugin@org.eclipse.jem.proxy=v200806051600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem.proxy
+plugin@org.eclipse.jem.ui=v200806051600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem.ui
+plugin@org.eclipse.jem.workbench=v200807170530,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jem.workbench
+plugin@org.eclipse.jem.tests=v200805140020,: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 aafe1c9..63bd30d 100644
--- a/releng.jeetools/maps/jst-web-component-features.map
+++ b/releng.jeetools/maps/jst-web-component-features.map
@@ -1,18 +1,15 @@
 !*************** jst-web-component-features.map
 ! This map file is for 
-! WTP 2.0.x maintenance releases  
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! from the HEAD branch
 
-feature@org.eclipse.jst.web_core.feature=v200806230800,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_core.feature
-feature@org.eclipse.jst.web_sdk.feature=v200806221945,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_sdk.feature
-feature@org.eclipse.jst.web_tests.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_tests.feature
-feature@org.eclipse.jst.web_ui.feature=v200806252211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_ui.feature
+feature@org.eclipse.jst.web_core.feature=v200807220252,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_core.feature
+feature@org.eclipse.jst.web_sdk.feature=v200807220252,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_sdk.feature
+feature@org.eclipse.jst.web_tests.feature=v200807220252,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_tests.feature
+feature@org.eclipse.jst.web_ui.feature=v200807220252,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_ui.feature
 
-feature@org.eclipse.jst.web_userdoc.feature=v200802150100,: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
+feature@org.eclipse.jst.web_userdoc.feature=v200712031330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.jst.web_userdoc.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.jsf/.project b/releng.jsf/.project
new file mode 100644
index 0000000..8aa2dc7
--- /dev/null
+++ b/releng.jsf/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>releng.jsf  R3_0_maintenance</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng.jsf/maps/jsf-doc.map b/releng.jsf/maps/jsf-doc.map
new file mode 100644
index 0000000..0ca4d37
--- /dev/null
+++ b/releng.jsf/maps/jsf-doc.map
@@ -0,0 +1,9 @@
+!*************** wtp jsf  docs map
+
+feature@org.eclipse.jst.jsf.doc.feature=v20080509,: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=v20080528,: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=v20080528,: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
new file mode 100644
index 0000000..3dcd279
--- /dev/null
+++ b/releng.jsf/maps/jsf.map
@@ -0,0 +1,7 @@
+!*************** jsf product plugin and assembly features
+
+plugin@org.eclipse.jsf=v20080312,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/plugins/org.eclipse.jsf.branding
+
+feature@org.eclipse.jsf=v20080312,: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
new file mode 100644
index 0000000..36c268e
--- /dev/null
+++ b/releng.jsf/maps/wtp.jsf.map
@@ -0,0 +1,28 @@
+!*************** jsf product plugins and features
+
+
+plugin@org.eclipse.jst.jsf.core=v20080606,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.core
+plugin@org.eclipse.jst.jsf.ui=v20080606,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.ui
+
+plugin@org.eclipse.jst.jsf.facesconfig=v20080605,: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=v20080610,: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=v20080605,: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=v20080605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.ui
+plugin@org.eclipse.jst.jsf.common.runtime=v20080605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.runtime
+
+
+plugin@org.eclipse.jst.jsf.standard.tagsupport=v20080723,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
+plugin@org.eclipse.jst.jsf.apache.trinidad.tagsupport=v20080723,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport
+
+plugin@org.eclipse.jst.pagedesigner=v20080605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner
+plugin@org.eclipse.jst.pagedesigner.jsf.ui=v20080605,: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=v20080605,: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=v20080515,: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=v20080509,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf_sdk.feature
+
+feature@org.eclipse.jst.webpageeditor.feature=v200805191452,: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=v200805230650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature
+feature@org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature=v20080605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature
+feature@org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature=v20080602,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_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
new file mode 100644
index 0000000..2d60281
--- /dev/null
+++ b/releng.jsf/maps/wtp.jsf.tests.map
@@ -0,0 +1,20 @@
+!*************** wtp jsf tests map
+
+feature@org.eclipse.jst.jsf.tests.feature=v20080509,: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=v20080605,: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=v20080509,: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=v20080509,: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=v20080509,: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=v200804011642,: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=v20080509,: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=v20080509,: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=v20080509,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.designtime.tests
+plugin@org.eclipse.jst.jsf.facesconfig.tests=v20080509,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests
+bundle@org.eclipse.jst.jsf.facesconfig.ui.test=v20080509,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test
+plugin@org.eclipse.jst.jsf.validation.el.tests=v20080509,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.validation.el.tests
+plugin@org.eclipse.jst.pagedesigner.tests=v20080509,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.pagedesigner.tests
+plugin@org.eclipse.jst.jsf.common.runtime.tests=v20080509,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests
+
+!*************** 
\ No newline at end of file
diff --git a/releng.servertools/.project b/releng.servertools/.project
index 298810d..b1fce1f 100644
--- a/releng.servertools/.project
+++ b/releng.servertools/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng.servertools R2_0_maintenance</name>
+	<name>org.eclipse.releng R3_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng.servertools/.settings/org.eclipse.core.resources.prefs b/releng.servertools/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3391259
--- /dev/null
+++ b/releng.servertools/.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.servertools/maps/jst-server-component-features.map b/releng.servertools/maps/jst-server-component-features.map
index 69f10d9..c708a7b 100644
--- a/releng.servertools/maps/jst-server-component-features.map
+++ b/releng.servertools/maps/jst-server-component-features.map
@@ -1,16 +1,14 @@
 !*************** jst-server-component-features.map
-! This map file is for 
-! WTP 2.0.x maintenance releases  
 
-! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the HEAD stream
 
-feature@org.eclipse.jst.server_core.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_core.feature
-feature@org.eclipse.jst.server_sdk.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_sdk.feature
-feature@org.eclipse.jst.server_tests.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_tests.feature
-feature@org.eclipse.jst.server_ui.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_ui.feature
-feature@org.eclipse.jst.server_userdoc.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_userdoc.feature
-feature@org.eclipse.jst.server_adapters.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_adapters.feature
-feature@org.eclipse.jst.server_adapters.sdk.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_adapters.sdk.feature
+feature@org.eclipse.jst.server_core.feature=v200806092130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_core.feature
+feature@org.eclipse.jst.server_sdk.feature=v200802280645,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_sdk.feature
+feature@org.eclipse.jst.server_tests.feature=v200807220252,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_tests.feature
+feature@org.eclipse.jst.server_ui.feature=v200806092130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_ui.feature
+feature@org.eclipse.jst.server_userdoc.feature=v200712031330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_userdoc.feature
+feature@org.eclipse.jst.server_adapters.feature=v200807220620,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.jst.server_adapters.feature
+feature@org.eclipse.jst.server_adapters.sdk.feature=v200807220252,: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 61ce90d..6b266ce 100644
--- a/releng.servertools/maps/jst-server-tests.map
+++ b/releng.servertools/maps/jst-server-tests.map
@@ -1,12 +1,15 @@
 !*************** jst-server-tests.map
 
-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
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the HEAD stream
 
-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.core.tests=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.jst.server.core.tests
+plugin@org.eclipse.jst.server.ui.tests=v20080708,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.jst.server.ui.tests
 
-plugin@org.eclipse.jst.server.generic.tests=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.jst.server.generic.tests
+plugin@org.eclipse.jst.server.tomcat.core.tests=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.jst.server.tomcat.core.tests
+plugin@org.eclipse.jst.server.tomcat.ui.tests=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.jst.server.tomcat.ui.tests
+plugin@org.eclipse.jst.server.tomcat.tests.performance=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.jst.server.tomcat.tests.performance
+
+plugin@org.eclipse.jst.server.generic.tests=v200805140145,: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 cc2387d..2841594 100644
--- a/releng.servertools/maps/jst-server.map
+++ b/releng.servertools/maps/jst-server.map
@@ -1,22 +1,25 @@
 !*************** jst-server.map
 
-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
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the HEAD stream
 
-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.core=v20080528,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.core
+plugin@org.eclipse.jst.server.ui=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.ui
+plugin@org.eclipse.jst.server.preview.adapter=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.preview.adapter
 
-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.generic.core=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.core
+plugin@org.eclipse.jst.server.generic.ui=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.ui
 
-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.tomcat.core=v20080620,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.tomcat.core
+plugin@org.eclipse.jst.server.tomcat.ui=v20080620,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.tomcat.ui
 
-plugin@org.eclipse.jst.server.installable=v20070608,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.installable
+plugin@org.eclipse.jst.server.websphere.core=v20080620,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.websphere.core
+plugin@org.eclipse.jst.server.generic.jboss=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.jboss
+plugin@org.eclipse.jst.server.generic.jonas=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.jonas
+plugin@org.eclipse.jst.server.generic.oc4j=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.oc4j
 
-plugin@org.apache.cactus=v200606181221,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/thirdparty/org.apache.cactus
+plugin@org.eclipse.jst.server.installable=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.installable
+
+plugin@org.apache.cactus=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/thirdparty/org.apache.cactus
 
 !***************
\ No newline at end of file
diff --git a/releng.servertools/maps/servertools-docs.map b/releng.servertools/maps/servertools-docs.map
index 29cefbb..f1576c6 100644
--- a/releng.servertools/maps/servertools-docs.map
+++ b/releng.servertools/maps/servertools-docs.map
@@ -1,4 +1,6 @@
-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.server.ui.infopop=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.wst.server.ui.infopop
-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.server.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.jst.server.ui.infopop
+
+plugin@org.eclipse.wst.server.ui.doc.user=v200805150133,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.wst.server.ui.doc.user
+plugin@org.eclipse.wst.server.ui.infopop=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.wst.server.ui.infopop
+plugin@org.eclipse.jst.server.ui.doc.user=v200805150133,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.jst.server.ui.doc.user
+plugin@org.eclipse.jst.server.ui.infopop=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.jst.server.ui.infopop
+plugin@org.eclipse.server.doc.isv=v20080522,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/docs/org.eclipse.server.doc.isv
\ 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 c190bad..202167b 100644
--- a/releng.servertools/maps/wst-server-component-features.map
+++ b/releng.servertools/maps/wst-server-component-features.map
@@ -1,16 +1,14 @@
 !*************** wst-server-component-features.map
-! This map file is for 
-! WTP 2.0.x maintenance releases  
 
-! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the HEAD stream
 
-feature@org.eclipse.wst.server_core.feature=v200806230800,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_core.feature
-feature@org.eclipse.wst.server_sdk.feature=v200806221945,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_sdk.feature
-feature@org.eclipse.wst.server_tests.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_tests.feature
-feature@org.eclipse.wst.server_ui.feature=v200806252211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_ui.feature
-feature@org.eclipse.wst.server_userdoc.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_userdoc.feature
-feature@org.eclipse.wst.server_adapters.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_adapters.feature
-feature@org.eclipse.wst.server_adapters.sdk.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_adapters.sdk.feature
+feature@org.eclipse.wst.server_core.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_core.feature
+feature@org.eclipse.wst.server_sdk.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_sdk.feature
+feature@org.eclipse.wst.server_tests.feature=v200806092130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_tests.feature
+feature@org.eclipse.wst.server_ui.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_ui.feature
+feature@org.eclipse.wst.server_userdoc.feature=v200712031330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_userdoc.feature
+feature@org.eclipse.wst.server_adapters.feature=v200806092130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/features/org.eclipse.wst.server_adapters.feature
+feature@org.eclipse.wst.server_adapters.sdk.feature=v200712031330,: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 f484f0b..1653ff6 100644
--- a/releng.servertools/maps/wst-server-core.map
+++ b/releng.servertools/maps/wst-server-core.map
@@ -1,11 +1,14 @@
 !*************** wst-server.map
 
-plugin@org.eclipse.wst.internet.monitor.core=v20070608,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.internet.monitor.core
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the HEAD stream
 
-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.internet.monitor.core=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.internet.monitor.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
+plugin@org.eclipse.wst.server.core=v20080721,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.core
+plugin@org.eclipse.wst.server.http.core=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.http.core
+
+plugin@org.eclipse.wst.server.preview=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.preview
+plugin@org.eclipse.wst.server.preview.adapter=v200805140145,: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 0847e55..3953aa6 100644
--- a/releng.servertools/maps/wst-server-tests.map
+++ b/releng.servertools/maps/wst-server-tests.map
@@ -1,13 +1,14 @@
 !*************** wst-server-tests.map
 
-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
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the HEAD stream
 
-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.monitor.core.tests=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.internet.monitor.core.tests
+plugin@org.eclipse.wst.internet.monitor.ui.tests=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.internet.monitor.ui.tests
 
-plugin@org.eclipse.wst.internet.cache.tests=v200706030435,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,common/tests/org.eclipse.wst.internet.cache.tests
+plugin@org.eclipse.wst.server.core.tests=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.server.core.tests
+plugin@org.eclipse.wst.server.ui.tests=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.server.ui.tests
+plugin@org.eclipse.wst.server.tests.performance=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.server.tests.performance
+plugin@org.eclipse.wst.server.http.core.tests=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/tests/org.eclipse.wst.server.http.core.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 9060002..58e4c06 100644
--- a/releng.servertools/maps/wst-server-ui.map
+++ b/releng.servertools/maps/wst-server-ui.map
@@ -1,9 +1,11 @@
 !*************** wst-server.map
 
-plugin@org.eclipse.wst.internet.monitor.ui=v20070716b,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.internet.monitor.ui
+! This map file is for the WTP 3.0.x releases. These bundles are currently
+! being developed and released from the HEAD stream
 
-plugin@org.eclipse.wst.server.ui=v20080206b,: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
+plugin@org.eclipse.wst.internet.monitor.ui=v200805140145,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.internet.monitor.ui
 
+plugin@org.eclipse.wst.server.ui=v20080723,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.ui
+plugin@org.eclipse.wst.server.http.ui=v200805140145,: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
index 1815e93..dacd13b 100644
--- a/releng.sourceediting/.project
+++ b/releng.sourceediting/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng.sourceediting R2_0_maintenance</name>
+	<name>releng.sourceediting R3_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng.sourceediting/.settings/org.eclipse.core.resources.prefs b/releng.sourceediting/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3391259
--- /dev/null
+++ b/releng.sourceediting/.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.sourceediting/maps/jst-jsp-tests.map b/releng.sourceediting/maps/jst-jsp-tests.map
index 6788c41..714484b 100644
--- a/releng.sourceediting/maps/jst-jsp-tests.map
+++ b/releng.sourceediting/maps/jst-jsp-tests.map
@@ -1,17 +1,14 @@
 !*************** jst-jsp-tests.map
 ! This map file is for 
-! WTP 2.0.x maintenance releases  
+! WTP 3.0.1 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! from the R3_0_maintenance branch
 
-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
+plugin@org.eclipse.jst.jsp.core.tests=v200807240448,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.core.tests
+plugin@org.eclipse.jst.jsp.ui.tests=v200806050300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.ui.tests
+plugin@org.eclipse.jst.jsp.tests.encoding=v200807170605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.tests.encoding
 
-! 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
+plugin@org.eclipse.jst.jsp.ui.tests.performance=v200806020015,: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 fc922e9..c55681f 100644
--- a/releng.sourceediting/maps/jst-jsp.map
+++ b/releng.sourceediting/maps/jst-jsp.map
@@ -1,11 +1,11 @@
 !*************** jst-jsp.map
 ! This map file is for 
-! WTP 2.0.x maintenance releases  
+! WTP 3.0.1 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! from the R3_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
+plugin@org.eclipse.jst.jsp.core=v200807240448,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.jsp.core
+plugin@org.eclipse.jst.jsp.ui=v200805152207,: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/sourceediting-docs.map b/releng.sourceediting/maps/sourceediting-docs.map
index a7b0bc4..5507fda 100644
--- a/releng.sourceediting/maps/sourceediting-docs.map
+++ b/releng.sourceediting/maps/sourceediting-docs.map
@@ -1,24 +1,24 @@
 !*************** sourceediting-docs.map
 
 ! This map file is for 
-! WTP 2.x releases  
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! from the HEAD branch
 
 !***************
 
-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.wst.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.doc.user
-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.dtdeditor.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.dtdeditor.doc.user
-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.sse.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.sse.doc.user
-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.webtools.doc.user=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.webtools.doc.user
-plugin@org.eclipse.wst.xml.ui.infopop=v200706110217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.xml.ui.infopop
-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.jst.jsp.ui.infopop=v200805301545,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.jst.jsp.ui.infopop
+plugin@org.eclipse.wst.doc.user=v200806052254,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.doc.user
+plugin@org.eclipse.wst.dtd.ui.infopop=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.dtd.ui.infopop
+plugin@org.eclipse.wst.dtdeditor.doc.user=v200805150028,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.dtdeditor.doc.user
+plugin@org.eclipse.wst.html.ui.infopop=v200805301545,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.html.ui.infopop
+plugin@org.eclipse.wst.javascript.ui.infopop=v200805301545,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.javascript.ui.infopop
+plugin@org.eclipse.wst.sse.doc.user=v200805211530,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.sse.doc.user
+plugin@org.eclipse.wst.sse.ui.infopop=v200805301545,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.sse.ui.infopop
+plugin@org.eclipse.wst.webtools.doc.user=v200805150134,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.webtools.doc.user
+plugin@org.eclipse.wst.xml.ui.infopop=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.xml.ui.infopop
+plugin@org.eclipse.wst.xmleditor.doc.user=v200807240448,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.xmleditor.doc.user
+plugin@org.eclipse.wst.xsdeditor.doc.user=v200805150028,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.xsdeditor.doc.user
 
-!***************
+!***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-jsdt-tests.map b/releng.sourceediting/maps/wst-jsdt-tests.map
index e9c3ab9..ec0d1b8 100644
--- a/releng.sourceediting/maps/wst-jsdt-tests.map
+++ b/releng.sourceediting/maps/wst-jsdt-tests.map
@@ -6,9 +6,9 @@
 ! These bundles are currently being developed and released 
 ! from the HEAD branch
 
-plugin@org.eclipse.wst.jsdt.core.tests.compiler=v200804302218,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.jsdt.core.tests.compiler
-plugin@org.eclipse.wst.jsdt.core.tests.model=v200805132221,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.jsdt.core.tests.model
+plugin@org.eclipse.wst.jsdt.core.tests.compiler=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.jsdt.core.tests.compiler
+plugin@org.eclipse.wst.jsdt.core.tests.model=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.jsdt.core.tests.model
 
-feature@org.eclipse.wst.jsdt_tests.feature=v200806230440,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.jsdt_tests.feature
+feature@org.eclipse.wst.jsdt_tests.feature=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.jsdt_tests.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-jsdt.map b/releng.sourceediting/maps/wst-jsdt.map
index 153dd1b..222b7cb 100644
--- a/releng.sourceediting/maps/wst-jsdt.map
+++ b/releng.sourceediting/maps/wst-jsdt.map
@@ -6,17 +6,17 @@
 ! These bundles are currently being developed and released 
 ! from the HEAD branch
 
-plugin@org.eclipse.wst.jsdt.doc=v200805302104,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.jsdt.doc
-plugin@org.eclipse.wst.jsdt.core=v200805291857,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.core
-plugin@org.eclipse.wst.jsdt.manipulation=v200804302218,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.manipulation
-plugin@org.eclipse.wst.jsdt.support.firefox=v200804302218,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.support.firefox
-plugin@org.eclipse.wst.jsdt.support.ie=v200804302218,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.support.ie
-plugin@org.eclipse.wst.jsdt.ui=v200805282135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.ui
-plugin@org.eclipse.wst.jsdt.web.core=v200805221604,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.core
-plugin@org.eclipse.wst.jsdt.web.support.jsp=v200804302218,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.support.jsp
-plugin@org.eclipse.wst.jsdt.web.ui=v200804302218,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.ui
+plugin@org.eclipse.wst.jsdt.doc=v200807220541,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/docs/org.eclipse.wst.jsdt.doc
+plugin@org.eclipse.wst.jsdt.core=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.core
+plugin@org.eclipse.wst.jsdt.manipulation=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.manipulation
+plugin@org.eclipse.wst.jsdt.support.firefox=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.support.firefox
+plugin@org.eclipse.wst.jsdt.support.ie=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.support.ie
+plugin@org.eclipse.wst.jsdt.ui=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.ui
+plugin@org.eclipse.wst.jsdt.web.core=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.core
+plugin@org.eclipse.wst.jsdt.web.support.jsp=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.support.jsp
+plugin@org.eclipse.wst.jsdt.web.ui=v200807241900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.ui
 
-feature@org.eclipse.wst.jsdt.feature=v200806230440,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.jsdt.feature
-feature@org.eclipse.wst.jsdt_sdk.feature=v200806230440,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.jsdt_sdk.feature
+feature@org.eclipse.wst.jsdt.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.jsdt.feature
+feature@org.eclipse.wst.jsdt_sdk.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.jsdt_sdk.feature
 
 !***************
\ 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 e60aaf4..31dad48 100644
--- a/releng.sourceediting/maps/wst-web-componenet-features.map
+++ b/releng.sourceediting/maps/wst-web-componenet-features.map
@@ -1,14 +1,14 @@
 !*************** wst-web-componenet-features.map
 ! This map file is for 
-! WTP 2.0.x maintenance releases  
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! from the HEAD branch
 
-feature@org.eclipse.wst.web_core.feature=v2008062300800,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_core.feature
-feature@org.eclipse.wst.web_sdk.feature=v200806221945,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_sdk.feature
-feature@org.eclipse.wst.web_tests.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_tests.feature
-feature@org.eclipse.wst.web_ui.feature=v200806252211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_ui.feature
-feature@org.eclipse.wst.web_userdoc.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_userdoc.feature
+feature@org.eclipse.wst.web_core.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_core.feature
+feature@org.eclipse.wst.web_sdk.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_sdk.feature
+feature@org.eclipse.wst.web_tests.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_tests.feature
+feature@org.eclipse.wst.web_ui.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/features/org.eclipse.wst.web_ui.feature
+feature@org.eclipse.wst.web_userdoc.feature=v200805040310,: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 9887a89..9692554 100644
--- a/releng.sourceediting/maps/wst-web-core.map
+++ b/releng.sourceediting/maps/wst-web-core.map
@@ -1,13 +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:
+! WTP 3.0.1 releases  
 
-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=v200802192030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.wst.web
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
+
+plugin@org.eclipse.wst.web=v200807240600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.wst.web
+plugin@org.eclipse.wst.css.core=v200807170605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.core
+plugin@org.eclipse.wst.html.core=v200807240448,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.core
+plugin@org.eclipse.wst.javascript.core=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.javascript.core
 
 !***************
\ 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 ae4820c..06fdc7e 100644
--- a/releng.sourceediting/maps/wst-web-tests.map
+++ b/releng.sourceediting/maps/wst-web-tests.map
@@ -1,13 +1,18 @@
 !*************** wst-web-tests.map
+! This map file is for 
+! WTP 3.0.1 releases  
 
-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
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
 
-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
+plugin@org.eclipse.wst.css.core.tests=v200807170605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.core.tests
+plugin@org.eclipse.wst.css.tests.encoding=v200806020015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.tests.encoding
+plugin@org.eclipse.wst.css.ui.tests=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.ui.tests
+plugin@org.eclipse.wst.css.ui.tests.performance=v200806020015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.ui.tests.performance
+
+plugin@org.eclipse.wst.html.core.tests=v200806020015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.core.tests
+plugin@org.eclipse.wst.html.ui.tests=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.ui.tests
+plugin@org.eclipse.wst.html.tests.encoding=v200806020015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.tests.encoding
+plugin@org.eclipse.wst.html.ui.tests.performance=v200806020015,: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 7d0df73..468228a 100644
--- a/releng.sourceediting/maps/wst-web-ui.map
+++ b/releng.sourceediting/maps/wst-web-ui.map
@@ -1,14 +1,15 @@
 !*************** wst-web-ui.map
 
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0.1 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch:
+! from the R3_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=v200802142230,: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
+plugin@org.eclipse.wst.web.ui=v200805281530,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.wst.web.ui
+plugin@org.eclipse.wst.css.ui=v200807170605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.ui
+plugin@org.eclipse.wst.html.ui=v200805152207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.ui
+plugin@org.eclipse.wst.javascript.ui=v200805160650,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.javascript.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 347cf73..8d57d30 100644
--- a/releng.sourceediting/maps/wst-xml-component-features.map
+++ b/releng.sourceediting/maps/wst-xml-component-features.map
@@ -1,14 +1,14 @@
 !*************** wst-xml-component-features.map
 ! This map file is for 
-! WTP 2.0.x maintenance releases  
+! WTP 3.0.1 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! from the R3_0_maintenance branch
 
-feature@org.eclipse.wst.xml_core.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_core.feature
-feature@org.eclipse.wst.xml_sdk.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_sdk.feature
-feature@org.eclipse.wst.xml_tests.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_tests.feature
-feature@org.eclipse.wst.xml_ui.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_ui.feature
-feature@org.eclipse.wst.xml_userdoc.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_userdoc.feature
+feature@org.eclipse.wst.xml_core.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_core.feature
+feature@org.eclipse.wst.xml_sdk.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_sdk.feature
+feature@org.eclipse.wst.xml_tests.feature=v200807232135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_tests.feature
+feature@org.eclipse.wst.xml_ui.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_ui.feature
+feature@org.eclipse.wst.xml_userdoc.feature=v200805040310,: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 965897f..eccc2c1 100644
--- a/releng.sourceediting/maps/wst-xml-core.map
+++ b/releng.sourceediting/maps/wst-xml-core.map
@@ -1,18 +1,18 @@
 !*************** wst-xml-core.map
 
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0.1 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=v200802140626,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
-plugin@org.eclipse.wst.xml.core=v200802140626,: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
+! from the R3_0_maintenance branch
 
-plugin@org.eclipse.wst.standard.schemas=v200705302225,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.standard.schemas
+plugin@org.eclipse.wst.dtd.core=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.dtd.core
+plugin@org.eclipse.wst.sse.core=v200807170605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
+plugin@org.eclipse.wst.xml.core=v200807240448,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.core
+plugin@org.eclipse.wst.xsd.core=v200807240448,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.core
 
-plugin@org.eclipse.jst.standard.schemas=v200706221355,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.standard.schemas
+plugin@org.eclipse.wst.standard.schemas=v200807220733,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.standard.schemas
+
+plugin@org.eclipse.jst.standard.schemas=v200807220523,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.standard.schemas
 
 !*************** 
\ 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 6ab363f..0e9b027 100644
--- a/releng.sourceediting/maps/wst-xml-tests.map
+++ b/releng.sourceediting/maps/wst-xml-tests.map
@@ -1,19 +1,28 @@
 !*************** wst-xml-tests.map
+! This map file is for 
+! WTP 3.0.1 releases  
 
-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
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch 
+! (except for xsd.ui.tests which is from HEAD)
 
-plugin@org.eclipse.wst.xml.core.tests=v200802142230,: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.sse.core.tests=v200806020015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.sse.core.tests
+plugin@org.eclipse.wst.sse.ui.tests=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.sse.ui.tests
+plugin@org.eclipse.wst.sse.ui.tests.performance=v200806020015,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.sse.ui.tests.performance
 
-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.xml.core.tests=v200807242014,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.core.tests
+plugin@org.eclipse.wst.xml.ui.tests=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.ui.tests
+plugin@org.eclipse.wst.xml.tests.encoding=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.tests.encoding
+plugin@org.eclipse.wst.xml.ui.tests.performance=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.ui.tests.performance
+plugin@org.eclipse.wst.xml.validation.tests=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.validation.tests
+plugin@org.eclipse.wst.xml.catalog.tests=v200806051910,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.catalog.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.dtd.core.tests=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.dtd.core.tests
+plugin@org.eclipse.wst.dtd.ui.tests=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.dtd.ui.tests
 
-plugin@org.eclipse.wst.xsd.tests.performance=v200709131251,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.tests.performance
+plugin@org.eclipse.wst.xsd.validation.tests=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.validation.tests
+plugin@org.eclipse.wst.xsd.tests.performance=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.tests.performance
+plugin@org.eclipse.wst.xsd.core.tests=v200807240448,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.core.tests
+plugin@org.eclipse.wst.xsd.ui.tests=v200807282125,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.ui.tests
 
 !***************
\ 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 9c473f6..d0061e7 100644
--- a/releng.sourceediting/maps/wst-xml-ui.map
+++ b/releng.sourceediting/maps/wst-xml-ui.map
@@ -1,14 +1,14 @@
-!*************** wst-xml-ui.map
+!*************** wst-xml.map
 
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0.1 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch:
+! from the R3_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=v200802142230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.ui
-plugin@org.eclipse.wst.xml.ui=v200802140626,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.ui
-plugin@org.eclipse.wst.xsd.ui=v200802141800,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.ui
+plugin@org.eclipse.wst.dtd.ui=v200805152207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.dtd.ui
+plugin@org.eclipse.wst.sse.ui=v200807240448,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.ui
+plugin@org.eclipse.wst.xml.ui=v200807240448,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.ui
+plugin@org.eclipse.wst.xsd.ui=v200807232135,: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
index 7f16fd7..1e6ce25 100644
--- a/releng.webservices/.project
+++ b/releng.webservices/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng.webservices R2_0_maintenance</name>
+	<name>releng.webservices R3_0_maintenance</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng.webservices/.settings/org.eclipse.core.resources.prefs b/releng.webservices/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3391259
--- /dev/null
+++ b/releng.webservices/.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.webservices/maps/jst-ws-axis2.map b/releng.webservices/maps/jst-ws-axis2.map
new file mode 100644
index 0000000..6f01d52
--- /dev/null
+++ b/releng.webservices/maps/jst-ws-axis2.map
@@ -0,0 +1,21 @@
+!*************** jst-ws-axis2.map
+! This map file is for 
+! WTP 3.0.1 releases  
+
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
+
+!*** Axis2 plugins
+plugin@org.eclipse.jst.ws.axis2.consumption.core=v200807232000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.consumption.core
+plugin@org.eclipse.jst.ws.axis2.consumption.ui=v200807232000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.consumption.ui
+plugin@org.eclipse.jst.ws.axis2.core=v200807162242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.core
+plugin@org.eclipse.jst.ws.axis2.creation.core=v200807162242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.creation.core
+plugin@org.eclipse.jst.ws.axis2.creation.ui=v200807162242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.creation.ui
+plugin@org.eclipse.jst.ws.axis2.ui=v200806190413,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis2.ui
+
+plugin@org.eclipse.jst.ws.axis2.ui.doc.user=v200807220512,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.axis2.ui.doc.user
+
+feature@org.eclipse.jst.ws.axis2tools.feature=v200807092124,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.jst.ws.axis2tools.feature
+feature@org.eclipse.jst.ws.axis2tools_sdk.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.jst.ws.axis2tools_sdk.feature
+
+!***************
\ No newline at end of file
diff --git a/releng.webservices/maps/jst-ws-tests.map b/releng.webservices/maps/jst-ws-tests.map
index fea9fad..665bc00 100644
--- a/releng.webservices/maps/jst-ws-tests.map
+++ b/releng.webservices/maps/jst-ws-tests.map
@@ -1,12 +1,13 @@
 !*************** jst-ws-tests.map
-! This map file is for the 
-! WTP 2.0.x maintenance release.
+! This map file is for 
+! WTP 3.0.1 releases  
 
-! These bundles are currently being developed and released from the R2_0_maintenance branch.
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
 
-plugin@org.eclipse.jst.ws.tests=v200802121438,: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
+plugin@org.eclipse.jst.ws.tests=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.jst.ws.tests
+plugin@org.eclipse.jst.ws.tests.performance=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.jst.ws.tests.performance
+plugin@org.eclipse.jst.ws.axis.consumption.core.tests=v200805140230,: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 0cb1f13..bd44564 100644
--- a/releng.webservices/maps/jst-ws.map
+++ b/releng.webservices/maps/jst-ws.map
@@ -1,26 +1,19 @@
 !*************** jst-ws.map
-! This map file is for the 
-! WTP 2.0.x maintenance release.
+! This map file is for 
+! WTP 3.0.1 releases  
 
-! These bundles are currently being developed and released from the R2_0_maintenance branch.
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
 
-plugin@org.eclipse.jst.ws=v200801222138,: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=v200801222138,: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=v200801310215,: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=v200801292016,: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
+plugin@org.eclipse.jst.ws=v200807231700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws
+plugin@org.eclipse.jst.ws.axis.consumption.core=v200806190413,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis.consumption.core
+plugin@org.eclipse.jst.ws.axis.consumption.ui=v200807092124,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis.consumption.ui
+plugin@org.eclipse.jst.ws.axis.creation.ui=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.axis.creation.ui
+plugin@org.eclipse.jst.ws.consumption=v200807162242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.consumption
+plugin@org.eclipse.jst.ws.consumption.ui=v200807232000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.consumption.ui
+plugin@org.eclipse.jst.ws.creation.ejb.ui=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.creation.ejb.ui
+plugin@org.eclipse.jst.ws.creation.ui=v200806190413,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.creation.ui
+plugin@org.eclipse.jst.ws.uddiregistry=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.uddiregistry
+plugin@org.eclipse.jst.ws.ui=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.jst.ws.ui
 
 !***************
\ No newline at end of file
diff --git a/releng.webservices/maps/webservices-docs.map b/releng.webservices/maps/webservices-docs.map
index 7283dce..25fd78e 100644
--- a/releng.webservices/maps/webservices-docs.map
+++ b/releng.webservices/maps/webservices-docs.map
@@ -1,10 +1,13 @@
 
-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.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.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
-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
+plugin@org.eclipse.wst.wsdl.ui.doc.user=v200805150135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.wst.wsdl.ui.doc.user
+plugin@org.eclipse.wst.wsi.ui.doc.user=v200805301546,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.wst.wsi.ui.doc.user
+plugin@org.eclipse.wst.ws.infopop=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.wst.ws.infopop
+plugin@org.eclipse.wst.ws.api.doc=v200807181721,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.wst.ws.api.doc
+plugin@org.eclipse.wst.wsdl.doc.isv=v200805301419,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.wst.wsdl.doc.isv
+
+plugin@org.eclipse.jst.ws.axis.ui.doc.user=v200806092139,: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=v200805142257,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.consumption.ui.doc.user
+plugin@org.eclipse.jst.ws.doc.user=v200805142257,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.doc.user
+plugin@org.eclipse.jst.ws.axis.infopop=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.axis.infopop
+plugin@org.eclipse.jst.ws.consumption.infopop=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.consumption.infopop
+plugin@org.eclipse.jst.ws.infopop=v200805140230,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/docs/org.eclipse.jst.ws.infopop
\ 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 536dc9e..de5ebfd 100644
--- a/releng.webservices/maps/wst-ws-component.features.map
+++ b/releng.webservices/maps/wst-ws-component.features.map
@@ -1,9 +1,18 @@
 !*************** wst-ws-component.features.map
+! This map file is for 
+! WTP 3.0.1 releases  
 
-feature@org.eclipse.wst.ws_core.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_core.feature
-feature@org.eclipse.wst.ws_sdk.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_sdk.feature
-feature@org.eclipse.wst.ws_tests.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_tests.feature
-feature@org.eclipse.wst.ws_ui.feature=v200802150100,: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
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
+
+feature@org.eclipse.wst.ws_core.feature=v200807092124,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_core.feature
+feature@org.eclipse.wst.ws_sdk.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_sdk.feature
+feature@org.eclipse.wst.ws_tests.feature=v200807232146,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_tests.feature
+feature@org.eclipse.wst.ws_ui.feature=v200806192040,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_ui.feature
+feature@org.eclipse.wst.ws_userdoc.feature=v200712031330,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_userdoc.feature
+
+
+feature@org.eclipse.wst.ws_wsdl14.feature=v200802280619,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_wsdl14.feature
+feature@org.eclipse.wst.ws_wsdl15.feature=v200802280619,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/features/org.eclipse.wst.ws_wsdl15.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 5134a51..9c6562c 100644
--- a/releng.webservices/maps/wst-ws-core.map
+++ b/releng.webservices/maps/wst-ws-core.map
@@ -1,18 +1,17 @@
 !*************** wst-ws-core.map
-! This map file is for the 
-! WTP 2.0.x maintenance release.
+! This map file is for 
+! WTP 3.0.1 releases  
 
-! These bundles are currently being developed and released from the R2_0_maintenance branch.
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
 
-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
+plugin@org.eclipse.wst.ws=v200807162242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.ws
+plugin@org.eclipse.wst.ws.parser=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.ws.parser
 
+plugin@org.eclipse.wst.wsdl=v200807170534,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.wsdl
+plugin@org.eclipse.wst.wsdl.validation=v200807240215,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.wsdl.validation
+plugin@org.eclipse.wst.wsi=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.wsi
 
-! These bundles are currently being developed and released from HEAD.
-
-plugin@org.eclipse.wst.wsdl=v200801152132,: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
-
+plugin@org.eclipse.wst.ws.service.policy=v200806262217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.ws.service.policy
 
 !**********
\ 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 6b84202..4e4ce39 100644
--- a/releng.webservices/maps/wst-ws-tests.map
+++ b/releng.webservices/maps/wst-ws-tests.map
@@ -1,19 +1,19 @@
 !*************** wst-ws-tests.map
-! This map file is for the 
-! WTP 2.0.x maintenance release.
+! This map file is for 
+! WTP 3.0.1 releases  
 
-! These bundles are currently being developed and released from the R2_0_maintenance branch.
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
+! (except for wsdl.ui.tests which is from HEAD)
 
-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.wsdl.tests=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsdl.tests
+plugin@org.eclipse.wst.wsdl.tests.ui=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsdl.tests.ui
+plugin@org.eclipse.wst.wsdl.ui.tests=v200807282123,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsdl.ui.tests
+plugin@org.eclipse.wst.wsdl.validation.tests=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsdl.validation.tests
+plugin@org.eclipse.wst.wsi.tests=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsi.tests
 
-! These bundles are currently being developed and released from HEAD.
+plugin@org.eclipse.wst.wsdl.tests.performance=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.wsdl.tests.performance
 
-plugin@org.eclipse.wst.wsdl.tests=v200801152132,: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
-
+plugin@org.eclipse.wst.ws.tests=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/tests/org.eclipse.wst.ws.tests
 
 !***************
\ No newline at end of file
diff --git a/releng.webservices/maps/wst-ws-ui.map b/releng.webservices/maps/wst-ws-ui.map
index 7814e9b..d7fdbce 100644
--- a/releng.webservices/maps/wst-ws-ui.map
+++ b/releng.webservices/maps/wst-ws-ui.map
@@ -1,14 +1,16 @@
 !*************** wst-ws-ui.map
-! This map file is for the 
-! WTP 2.0.x maintenance release.
+! This map file is for 
+! WTP 3.0.1 releases  
 
-! These bundles are currently being developed and released from the R2_0_maintenance branch.
+! These bundles are currently being developed and released 
+! from the R3_0_maintenance branch
 
-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=v200802072125,: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
+plugin@org.eclipse.wst.ws.ui=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.ws.ui
+plugin@org.eclipse.wst.ws.explorer=v200806190413,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.ws.explorer
 
-! 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
+plugin@org.eclipse.wst.wsdl.ui=v200807232146,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.wsdl.ui
+plugin@org.eclipse.wst.wsi.ui=v200805140300,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.wsi.ui
+
+plugin@org.eclipse.wst.ws.service.policy.ui=v200807162242,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webservices/plugins/org.eclipse.wst.ws.service.policy.ui
 
 !**********
\ No newline at end of file
diff --git a/releng/.project b/releng/.project
index 649ff20..61d75f0 100644
--- a/releng/.project
+++ b/releng/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>releng R2_0_maintenance</name>
+	<name>releng R3_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
index 3391259..191c278 100644
--- a/releng/.settings/org.eclipse.core.resources.prefs
+++ b/releng/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Mon Dec 17 18:14:20 EST 2007
+#Wed Jan 02 14:25:25 EST 2008
 eclipse.preferences.version=1
 encoding/<project>=ISO-8859-1
diff --git a/releng/.settings/org.eclipse.core.runtime.prefs b/releng/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..8f87fd0
--- /dev/null
+++ b/releng/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,3 @@
+#Wed Jan 02 14:25:25 EST 2008
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/releng/.settings/org.eclipse.ltk.core.refactoring.prefs b/releng/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..e6693e3
--- /dev/null
+++ b/releng/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Sat May 24 20:18:18 EDT 2008
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/releng/.settings/org.eclipse.wst.html.core.prefs b/releng/.settings/org.eclipse.wst.html.core.prefs
new file mode 100644
index 0000000..0d9baa4
--- /dev/null
+++ b/releng/.settings/org.eclipse.wst.html.core.prefs
@@ -0,0 +1,36 @@
+#Sat May 24 20:18:18 EDT 2008
+attrDuplicate=2
+attrInvalidName=2
+attrInvalidValue=2
+attrNameMismatch=2
+attrUndefName=2
+attrUndefValue=2
+attrValueMismatch=1
+attrValueUnclosed=2
+cdataInvalidContent=2
+cdataUnclosed=1
+commentInvalidContent=2
+commentUnclosed=1
+docDoctypeUnclosed=1
+docDuplicateTag=1
+docInvalidChar=2
+docInvalidContent=2
+eclipse.preferences.version=1
+elemCoexistence=2
+elemDuplicate=2
+elemEndInvalidCase=1
+elemInvalidContent=2
+elemInvalidDirective=1
+elemInvalidEmptyTag=2
+elemInvalidName=1
+elemMissingEnd=2
+elemMissingStart=1
+elemStartInvalidCase=2
+elemUnclosedEndTag=1
+elemUnclosedStartTag=1
+elemUnknownName=2
+elemUnnecessaryEnd=2
+piInvalidContent=2
+piUnclosed=1
+piUndefined=2
+refInvalidContent=2
diff --git a/releng/.settings/org.eclipse.wst.validation.prefs b/releng/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..730e329
--- /dev/null
+++ b/releng/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,9 @@
+#Sat May 24 20:18:18 EDT 2008
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
+USER_PREFERENCE=overrideGlobalPreferencesfalse
+eclipse.preferences.version=1
+override=false
+suspend=false
+vf.version=3
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg
index ec52df6..11c9e93 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -1,15 +1,15 @@
-
-builderVersion=v200807090114
+builderVersion=v200807260100
 
 eclipse.builder=org.eclipse.releng.basebuilder
-eclipse.builder.version=RC4_33
+eclipse.builder.version=RC2_34
 # 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
+wtpBuildTools.url=http://download.eclipse.org/webtools/wtpBuildTools/drops/R3.0/T-T20080518043803-20080518043803/updateSite/plugins
+wtpBuildTools.file=org.eclipse.wtp.releng.tools_1.0.0.v200805140415.jar
+
 
 #   This parameter is specific to the compiler
 #   being used (JDT Compiler, in our case).
@@ -29,9 +29,14 @@
 #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
+# well, now M7_34 does :) 
+eclipse.base.version=3.4.0.v20080522
+ 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
 
+# new in 3.4 based build, have the source files for sdk builds bundled as individual jars.
+individualSourceBundles=true
+
 # dropins folder is either empty string, or /eclipse/dropins (no trailing spaces)
-dropinsFolder=
\ No newline at end of file
+dropinsFolder=/eclipse/dropins
diff --git a/releng/maps/dependencies.properties b/releng/maps/dependencies.properties
index 11f11d1..2a43c3e 100644
--- a/releng/maps/dependencies.properties
+++ b/releng/maps/dependencies.properties
@@ -13,8 +13,8 @@
 # file: Name of the library that is used.  If the library is platform dependent
 #       it must have suffixes such as: file.linux.gtk.x86
 #       These suffixes are the same as those used by releng baseos,basews,basearch
-#            baseos= linux or win32
-#            basews= gtk or win32
+#            baseos=linux or win32
+#            basews=gtk or win32
 #            basearch=x86
 # name:  A short user readable name for the library.
 # description:  One line description for the library.
@@ -30,30 +30,30 @@
 #                        always be requested from its original site.
 #
 # Example:
-# wtp.url  = http://download.eclipse.org/webtools/downloads/drops/R-0.7-200507290654
-# wtp.file = wtp-sdk-0.7.zip
-# wtp.name = WTP 0.7 SDK
-# wtp.description = WTP 0.7 SDK distribution
+# wtp.url=http://download.eclipse.org/webtools/downloads/drops/R-0.7-200507290654
+# wtp.file=wtp-sdk-0.7.zip
+# wtp.name=WTP 0.7 SDK
+# wtp.description=WTP 0.7 SDK distribution
 #######################################################################################
 
 
 #######################################################################################
 
-orbitthirdpartyzip.build.dir = R200709171314
-orbitthirdpartyzip.build.id = R200709171314
+orbitthirdpartyzip.build.dir=R20080611105805
+orbitthirdpartyzip.build.id=R20080611105805
 
-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/
+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
+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
 
 
 #######################################################################################
@@ -61,43 +61,58 @@
 # DITA zip to be downloaded
 # DITA will be used for Eclipse Help
 # groupID : dita
-dita.url = http://umn.dl.sourceforge.net/sourceforge/dita-ot/
-dita.file = DITA-OT1.2.1_bin-ASL.zip
-dita.name = SourceForge DITA-OT 1.2.1
-dita.description = DITA-OT 1.2.1 Binary ASL Distribution
+dita.url=http://umn.dl.sourceforge.net/sourceforge/dita-ot/
+dita.file=DITA-OT1.2.1_bin-ASL.zip
+dita.name=SourceForge DITA-OT 1.2.1
+dita.description=DITA-OT 1.2.1 Binary ASL Distribution
 #######################################################################################
 
-wtp.eclipse.build.id=3.3.2
-wtp.eclipse.build.dir=R-3.3.2-200802211800
-eclipse.name = Eclipse SDK v3.3.2
-eclipse.description = Eclipse SDK v3.3.2
+wtp.eclipse.build.id=3.4
+wtp.eclipse.build.dir=R-3.4-200806172000
+eclipse.name=Eclipse SDK v3.4
+eclipse.description=Eclipse SDK v3.4
 
 #######################################################################################
 # Eclipse SDK Dependency
 # Eclipse zip to be downloaded
 # Eclipse SDK will be used for building the distribution
 # groupID : eclipse
+
 eclipse.mirror.prefixuri=/eclipse/downloads/drops/${wtp.eclipse.build.dir}
-eclipse.url  = http://download.eclipse.org${eclipse.mirror.prefixuri}
+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.build.home = http://download.eclipse.org/eclipse/downloads/
+eclipse.build.home=http://download.eclipse.org/eclipse/downloads/
 
 #######################################################################################
 
+eclipseplatform.mirror.prefixuri=/eclipse/downloads/drops/${wtp.eclipse.build.dir}
+eclipseplatform.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
+eclipseplatform.file.linux-gtk-x86=eclipse-platform-${wtp.eclipse.build.id}-linux-gtk.tar.gz
+eclipseplatform.file.linux-gtk-ppc=eclipse-platform-${wtp.eclipse.build.id}-linux-gtk-ppc.tar.gz
+eclipseplatform.file.win32-win32-x86=eclipse-platform-${wtp.eclipse.build.id}-win32.zip
+eclipseplatform.file.macosx-carbon-ppc=eclipse-platform-${wtp.eclipse.build.id}-macosx-carbon.tar.gz
+eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/
+
+#######################################################################################
+
+
 #######################################################################################
 # Eclipse Test Framework
 # Eclipse Test Framework support zip to be downloaded
 # Eclipse Test Framework will be used for testing and building the tests
 # groupID : eclipseTestFramework
 
-eclipseTestFramework.url  = http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipseTestFramework.file = eclipse-test-framework-${wtp.eclipse.build.id}.zip
+eclipsetestFramework.id=${wtp.eclipse.build.id}
+eclipseTestFramework.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
+eclipseTestFramework.file=eclipse-test-framework-${eclipsetestFramework.id}.zip
 
-eclipseTestFramework.name = Eclipse test framework v3.3.1 Stream
-eclipseTestFramework.description = Eclipse test framework v3.3.1 Stream
+eclipseTestFramework.name=Eclipse Test Framework v3.4.
+eclipseTestFramework.description=Infrastructure to assist running automated JUnits.
+eclipseTestFramework.mirror.prefixuri=${eclipse.mirror.prefixuri}
+eclipseTestFramework.build.home=${eclipse.build.home}
 
 #######################################################################################
 
@@ -105,52 +120,83 @@
 # 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}
+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.
+eclipsereleng.description=Team tool to assist in releasing code.
+eclipsereleng.mirror.prefixuri=${eclipse.mirror.prefixuri}
+eclipsereleng.build.home=${eclipse.build.home}
 
 #######################################################################################
 
 #######################################################################################
 # Eclipse Modeling Framework (EMF) Dependency
 # EMF zip to be downloaded
-# EMF SDO XSD SDK will be used for building the distribution
+# EMF XSD SDK will be used for building the distribution
 # groupID : emf
 
-emf.mirror.prefixuri = /modeling/emf/emf/downloads/drops/2.3.2/R200802051830
-emf.file = emf-sdo-xsd-SDK-2.3.2.zip
-emf.name = EMF SDO XSD sdk v2.3.2
+emf.id=2.4.0
+emf.dir.id=R200806091234
 
-emf.url  = http://download.eclipse.org${emf.mirror.prefixuri}
-emf.description = ${emf.name}
-emf.build.home = http://www.eclipse.org/modeling/emf/downloads/
+emf.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.4.0/${emf.dir.id}
+emf.file=emf-runtime-${emf.id}.zip
+emf.name=EMF v2.4 Runtime
 
+emf.url=http://download.eclipse.org${emf.mirror.prefixuri}
+emf.description=Minimum executable code.
+emf.build.home=http://www.eclipse.org/modeling/emf/downloads/
 
-# This is a "dummy" section, to satisfy "get dependancy" scripts in wtpBuidler
-emfxsd.mirror.prefixuri = {emf.mirror.prefixuri} 
-emfxsd.file = ${emf.file}
-emfxsd.name = ${emf.name}
+emfsourcedoc.id=${emf.id}
+emfsourcedoc.dir.id=${emf.dir.id}
 
-emfxsd.url  = ${emf.url}
-emfxsd.description = ${emf.description}
-emfxsd.build.home = ${emf.build.home}
+emfsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.4.0/${emfsourcedoc.dir.id}
+emfsourcedoc.file=emf-sourcedoc-${emfsourcedoc.id}.zip
+emfsourcedoc.name=EMF v2.4 Source and Docs
+
+emfsourcedoc.url=http://download.eclipse.org${emf.mirror.prefixuri}
+emfsourcedoc.description=Additional download with Source and Documentation.
+emfsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/
+
 
 #######################################################################################
 
+emfxsd.id=${emf.id}
+emfxsd.dir.id=${emf.dir.id}
+emfxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.4.0/${emfxsd.dir.id}
+emfxsd.file=xsd-runtime-${emfxsd.id}.zip
+emfxsd.name=EMF XSD v2.4 Runtime
+
+emfxsd.url=http://download.eclipse.org${emfxsd.mirror.prefixuri}
+emfxsd.description=Minimum executable code.
+emfxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/
+
+emfxsdsourcedoc.id=${emfxsd.id}
+emfxsdsourcedoc.dir.id=${emfxsd.dir.id}
+emfxsdsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.4.0/${emfsourcedoc.dir.id}
+emfxsdsourcedoc.file=xsd-sourcedoc-${emfsourcedoc.id}.zip
+emfxsdsourcedoc.name=EMF XSD v2.4 Source and Docs
+
+emfxsdsourcedoc.url=http://download.eclipse.org${emf.mirror.prefixuri}
+emfxsdsourcedoc.description=Additional download with Source and Documentation.
+emfxsdsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/
+
+
 #######################################################################################
 # Eclipse Graphical Editing Framework (GEF) Dependency
 # GEF zip to be downloaded
 # GEF SDK will be used for building the distribution
 # groupID : gef
 
-gef.mirror.prefixuri= /tools/gef/downloads/drops/3.3.2/R200802211602
-gef.file = GEF-SDK-3.3.2.zip
-gef.name = GEF SDK 3.3.2 
+gef.id=3.4.0
+gef.dir.id=R200806091334
 
-gef.url  = http://download.eclipse.org${gef.mirror.prefixuri}
-gef.description = ${gef.name}
-gef.build.home = http://download.eclipse.org/tools/gef/downloads/
+gef.mirror.prefixuri=/tools/gef/downloads/drops/3.4.0/${gef.dir.id}
+gef.file=GEF-SDK-${gef.id}.zip
+gef.name=GEF SDK 3.4.
+
+gef.url=http://download.eclipse.org${gef.mirror.prefixuri}
+gef.description=GEF Code and Source.
+gef.build.home=http://download.eclipse.org/tools/gef/downloads/
 
 #######################################################################################
 
@@ -160,13 +206,13 @@
 # DTP SDK will be used for building the distribution
 # groupID : dtp
 
-dtp.mirror.prefixuri = /datatools/downloads/1.5
-dtp.file = dtp-sdk_1.5.2_022008.zip
-dtp.name = DTP sdk v1.5.2
+dtp.mirror.prefixuri=/datatools/downloads/1.6
+dtp.file=dtp-sdk_1.6.0.zip
+dtp.name=DTP sdk v1.6
 
-dtp.url  = http://download.eclipse.org${dtp.mirror.prefixuri}
-dtp.description = ${dtp.name}
-dtp.build.home = http://www.eclipse.org/datatools/downloads.html
+dtp.url=http://download.eclipse.org${dtp.mirror.prefixuri}
+dtp.description=Code and Source.
+dtp.build.home=http://www.eclipse.org/datatools/downloads.php
 
 #######################################################################################
 
@@ -176,9 +222,9 @@
 # Tomcat will be used for testing the distribution
 # groupID : tomcat.5
 tomcat.5.url=http://archive.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin
-tomcat.5.file = jakarta-tomcat-5.0.28.zip
-tomcat.5.name = Jakarta Tomcat v5.0.28
-tomcat.5.description = Jakarta Tomcat v5.0.28
+tomcat.5.file=jakarta-tomcat-5.0.28.zip
+tomcat.5.name=Jakarta Tomcat v5.0.28
+tomcat.5.description=Jakarta Tomcat v5.0.28
 #######################################################################################
 
 #######################################################################################
@@ -187,9 +233,9 @@
 # Tomcat will be used for testing the distribution
 # groupID : tomcat.4
 tomcat.4.url=http://archive.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}
+tomcat.4.file=apache-tomcat-4.1.36.zip
+tomcat.4.name=Apache Tomcat v4.1.36
+tomcat.4.description=${tomcat.4.name}
 #######################################################################################
 
 #######################################################################################
@@ -197,10 +243,10 @@
 # jonas zip to be downloaded
 # JOnAS will be used for testing the distribution
 # groupID : jonas.4
-jonas.4.url  = http://download.forge.objectweb.org/jonas/
-jonas.4.file = jonas4.3.2-tomcat5.0.30.tgz
-jonas.4.name = ObjectWeb JOnAS Tomcat v4.3.2
-jonas.4.description = ObjectWeb JOnAS Tomcat v4.3.2
+jonas.4.url=http://download.forge.objectweb.org/jonas/
+jonas.4.file=jonas4.3.2-tomcat5.0.30.tgz
+jonas.4.name=ObjectWeb JOnAS Tomcat v4.3.2
+jonas.4.description=ObjectWeb JOnAS Tomcat v4.3.2
 #######################################################################################
 
 #######################################################################################
@@ -208,11 +254,11 @@
 # oagis_release zip to be downloaded (CANNOT BE DOWNLOADED AUTOMATICALLY)
 # oagis_release will be used for testing the distribution
 # groupID : oagis.release
-oagis.release.url  = http://www.openapplications.org/downloads/oagis/rls80/
-oagis.release.file = oagis_release_8.0_GA-withSP3.zip
+oagis.release.url=http://www.openapplications.org/downloads/oagis/rls80/
+oagis.release.file=oagis_release_8.0_GA-withSP3.zip
 oagis.release.autodownload=true
-oagis.release.name = OAGIS Release v8.0 SP3
-oagis.release.description = OAGIS Release v8.0 SP3
+oagis.release.name=OAGIS Release v8.0 SP3
+oagis.release.description=OAGIS Release v8.0 SP3
 #######################################################################################
 
 #######################################################################################
@@ -220,11 +266,11 @@
 # oagis_wsdl_8.0.zip to be downloaded (CANNOT BE DOWNLOADED AUTOMATICALLY)
 # oagis_wdl will be used for testing the distribution
 # groupID : oagis.wsdl
-oagis.wsdl.url  = http://www.openapplications.org/downloads/oagis/rls80
-oagis.wsdl.file = WSDL_1.1_for%20OAGIS_8.0.zip
+oagis.wsdl.url=http://www.openapplications.org/downloads/oagis/rls80
+oagis.wsdl.file=WSDL_1.1_for%20OAGIS_8.0.zip
 oagis.wsdl.autodownload=true
-oagis.wsdl.name = OAGIS WSDL v8.0 SP3
-oagis.wsdl.description = OAGIS WSDL v8.0 SP3
+oagis.wsdl.name=OAGIS WSDL v8.0 SP3
+oagis.wsdl.description=OAGIS WSDL v8.0 SP3
 #######################################################################################
 
 #######################################################################################
@@ -232,10 +278,10 @@
 # Derby zip to be downloaded
 # Derby will be used for performance testing
 # groupID : derby
-derby.url = http://cvs.apache.org/dist/incubator/derby/10.0.2.1
-derby.file = incubating-derby-10.0.2.1-bin.zip
-derby.name = Apache Derby 10.0.2.1
-derby.description = Apache Derby 10.0.2.1
+derby.url=http://cvs.apache.org/dist/incubator/derby/10.0.2.1
+derby.file=incubating-derby-10.0.2.1-bin.zip
+derby.name=Apache Derby 10.0.2.1
+derby.description=Apache Derby 10.0.2.1
 #######################################################################################
 
 #######################################################################################
@@ -260,19 +306,23 @@
 
 
 
-# WST is required for XSL build (not really used in 2.0 maintenance, but 
-# we leave definitions here, since parts of the common scripts expect to 
-# read something.
+# WST or XML is required for XSL build
 
-wst.file=wtp-wst-sdk-S-3.0M4-20080105091323.zip
-wst.name=WST M4
-wst.description=WST M4
+wst.file=wtp-wst-R-3.0-20080616152118.zip
+wst.name=WST
+wst.description=WST
 wst.build.home=http://download.eclipse.org/webtools/downloads/
-wst.mirror.prefixuri=webtools/downloads/drops/R3.0/S-3.0M4-20080105091323
+wst.mirror.prefixuri=webtools/downloads/drops/R3.0/R-3.0-20080616152118
 wst.url=http://download.eclipse.org/${wst.mirror.prefixuri}
 
-# used when doing file-system checks of existence
-# when on Eclipse.org infrastructure
+xml.file=wtp-xml-R-3.0-20080616152118.zip
+xml.name=XML
+xml.description=XML
+xml.build.home=http://download.eclipse.org/webtools/downloads/
+xml.mirror.prefixuri=webtools/downloads/drops/R3.0/R-3.0-20080616152118
+xml.url=http://download.eclipse.org/${xml.mirror.prefixuri}
+
+
 eclipse.fspath.prefix=/home/data/httpd/download.eclipse.org
 
 
diff --git a/releng/maps/isv-docs.map b/releng/maps/isv-docs.map
deleted file mode 100644
index 6d76534..0000000
--- a/releng/maps/isv-docs.map
+++ /dev/null
@@ -1,6 +0,0 @@
-!*************** isv massive docs
-
-! temporary. Should be removed as project/component level is created
-
-plugin@org.eclipse.wst.doc.isv=v200802201635,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/docs/org.eclipse.wst.doc.isv
-plugin@org.eclipse.jst.doc.isv=v200802201635,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/docs/org.eclipse.jst.doc.isv
diff --git a/releng/maps/jst.map b/releng/maps/jst.map
index 6064715..d2334a7 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=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/plugins/org.eclipse.jst
+plugin@org.eclipse.jst=v200805140017,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/plugins/org.eclipse.jst
 
-feature@org.eclipse.jst.sdk=v200806252211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.jst.sdk
-feature@org.eclipse.jst.tests=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.jst.tests
-feature@org.eclipse.jst=v200806252211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.jst.feature
+feature@org.eclipse.jst.sdk=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.jst.sdk
+feature@org.eclipse.jst.tests=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.jst.tests
+feature@org.eclipse.jst=v200807220139,: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.map b/releng/maps/orbitBundles.map
index 7e040aa..ee9c78d 100644
--- a/releng/maps/orbitBundles.map
+++ b/releng/maps/orbitBundles.map
@@ -1,232 +1,372 @@
-!*** This file was created on September 17, 2007 9:28:02 AM EDT
-plugin@com.ibm.icu,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu_3.4.5.jar
+!*** This file was created on June 11, 2008 11:43:28 AM GMT
+plugin@ch.ethz.iks.slp,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/ch.ethz.iks.slp_1.0.0.RC4_v200806091030.jar
 
-plugin@com.ibm.icu,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu_3.6.0.20061215.jar
+plugin@ch.ethz.iks.slp.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/ch.ethz.iks.slp.source_1.0.0.RC2_v20080604-1500.jar
 
-plugin@com.ibm.icu,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu_3.6.1.v20070906.jar
+plugin@com.ibm.icu,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu_3.4.5.jar
 
-plugin@com.ibm.icu.base,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu.base_3.4.5.jar
+plugin@com.ibm.icu,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu_3.6.0.v20080530.jar
 
-plugin@com.ibm.icu.base,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu.base_3.6.0.20061215.jar
+plugin@com.ibm.icu,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu_3.6.1.v20080530.jar
 
-plugin@com.ibm.icu.base,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu.base_3.6.1.v20070906.jar
+plugin@com.ibm.icu,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu_3.8.1.v20080530.jar
 
-plugin@com.ibm.icu.base.source,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu.base.source_3.4.5.zip,unpack=true
+plugin@com.ibm.icu.base,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.base_3.4.5.jar
 
-plugin@com.ibm.icu.base.source,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu.base.source_3.6.0.20061215.zip,unpack=true
+plugin@com.ibm.icu.base,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.base_3.6.0.v20080530.jar
 
-plugin@com.ibm.icu.base.source,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu.base.source_3.6.1.v20070906.zip,unpack=true
+plugin@com.ibm.icu.base,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.base_3.6.1.v20080530.jar
 
-plugin@com.ibm.icu.source,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu.source_3.4.5.zip,unpack=true
+plugin@com.ibm.icu.base,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.base_3.8.1.v20080530.jar
 
-plugin@com.ibm.icu.source,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu.source_3.6.0.20061215.zip,unpack=true
+plugin@com.ibm.icu.base.source,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.base.source_3.4.5.jar
 
-plugin@com.ibm.icu.source,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.ibm.icu.source_3.6.1.v20070906.zip,unpack=true
+plugin@com.ibm.icu.base.source,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.base.source_3.6.0.v20080530.jar
 
-plugin@com.jcraft.jsch,0.1.28=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.jcraft.jsch_0.1.28.jar
+plugin@com.ibm.icu.base.source,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.base.source_3.6.1.v20080530.jar
 
-plugin@com.jcraft.jsch,0.1.31=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/com.jcraft.jsch_0.1.31.jar
+plugin@com.ibm.icu.base.source,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.base.source_3.8.1.v20080530.jar
 
-plugin@javax.activation,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.activation_1.1.0.v200706111329.jar
+plugin@com.ibm.icu.source,3.4.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.source_3.4.5.jar
 
-plugin@javax.mail,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.mail_1.4.0.v200706111329.jar
+plugin@com.ibm.icu.source,3.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.source_3.6.0.v20080530.jar
 
-plugin@javax.management,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.management_1.2.0.v200706111329.jar
+plugin@com.ibm.icu.source,3.6.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.source_3.6.1.v20080530.jar
 
-plugin@javax.management.remote,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.management.remote_1.0.0.v200706111329.jar
+plugin@com.ibm.icu.source,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.ibm.icu.source_3.8.1.v20080530.jar
 
-plugin@javax.servlet,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.servlet_2.3.0.v200706111724.jar
+plugin@com.jcraft.jsch,0.1.28=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.jcraft.jsch_0.1.28.jar
 
-plugin@javax.servlet,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.servlet_2.4.0.v200706111738.jar
+plugin@com.jcraft.jsch,0.1.31=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.jcraft.jsch_0.1.31.jar
 
-plugin@javax.servlet.jsp,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.servlet.jsp_1.2.0.v200706111724.jar
+plugin@com.jcraft.jsch,0.1.37=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.jcraft.jsch_0.1.37.v200803061811.jar
 
-plugin@javax.servlet.jsp,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.servlet.jsp_2.0.0.v200706191603.jar
+plugin@com.jcraft.jsch.source,0.1.37=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.jcraft.jsch.source_0.1.37.v200803061811.jar
 
-plugin@javax.servlet.jsp.source,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.servlet.jsp.source_1.2.0.v200706111724.zip,unpack=true
+plugin@com.sun.syndication,0.9.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.sun.syndication_0.9.0.v200803061811.jar
+
+plugin@com.sun.syndication.source,0.9.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/com.sun.syndication.source_0.9.0.v200803061811.jar
+
+plugin@java_cup.runtime,0.10.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/java_cup.runtime_0.10.0.v200803061811.jar
+
+plugin@java_cup.runtime.source,0.10.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/java_cup.runtime.source_0.10.0.v200803061811.jar
+
+plugin@javax.activation,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.activation_1.1.0.v200806101325.jar
+
+plugin@javax.jws,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.jws_2.0.0.v200806110623.jar
+
+plugin@javax.mail,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.mail_1.4.0.v200804091730.jar
+
+plugin@javax.management,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.management_1.2.0.v200803061811.jar
+
+plugin@javax.management.remote,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.management.remote_1.0.0.v200803061811.jar
+
+plugin@javax.servlet,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet_2.3.0.v200806031603.jar
+
+plugin@javax.servlet,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet_2.4.0.v200806031604.jar
+
+plugin@javax.servlet,2.5.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet_2.5.0.v200806031605.jar
+
+plugin@javax.servlet.jsp,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet.jsp_1.2.0.v200806031606.jar
+
+plugin@javax.servlet.jsp,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet.jsp_2.0.0.v200806031607.jar
+
+plugin@javax.servlet.jsp.source,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet.jsp.source_1.2.0.v200806031606.jar
+
+plugin@javax.servlet.jsp.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet.jsp.source_2.0.0.v200806031607.jar
+
+plugin@javax.servlet.source,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet.source_2.3.0.v200806031603.jar
+
+plugin@javax.servlet.source,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet.source_2.4.0.v200806031604.jar
+
+plugin@javax.servlet.source,2.5.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.servlet.source_2.5.0.v200806031605.jar
+
+plugin@javax.wsdl,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.wsdl_1.4.0.v200806030407.jar
+
+plugin@javax.wsdl,1.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.wsdl_1.5.1.v200806030408.jar
+
+plugin@javax.wsdl,1.6.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.wsdl_1.6.2.v200806030405.jar
+
+plugin@javax.wsdl.source,1.6.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.wsdl.source_1.6.2.v200806030405.jar
+
+plugin@javax.wsdl15,1.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.wsdl15_1.5.1.v200806030409.jar
+
+plugin@javax.xml,1.3.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.xml_1.3.4.v200806030440.jar
+
+plugin@javax.xml.bind,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.xml.bind_2.0.0.v20080604-1500.jar
+
+plugin@javax.xml.bind.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.xml.bind.source_2.0.0.v20080604-1500.jar
+
+plugin@javax.xml.rpc,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.xml.rpc_1.1.0.v200806030420.zip,unpack=true
+
+plugin@javax.xml.soap,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.xml.soap_1.2.0.v200806030421.zip,unpack=true
+
+plugin@javax.xml.ws,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/javax.xml.ws_2.0.0.v200806030422.jar
+
+plugin@net.sourceforge.lpg.lpgjavaruntime,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/net.sourceforge.lpg.lpgjavaruntime_1.0.0.v200803061811.jar
+
+plugin@net.sourceforge.lpg.lpgjavaruntime,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200803061910.jar
+
+plugin@net.sourceforge.lpg.lpgjavaruntime.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/net.sourceforge.lpg.lpgjavaruntime.source_1.0.0.v200803061811.jar
+
+plugin@net.sourceforge.lpg.lpgjavaruntime.source,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/net.sourceforge.lpg.lpgjavaruntime.source_1.1.0.v200803061910.jar
+
+plugin@net.sourceforge.mx4j,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/net.sourceforge.mx4j_3.0.1.v200803061811.jar
+
+plugin@net.sourceforge.mx4j.remote,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/net.sourceforge.mx4j.remote_3.0.1.v200803061811.jar
+
+plugin@org.antlr.runtime,3.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.antlr.runtime_3.0.0.v200803061811.jar
+
+plugin@org.antlr.runtime.source,3.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.antlr.runtime.source_3.0.0.v200803061811.jar
+
+plugin@org.apache.ant,1.6.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.ant_1.6.5.v200803061811.zip,unpack=true
+
+plugin@org.apache.ant,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.ant_1.7.0.v200803061910.zip,unpack=true
+
+plugin@org.apache.ant.source,1.6.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.ant.source_1.6.5.v200803061811.jar
+
+plugin@org.apache.ant.source,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.ant.source_1.7.0.v200803061910.jar
+
+! Note: temporary location from 'committers' area until maintenance release
+plugin@org.apache.axis,1.4.0=GET,http://download.eclipse.org/tools/orbit/committers/drops/I20080723082916/bundles/org.apache.axis_1.4.0.v200807230600.zip,unpack=true
+!plugin@org.apache.axis,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.axis_1.4.0.v200806030120.zip,unpack=true
+
+plugin@org.apache.batik.bridge,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.bridge_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.bridge.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.bridge.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.css,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.css_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.css.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.css.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.dom,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.dom_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.dom.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.dom.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.dom.svg,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.dom.svg_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.dom.svg.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.dom.svg.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.ext.awt,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.ext.awt_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.ext.awt.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.ext.awt.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.extension,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.extension_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.extension.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.extension.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.parser,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.parser_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.parser.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.parser.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.pdf,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.pdf_1.6.0.v200806031500.jar
+
+plugin@org.apache.batik.svggen,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.svggen_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.svggen.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.svggen.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.swing,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.swing_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.swing.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.swing.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.transcoder,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.transcoder_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.transcoder.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.transcoder.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.util,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.util_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.util.gui,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.util.gui_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.util.gui.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.util.gui.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.util.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.util.source_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.xml,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.xml_1.6.0.v200805290154.jar
+
+plugin@org.apache.batik.xml.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.batik.xml.source_1.6.0.v200805290154.jar
 
-plugin@javax.servlet.jsp.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.servlet.jsp.source_2.0.0.v200706191603.zip,unpack=true
+plugin@org.apache.bcel,5.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.bcel_5.2.0.v200803061811.jar
 
-plugin@javax.servlet.source,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.servlet.source_2.3.0.v200706111724.zip,unpack=true
+plugin@org.apache.bcel.source,5.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.bcel.source_5.2.0.v200803061811.jar
 
-plugin@javax.servlet.source,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.servlet.source_2.4.0.v200706111738.zip,unpack=true
+plugin@org.apache.bsf,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.bsf_2.4.0.v200806031435.jar
 
-plugin@javax.wsdl,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.wsdl_1.4.0.v200706111329.jar
+plugin@org.apache.bsf.source,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.bsf.source_2.4.0.v200804101336.jar
 
-plugin@javax.wsdl,1.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.wsdl_1.5.1.v200709050115.jar
+plugin@org.apache.commons.beanutils,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.beanutils_1.7.0.v200803061811.jar
 
-plugin@javax.wsdl15,1.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.wsdl15_1.5.1.v200705290614.jar
+plugin@org.apache.commons.beanutils.source,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.beanutils.source_1.7.0.v200803061811.jar
 
-plugin@javax.xml.rpc,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.xml.rpc_1.1.0.v200706111329.zip,unpack=true
+plugin@org.apache.commons.cli,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.cli_1.0.0.v20080604-1500.jar
 
-plugin@javax.xml.soap,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/javax.xml.soap_1.2.0.v200706111329.zip,unpack=true
+plugin@org.apache.commons.cli.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.cli.source_1.0.0.v20080604-1500.jar
 
-plugin@net.sourceforge.lpg.lpgjavaruntime,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/net.sourceforge.lpg.lpgjavaruntime_1.0.0.v200706111724.jar
+plugin@org.apache.commons.codec,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.codec_1.2.0.v20080530-1550.jar
 
-plugin@net.sourceforge.lpg.lpgjavaruntime,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200706111738.jar
+plugin@org.apache.commons.codec,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.codec_1.3.0.v20080530-1600.jar
 
-plugin@net.sourceforge.lpg.lpgjavaruntime.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/net.sourceforge.lpg.lpgjavaruntime.source_1.0.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.codec.source,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.codec.source_1.2.0.v20080530-1550.jar
 
-plugin@net.sourceforge.lpg.lpgjavaruntime.source,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/net.sourceforge.lpg.lpgjavaruntime.source_1.1.0.v200706111738.zip,unpack=true
+plugin@org.apache.commons.codec.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar
 
-plugin@net.sourceforge.mx4j,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/net.sourceforge.mx4j_3.0.1.v200706111329.jar
+plugin@org.apache.commons.collections,3.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.collections_3.2.0.v200803061811.jar
 
-plugin@net.sourceforge.mx4j.remote,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/net.sourceforge.mx4j.remote_3.0.1.v200706111329.jar
+plugin@org.apache.commons.collections.source,3.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.collections.source_3.2.0.v200803061811.jar
 
-plugin@org.apache.ant,1.6.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.ant_1.6.5.v200706080840.zip,unpack=true
+plugin@org.apache.commons.discovery,0.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.discovery_0.2.0.v200806030120.zip,unpack=true
 
-plugin@org.apache.ant,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.ant_1.7.0.v200706080842.zip,unpack=true
+plugin@org.apache.commons.el,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.el_1.0.0.v200806031608.jar
 
-plugin@org.apache.ant.source,1.6.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.ant.source_1.6.5.v200706080840.zip,unpack=true
+plugin@org.apache.commons.el.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.el.source_1.0.0.v200806031608.jar
 
-plugin@org.apache.ant.source,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.ant.source_1.7.0.v200706080842.zip,unpack=true
+plugin@org.apache.commons.fileupload,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.fileupload_1.2.0.v20080604-1500.jar
 
-plugin@org.apache.axis,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.axis_1.4.0.v200706191647.zip,unpack=true
+plugin@org.apache.commons.fileupload.source,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.fileupload.source_1.2.0.v20080604-1500.jar
 
-plugin@org.apache.batik.bridge,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.bridge_1.6.0.v200706111724.jar
+plugin@org.apache.commons.httpclient,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.httpclient_3.0.1.v20080605-1930.jar
 
-plugin@org.apache.batik.bridge.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.bridge.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.httpclient,3.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
 
-plugin@org.apache.batik.css,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.css_1.6.0.v200706111724.jar
+plugin@org.apache.commons.httpclient.source,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.httpclient.source_3.0.1.v20080605-1930.jar
 
-plugin@org.apache.batik.css.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.css.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.httpclient.source,3.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar
 
-plugin@org.apache.batik.dom,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.dom_1.6.0.v200706111724.jar
+plugin@org.apache.commons.io,1.3.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.io_1.3.2.v20080604-1500.jar
 
-plugin@org.apache.batik.dom.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.dom.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.io.source,1.3.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.io.source_1.3.2.v20080604-1500.jar
 
-plugin@org.apache.batik.dom.svg,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.dom.svg_1.6.0.v200706111724.jar
+plugin@org.apache.commons.jxpath,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.jxpath_1.2.0.v20080604-1500.jar
 
-plugin@org.apache.batik.dom.svg.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.dom.svg.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.jxpath.source,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.jxpath.source_1.2.0.v20080604-1500.jar
 
-plugin@org.apache.batik.ext.awt,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.ext.awt_1.6.0.v200706111724.jar
+plugin@org.apache.commons.lang,2.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.lang_2.1.0.v200803061811.jar
 
-plugin@org.apache.batik.ext.awt.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.ext.awt.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.lang,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.lang_2.3.0.v200803061910.jar
 
-plugin@org.apache.batik.extension,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.extension_1.6.0.v200706111724.jar
+plugin@org.apache.commons.lang.source,2.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.lang.source_2.1.0.v200803061811.jar
 
-plugin@org.apache.batik.extension.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.extension.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.lang.source,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.lang.source_2.3.0.v200803061910.jar
 
-plugin@org.apache.batik.parser,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.parser_1.6.0.v200706111724.jar
+plugin@org.apache.commons.logging,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.logging_1.0.4.v20080605-1930.jar
 
-plugin@org.apache.batik.parser.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.parser.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.logging,1.1.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.logging_1.1.1.v20080605-1935.jar
 
-plugin@org.apache.batik.pdf,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.pdf_1.6.0.v200706111329.jar
+plugin@org.apache.commons.logging.source,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.logging.source_1.0.4.v20080605-1930.jar
 
-plugin@org.apache.batik.svggen,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.svggen_1.6.0.v200706111724.jar
+plugin@org.apache.commons.logging.source,1.1.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.logging.source_1.1.1.v20080605-1935.jar
 
-plugin@org.apache.batik.svggen.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.svggen.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.net,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.net_1.4.1.v200803071935.jar
 
-plugin@org.apache.batik.swing,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.swing_1.6.0.v200706111724.jar
+plugin@org.apache.commons.net.source,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.net.source_1.4.1.v200803071935.jar
 
-plugin@org.apache.batik.swing.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.swing.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.commons.pool,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.pool_1.3.0.v20080604-1500.jar
 
-plugin@org.apache.batik.transcoder,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.transcoder_1.6.0.v200706111724.jar
+plugin@org.apache.commons.pool.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.commons.pool.source_1.3.0.v20080604-1500.jar
 
-plugin@org.apache.batik.transcoder.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.transcoder.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.derby,10.1.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.derby_10.1.2.1_v200803061811.jar
 
-plugin@org.apache.batik.util,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.util_1.6.0.v200706111724.jar
+plugin@org.apache.derby.source,10.1.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.derby.source_10.1.2.1_v200803061811.jar
 
-plugin@org.apache.batik.util.gui,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.util.gui_1.6.0.v200706111724.jar
+plugin@org.apache.jasper,5.5.17=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.jasper_5.5.17.v200806031609.jar
 
-plugin@org.apache.batik.util.gui.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.util.gui.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.jasper.source,5.5.17=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.jasper.source_5.5.17.v200806031609.jar
 
-plugin@org.apache.batik.util.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.util.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.log4j,1.2.13=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.log4j_1.2.13.v200806030600.jar
 
-plugin@org.apache.batik.xml,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.xml_1.6.0.v200706111724.jar
+plugin@org.apache.log4j,1.2.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.log4j_1.2.8.v200803061910.jar
 
-plugin@org.apache.batik.xml.source,1.6.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.batik.xml.source_1.6.0.v200706111724.zip,unpack=true
+plugin@org.apache.lucene,1.4.3=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.lucene_1.4.3.v20080530-1550.jar
 
-plugin@org.apache.commons.codec,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.codec_1.2.0.v200706111724.jar
+plugin@org.apache.lucene,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.lucene_1.9.1.v20080530-1600.jar
 
-plugin@org.apache.commons.codec,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.codec_1.3.0.v200706111738.jar
+plugin@org.apache.lucene.analysis,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.lucene.analysis_1.9.1.v20080530-1600.jar
 
-plugin@org.apache.commons.codec.source,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.codec.source_1.2.0.v200706111724.zip,unpack=true
+plugin@org.apache.lucene.analysis.source,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.lucene.analysis.source_1.9.1.v20080530-1600.jar
 
-plugin@org.apache.commons.codec.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.codec.source_1.3.0.v200706111738.zip,unpack=true
+plugin@org.apache.lucene.source,1.4.3=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.lucene.source_1.4.3.v20080530-1550.jar
 
-plugin@org.apache.commons.discovery,0.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.discovery_0.2.0.v200706111329.zip,unpack=true
+plugin@org.apache.lucene.source,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.lucene.source_1.9.1.v20080530-1600.jar
 
-plugin@org.apache.commons.el,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.el_1.0.0.v200706111724.jar
+plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.oro_2.0.8.v200803061811.jar
 
-plugin@org.apache.commons.el.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.el.source_1.0.0.v200706111724.zip,unpack=true
+plugin@org.apache.oro.source,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.oro.source_2.0.8.v200803061811.jar
 
-plugin@org.apache.commons.httpclient,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.httpclient_3.0.1.v200706111724.jar
+plugin@org.apache.ws.commons.util,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.ws.commons.util_1.0.0.v20080530-1550.jar
 
-plugin@org.apache.commons.httpclient.source,3.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.httpclient.source_3.0.1.v200706111724.zip,unpack=true
+plugin@org.apache.ws.jaxme,0.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.ws.jaxme_0.5.1.v20080530-1550.jar
 
-plugin@org.apache.commons.logging,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.logging_1.0.4.v200706111724.jar
+plugin@org.apache.wsil4j,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.wsil4j_1.0.0.v200806040330.jar
 
-plugin@org.apache.commons.logging.source,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.logging.source_1.0.4.v200706111724.zip,unpack=true
+plugin@org.apache.xalan,2.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.xalan_2.7.0.v200806030241.jar
 
-plugin@org.apache.commons.net,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.net_1.4.1.v200709121930.jar
+plugin@org.apache.xalan,2.7.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.xalan_2.7.1.v200806030242.jar
 
-plugin@org.apache.commons.net.source,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.commons.net.source_1.4.1.v200709121930.zip,unpack=true
+plugin@org.apache.xerces,2.8.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.xerces_2.8.0.v200803070308.jar
 
-plugin@org.apache.derby,10.1.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.derby_10.1.2.1_v200706111724.jar
+plugin@org.apache.xerces,2.9.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.xerces_2.9.0.v200805270400.jar
 
-plugin@org.apache.derby.source,10.1.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.derby.source_10.1.2.1_v200706111724.zip,unpack=true
+plugin@org.apache.xml.resolver,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.xml.resolver_1.1.0.v200806030311.jar
 
-plugin@org.apache.jasper,5.5.17=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.jasper_5.5.17.v200706111724.jar
+plugin@org.apache.xml.resolver,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.xml.resolver_1.2.0.v200806030312.jar
 
-plugin@org.apache.jasper.source,5.5.17=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.jasper.source_5.5.17.v200706111724.zip,unpack=true
+plugin@org.apache.xml.serializer,2.7.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.xml.serializer_2.7.1.v200806030322.jar
 
-plugin@org.apache.log4j,1.2.13=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.log4j_1.2.13.v200706111418.jar
+plugin@org.apache.xmlrpc,3.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.apache.xmlrpc_3.0.0.v20080530-1550.jar
 
-plugin@org.apache.log4j,1.2.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.log4j_1.2.8.v200706111329.jar
+plugin@org.jdom,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.jdom_1.0.0.v200806100616.jar
 
-plugin@org.apache.lucene,1.4.3=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.lucene_1.4.3.v200706111738.jar
+plugin@org.jdom.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.jdom.source_1.0.0.v200806100616.jar
 
-plugin@org.apache.lucene,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.lucene_1.9.1.v200706111724.jar
+plugin@org.junit,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.junit_3.8.1.v20080602-1317.zip,unpack=true
 
-plugin@org.apache.lucene.analysis,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.lucene.analysis_1.9.1.v200706181610.jar
+plugin@org.junit,3.8.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.junit_3.8.2.v20080602-1318.zip,unpack=true
 
-plugin@org.apache.lucene.analysis.source,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.lucene.analysis.source_1.9.1.v200706181610.zip,unpack=true
+plugin@org.junit.source,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.junit.source_3.8.1.v20080602-1317.jar
 
-plugin@org.apache.lucene.source,1.4.3=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.lucene.source_1.4.3.v200706111738.zip,unpack=true
+plugin@org.junit.source,3.8.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.junit.source_3.8.2.v20080602-1318.jar
 
-plugin@org.apache.lucene.source,1.9.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.lucene.source_1.9.1.v200706111724.zip,unpack=true
+plugin@org.mortbay.jetty,5.1.11=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mortbay.jetty_5.1.11.v200806031610.jar
 
-plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.oro_2.0.8.v200706111724.jar
+plugin@org.mortbay.jetty,5.1.14=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mortbay.jetty_5.1.14.v200806031611.jar
 
-plugin@org.apache.oro.source,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.oro.source_2.0.8.v200706111724.zip,unpack=true
+plugin@org.mortbay.jetty.server,6.1.7=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mortbay.jetty.server_6.1.7.v200806031612.jar
 
-plugin@org.apache.ws.commons.util,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.ws.commons.util_1.0.0.v200706111329.jar
+plugin@org.mortbay.jetty.server.source,6.1.7=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mortbay.jetty.server.source_6.1.7.v200806031612.jar
 
-plugin@org.apache.ws.jaxme,0.5.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.ws.jaxme_0.5.1.v200706111329.jar
+plugin@org.mortbay.jetty.source,5.1.11=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mortbay.jetty.source_5.1.11.v200806031610.jar
 
-plugin@org.apache.wsil4j,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.wsil4j_1.0.0.v200706111329.jar
+plugin@org.mortbay.jetty.source,5.1.14=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mortbay.jetty.source_5.1.14.v200806031611.jar
 
-plugin@org.apache.xerces,2.8.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.xerces_2.8.0.v200705301630.jar
+plugin@org.mortbay.jetty.util,6.1.7=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mortbay.jetty.util_6.1.7.v200806031612.jar
 
-plugin@org.apache.xml.resolver,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.xml.resolver_1.1.0.v200705310020.jar
+plugin@org.mortbay.jetty.util.source,6.1.7=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mortbay.jetty.util.source_6.1.7.v200806031612.jar
 
-plugin@org.apache.xmlrpc,3.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.apache.xmlrpc_3.0.0.v200706111329.jar
+plugin@org.mozilla.javascript,1.6.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mozilla.javascript_1.6.2.v200806030330.jar
 
-plugin@org.junit,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.junit_3.8.1.v200706111724.zip,unpack=true
+plugin@org.mozilla.javascript,1.6.6=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.mozilla.javascript_1.6.6.v200806030331.jar
 
-plugin@org.junit,3.8.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.junit_3.8.2.v200706111738.zip,unpack=true
+plugin@org.objectweb.asm,3.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.objectweb.asm_3.0.0.v200803061811.jar
 
-plugin@org.junit.source,3.8.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.junit.source_3.8.1.v200706111724.zip,unpack=true
+plugin@org.objectweb.asm,3.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.objectweb.asm_3.1.0.v200803061910.jar
 
-plugin@org.junit.source,3.8.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.junit.source_3.8.2.v200706111738.zip,unpack=true
+plugin@org.objectweb.asm.source,3.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.objectweb.asm.source_3.0.0.v200803061811.jar
 
-plugin@org.mortbay.jetty,5.1.11=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.mortbay.jetty_5.1.11.v200706111724.jar
+plugin@org.objectweb.asm.source,3.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.objectweb.asm.source_3.1.0.v200803061910.jar
 
-plugin@org.mortbay.jetty.source,5.1.11=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.mortbay.jetty.source_5.1.11.v200706111724.zip,unpack=true
+plugin@org.sat4j.core,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.sat4j.core_2.0.0.v20080602.jar
 
-plugin@org.mozilla.javascript,1.6.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.mozilla.javascript_1.6.2.v200706111329.jar
+plugin@org.sat4j.pb,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.sat4j.pb_2.0.0.v20080602.jar
 
-plugin@org.uddi4j,2.0.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.uddi4j_2.0.5.v200706111329.jar
+plugin@org.uddi4j,2.0.5=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.uddi4j_2.0.5.v200805270300.jar
 
-plugin@org.w3c.css.sac,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.w3c.css.sac_1.3.0.v200706111724.jar
+plugin@org.w3c.css.sac,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.w3c.css.sac_1.3.0.v200805290154.jar
 
-plugin@org.w3c.css.sac.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.w3c.css.sac.source_1.3.0.v200706111724.zip,unpack=true
+plugin@org.w3c.css.sac.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.w3c.css.sac.source_1.3.0.v200805290154.jar
 
-plugin@org.w3c.dom.smil,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.w3c.dom.smil_1.0.0.v200706111724.jar
+plugin@org.w3c.dom.smil,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.w3c.dom.smil_1.0.0.v200806040011.jar
 
-plugin@org.w3c.dom.smil.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.w3c.dom.smil.source_1.0.0.v200706111724.zip,unpack=true
+plugin@org.w3c.dom.smil.source,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.w3c.dom.smil.source_1.0.0.v200806040011.jar
 
-plugin@org.w3c.dom.svg,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.w3c.dom.svg_1.1.0.v200706111724.jar
+plugin@org.w3c.dom.svg,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.w3c.dom.svg_1.1.0.v200806040011.jar
 
-plugin@org.w3c.dom.svg.source,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R200709171314/bundles/org.w3c.dom.svg.source_1.1.0.v200706111724.zip,unpack=true
+plugin@org.w3c.dom.svg.source,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20080611105805/bundles/org.w3c.dom.svg.source_1.1.0.v200806040011.jar
diff --git a/releng/maps/wst.map b/releng/maps/wst.map
index b30372d..67ae201 100644
--- a/releng/maps/wst.map
+++ b/releng/maps/wst.map
@@ -1,14 +1,14 @@
 !*************** wst product plugin and assembly features
 ! This map file is for 
-! WTP 2.0.x maintenance releases  
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch
+! from the HEAD branch
 
-plugin@org.eclipse.wst=v200706120315,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/plugins/org.eclipse.wst
+plugin@org.eclipse.wst=v200805140017,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/plugins/org.eclipse.wst
 
-feature@org.eclipse.wst.sdk=v200806252211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.wst.sdk
-feature@org.eclipse.wst.tests.feature=v200802150100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.wst.tests.feature
-feature@org.eclipse.wst=v200806252211,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.wst.feature
+feature@org.eclipse.wst.sdk=v200807220700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.wst.sdk
+feature@org.eclipse.wst.tests.feature=v200807220139,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.wst.tests.feature
+feature@org.eclipse.wst=v200807220139,: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 9e96a9b..4c2550f 100644
--- a/releng/maps/wtp-feature-jst-doc.map
+++ b/releng/maps/wtp-feature-jst-doc.map
@@ -1,12 +1,11 @@
 !*************** wtp-feature-jst-doc.map
 
 ! This map file is for 
-! WTP 2.0.x maintenance releases
+! WTP 3.0 releases  
 
 ! These bundles are currently being developed and released 
-! from the R2_0_maintenance branch:
+! from the HEAD branch
 
-feature@org.eclipse.jst.doc.isv.feature=v200802150100,: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 4436d7f..5acd75f 100644
--- a/releng/maps/wtp-feature-wst-doc.map
+++ b/releng/maps/wtp-feature-wst-doc.map
@@ -1,6 +1,5 @@
 !*************** wtp-feature-wst-doc.map
 
-feature@org.eclipse.wst.doc.isv.feature=v200802150100,: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
+feature@org.eclipse.wst.doc.user.feature=v200712121937,: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 40de739..869e096 100644
--- a/releng/maps/wtp-releng.map
+++ b/releng/maps/wtp-releng.map
@@ -1,13 +1,13 @@
 !*************** wtp-releng.map
 ! This map file is for releng oriented plugins and tests 
 
-feature@org.eclipse.wtp.releng.tests.feature=v200709120100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/features/org.eclipse.wtp.releng.tests.feature
-plugin@org.eclipse.callisto.tools.versionchecker=v200806221945,:pserver:anonymous@dev.eclipse.org:/cvsroot/callisto,,org.eclipse.callisto.tools.versionchecker
-plugin@org.eclipse.wtp.releng.tests=v200807100432,: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
+feature@org.eclipse.wtp.releng.tests.feature=v200801091632,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/features/org.eclipse.wtp.releng.tests.feature
+plugin@org.eclipse.callisto.tools.versionchecker=v200807062123,:pserver:anonymous@dev.eclipse.org:/cvsroot/callisto,,org.eclipse.callisto.tools.versionchecker
+plugin@org.eclipse.wtp.releng.tests=v200806222100,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/tests/org.eclipse.wtp.releng.tests
+plugin@org.eclipse.wtp.releng.tools=v200806010700,: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
+plugin@org.eclipse.wtp.releng.wtpbuilder=v200801080055,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/releng.wtptools/api/org.eclipse.wtp.releng.wtpbuilder
 
 !***************
\ No newline at end of file