[243735] Fix new encoding detection JUnit test failures

[285200] [content assist]page import code assistance generates invalid code
[225572] [parser]Text region type stays CSS_COMMENT although comment is closed

6 files changed, 8 insertions, 8 deletions

diff --git a/releng.sourceediting/maps/jst-jsp-tests.map b/releng.sourceediting/maps/jst-jsp-tests.map
index bebf50ad9..a7adcbf8b 100644
--- a/releng.sourceediting/maps/jst-jsp-tests.map
+++ b/releng.sourceediting/maps/jst-jsp-tests.map
@@ -4,6 +4,6 @@
 
 plugin@org.eclipse.jst.jsp.core.tests=v201007311522,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.core.tests
 plugin@org.eclipse.jst.jsp.ui.tests=v201007292337,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.ui.tests
-plugin@org.eclipse.jst.jsp.tests.encoding=v201004110600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.tests.encoding
+plugin@org.eclipse.jst.jsp.tests.encoding=v201008161756,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.tests.encoding
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/jst-jsp.map b/releng.sourceediting/maps/jst-jsp.map
index 3c8121179..9c19671c2 100644
--- a/releng.sourceediting/maps/jst-jsp.map
+++ b/releng.sourceediting/maps/jst-jsp.map
@@ -3,6 +3,6 @@
 ! These bundles are currently being developed and released from the HEAD branch
 
 plugin@org.eclipse.jst.jsp.core=v201008091931,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.jsp.core
-plugin@org.eclipse.jst.jsp.ui=v201008102055,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.jsp.ui
+plugin@org.eclipse.jst.jsp.ui=v201008161756,: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 7673a07bb..01abaf0ec 100644
--- a/releng.sourceediting/maps/wst-web-core.map
+++ b/releng.sourceediting/maps/wst-web-core.map
@@ -3,7 +3,7 @@
 ! These bundles are currently being developed and released from the HEAD branch
 
 plugin@org.eclipse.wst.web=v201007151900,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.wst.web
-plugin@org.eclipse.wst.css.core=v201008091359,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.core
+plugin@org.eclipse.wst.css.core=v201008161756,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.core
 plugin@org.eclipse.wst.html.core=v201007311522,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.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 46bc22ddd..e10ea8f2c 100644
--- a/releng.sourceediting/maps/wst-web-tests.map
+++ b/releng.sourceediting/maps/wst-web-tests.map
@@ -2,12 +2,12 @@
 ! This map file is for the WTP 3.3 release
 ! These bundles are currently being developed and released from the HEAD branch
 
-plugin@org.eclipse.wst.css.core.tests=v201008091359,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.core.tests
-plugin@org.eclipse.wst.css.tests.encoding=v201004150328,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.tests.encoding
+plugin@org.eclipse.wst.css.core.tests=v201008161756,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.core.tests
+plugin@org.eclipse.wst.css.tests.encoding=v201008161756,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.tests.encoding
 plugin@org.eclipse.wst.css.ui.tests=v201004290328,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.css.ui.tests
 
 plugin@org.eclipse.wst.html.core.tests=v201006291750,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.core.tests
 plugin@org.eclipse.wst.html.ui.tests=v201004110600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.ui.tests
-plugin@org.eclipse.wst.html.tests.encoding=v201004150328,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.tests.encoding
+plugin@org.eclipse.wst.html.tests.encoding=v201008161756,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.html.tests.encoding
 
 !***************
\ 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 efb82d5df..099c65a0a 100644
--- a/releng.sourceediting/maps/wst-xml-core.map
+++ b/releng.sourceediting/maps/wst-xml-core.map
@@ -3,7 +3,7 @@
 ! These bundles are currently being developed and released from the HEAD branch
 
 plugin@org.eclipse.wst.dtd.core=v201008112018,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.dtd.core
-plugin@org.eclipse.wst.sse.core=v201008092200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
+plugin@org.eclipse.wst.sse.core=v201008161756,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
 plugin@org.eclipse.wst.xml.core=v201007311522,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.core
 plugin@org.eclipse.wst.xsd.core=v201008112018,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.core
 
diff --git a/releng.sourceediting/maps/wst-xml-tests.map b/releng.sourceediting/maps/wst-xml-tests.map
index 7ab6c315b..9538b37df 100644
--- a/releng.sourceediting/maps/wst-xml-tests.map
+++ b/releng.sourceediting/maps/wst-xml-tests.map
@@ -7,7 +7,7 @@ plugin@org.eclipse.wst.sse.ui.tests=v201007292337,:pserver:anonymous@dev.eclipse
 
 plugin@org.eclipse.wst.xml.core.tests=v201005251445,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.core.tests
 plugin@org.eclipse.wst.xml.ui.tests=v201007272135,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.ui.tests
-plugin@org.eclipse.wst.xml.tests.encoding=v201004150328,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.tests.encoding
+plugin@org.eclipse.wst.xml.tests.encoding=v201008161756,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.tests.encoding
 plugin@org.eclipse.wst.xml.validation.tests=v201004211438,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.validation.tests
 plugin@org.eclipse.wst.xml.catalog.tests=v201004211454,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.catalog.tests