merge maintenance

9 files changed, 22 insertions, 22 deletions

diff --git a/releng.sourceediting/maps/jst-jsp-tests.map b/releng.sourceediting/maps/jst-jsp-tests.map
index 67b03f134..5eb296365 100644
--- a/releng.sourceediting/maps/jst-jsp-tests.map
+++ b/releng.sourceediting/maps/jst-jsp-tests.map
@@ -5,9 +5,9 @@
 ! These bundles are currently being developed and released 
 ! from the HEAD branch
 
-plugin@org.eclipse.jst.jsp.core.tests=v200807170740,: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=v200807170740,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.tests.encoding
+plugin@org.eclipse.jst.jsp.core.tests=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.core.tests
+plugin@org.eclipse.jst.jsp.ui.tests=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.ui.tests
+plugin@org.eclipse.jst.jsp.tests.encoding=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.tests.encoding
 
 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
 
diff --git a/releng.sourceediting/maps/jst-jsp.map b/releng.sourceediting/maps/jst-jsp.map
index 2c241db99..3d2ab4401 100644
--- a/releng.sourceediting/maps/jst-jsp.map
+++ b/releng.sourceediting/maps/jst-jsp.map
@@ -5,7 +5,7 @@
 ! These bundles are currently being developed and released 
 ! from the HEAD branch
 
-plugin@org.eclipse.jst.jsp.core=v200807170740,: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
+plugin@org.eclipse.jst.jsp.core=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.jsp.core
+plugin@org.eclipse.jst.jsp.ui=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.jsp.ui
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-web-core.map b/releng.sourceediting/maps/wst-web-core.map
index 1b6ffad04..d383bd1bb 100644
--- a/releng.sourceediting/maps/wst-web-core.map
+++ b/releng.sourceediting/maps/wst-web-core.map
@@ -6,8 +6,8 @@
 ! from the HEAD branch
 
 plugin@org.eclipse.wst.web=v200807311700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.wst.web
-plugin@org.eclipse.wst.css.core=v200807170740,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.core
-plugin@org.eclipse.wst.html.core=v200807170740,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.core
+plugin@org.eclipse.wst.css.core=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.core
+plugin@org.eclipse.wst.html.core=v200808091925,: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 24c96af4d..918fa7332 100644
--- a/releng.sourceediting/maps/wst-web-tests.map
+++ b/releng.sourceediting/maps/wst-web-tests.map
@@ -1,13 +1,13 @@
 !*************** wst-web-tests.map
 
-plugin@org.eclipse.wst.css.core.tests=v200807170740,: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.core.tests=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.core.tests
+plugin@org.eclipse.wst.css.tests.encoding=v200808091925,: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.tests.encoding=v200808091925,: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 aaced9e27..3903dffa9 100644
--- a/releng.sourceediting/maps/wst-web-ui.map
+++ b/releng.sourceediting/maps/wst-web-ui.map
@@ -8,7 +8,7 @@
 
 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=v200807170740,: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.html.ui=v200808091925,: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
 
 
diff --git a/releng.sourceediting/maps/wst-xml-component-features.map b/releng.sourceediting/maps/wst-xml-component-features.map
index 1c09ec7af..1fba9ca89 100644
--- a/releng.sourceediting/maps/wst-xml-component-features.map
+++ b/releng.sourceediting/maps/wst-xml-component-features.map
@@ -5,10 +5,10 @@
 ! These bundles are currently being developed and released 
 ! from the HEAD branch
 
-feature@org.eclipse.wst.xml_core.feature=v200806092130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_core.feature
-feature@org.eclipse.wst.xml_sdk.feature=v200806092130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_sdk.feature
+feature@org.eclipse.wst.xml_core.feature=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_core.feature
+feature@org.eclipse.wst.xml_sdk.feature=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_sdk.feature
 feature@org.eclipse.wst.xml_tests.feature=v200807232215,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_tests.feature
-feature@org.eclipse.wst.xml_ui.feature=v200806092130,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_ui.feature
+feature@org.eclipse.wst.xml_ui.feature=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/features/org.eclipse.wst.xml_ui.feature
 feature@org.eclipse.wst.xml_userdoc.feature=v200807310230,: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 770970771..e1feac631 100644
--- a/releng.sourceediting/maps/wst-xml-core.map
+++ b/releng.sourceediting/maps/wst-xml-core.map
@@ -7,8 +7,8 @@
 ! from the HEAD branch
 
 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=v200807170740,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
-plugin@org.eclipse.wst.xml.core=v200807310312,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.core
+plugin@org.eclipse.wst.sse.core=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
+plugin@org.eclipse.wst.xml.core=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.core
 plugin@org.eclipse.wst.xsd.core=v200805282012,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.core
 
 plugin@org.eclipse.wst.standard.schemas=v200807220739,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.standard.schemas
diff --git a/releng.sourceediting/maps/wst-xml-tests.map b/releng.sourceediting/maps/wst-xml-tests.map
index fc2d51a03..f355cc52a 100644
--- a/releng.sourceediting/maps/wst-xml-tests.map
+++ b/releng.sourceediting/maps/wst-xml-tests.map
@@ -1,12 +1,12 @@
 !*************** wst-xml-tests.map
 
-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.core.tests=v200808091925,: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.xml.core.tests=v200807170740,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.core.tests
+plugin@org.eclipse.wst.xml.core.tests=v200808091925,: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.tests.encoding=v200808091925,: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
diff --git a/releng.sourceediting/maps/wst-xml-ui.map b/releng.sourceediting/maps/wst-xml-ui.map
index 8bd5f7ed6..a007697dd 100644
--- a/releng.sourceediting/maps/wst-xml-ui.map
+++ b/releng.sourceediting/maps/wst-xml-ui.map
@@ -6,9 +6,9 @@
 ! These bundles are currently being developed and released 
 ! from the HEAD branch
 
-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=v200807170740,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.ui
-plugin@org.eclipse.wst.xml.ui=v200807170740,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.ui
+plugin@org.eclipse.wst.dtd.ui=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.dtd.ui
+plugin@org.eclipse.wst.sse.ui=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.ui
+plugin@org.eclipse.wst.xml.ui=v200808091925,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.ui
 plugin@org.eclipse.wst.xsd.ui=v200807232215,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.ui
 
 !*************** 
\ No newline at end of file