[228366] Thai3.4:Eclipse invalid recognized UTF16BE as ISO 8859-1 for generated JSP file

[242901] NPE during source editor close
[243243] JSPs with contentType different than "text/html" open as dirty

7 files changed, 11 insertions, 11 deletions

diff --git a/releng.sourceediting/maps/jst-jsp-tests.map b/releng.sourceediting/maps/jst-jsp-tests.map
index 714484b1f..bbf81b4ee 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 R3_0_maintenance branch
 
-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.core.tests=v200808072008,: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
+plugin@org.eclipse.jst.jsp.tests.encoding=v200808072008,: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 c55681fe9..947eb465a 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 R3_0_maintenance branch
 
-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.core=v200808072008,: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/wst-web-core.map b/releng.sourceediting/maps/wst-web-core.map
index 736e93644..e09be2360 100644
--- a/releng.sourceediting/maps/wst-web-core.map
+++ b/releng.sourceediting/maps/wst-web-core.map
@@ -6,8 +6,8 @@
 ! from the R3_0_maintenance branch
 
 plugin@org.eclipse.wst.web=v200808070608,: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.css.core=v200808072008,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.core
+plugin@org.eclipse.wst.html.core=v200808072008,: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 ccd8f995f..2b5058b6c 100644
--- a/releng.sourceediting/maps/wst-web-tests.map
+++ b/releng.sourceediting/maps/wst-web-tests.map
@@ -6,13 +6,13 @@
 ! from the R3_0_maintenance branch
 
 plugin@org.eclipse.wst.css.core.tests=v200807282359,: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.tests.encoding=v200808072008,: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=v200808072008,: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-xml-core.map b/releng.sourceediting/maps/wst-xml-core.map
index 4797bfaed..f9f1bf50b 100644
--- a/releng.sourceediting/maps/wst-xml-core.map
+++ b/releng.sourceediting/maps/wst-xml-core.map
@@ -7,8 +7,8 @@
 ! from the R3_0_maintenance 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=v200807170605,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
-plugin@org.eclipse.wst.xml.core=v200808071546,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.core
+plugin@org.eclipse.wst.sse.core=v200808072008,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
+plugin@org.eclipse.wst.xml.core=v200808072008,: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.wst.standard.schemas=v200807220733,: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 438325238..6371980ac 100644
--- a/releng.sourceediting/maps/wst-xml-tests.map
+++ b/releng.sourceediting/maps/wst-xml-tests.map
@@ -12,7 +12,7 @@ plugin@org.eclipse.wst.sse.ui.tests.performance=v200806020015,:pserver:anonymous
 
 plugin@org.eclipse.wst.xml.core.tests=v200807301122,: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=v200808072008,: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 d0061e73f..0dd44b064 100644
--- a/releng.sourceediting/maps/wst-xml-ui.map
+++ b/releng.sourceediting/maps/wst-xml-ui.map
@@ -6,7 +6,7 @@
 ! These bundles are currently being developed and released 
 ! from the R3_0_maintenance 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.dtd.ui=v200808072008,: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