[116119] html/jsp validation stops working fairly frequently
diff --git a/bundles/org.eclipse.jst.jsp.ui/plugin.xml b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
index 4672b6e..d648371 100644
--- a/bundles/org.eclipse.jst.jsp.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
@@ -60,6 +60,33 @@
target="org.eclipse.jst.jsp.core.jspsource" />
</extension>
+ <extension point="org.eclipse.wst.sse.ui.sourcevalidation">
+ <validator
+ scope="partial"
+ class="org.eclipse.wst.xml.ui.internal.validation.MarkupValidator"
+ id="org.eclipse.jst.jsp.ui.internal.validation.markupvalidator">
+ <contentTypeIdentifier
+ id="org.eclipse.jst.jsp.core.jspsource">
+ <partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE"/>
+ <partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
+ </contentTypeIdentifier>
+ </validator>
+ <validator
+ scope="partial"
+ class="org.eclipse.wst.html.internal.validation.HTMLValidator"
+ id="org.eclipse.jst.jsp.ui.internal.validation.htmlsyntaxvalidator">
+ <contentTypeIdentifier
+ id="org.eclipse.jst.jsp.core.jspsource">
+ <partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE"/>
+ <partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
+ </contentTypeIdentifier>
+ </validator>
+ </extension>
+
<extension
point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
<adapterFactoryDescription
diff --git a/bundles/org.eclipse.wst.html.ui/plugin.xml b/bundles/org.eclipse.wst.html.ui/plugin.xml
index 32cb25a..2124616 100644
--- a/bundles/org.eclipse.wst.html.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.html.ui/plugin.xml
@@ -278,18 +278,23 @@
<validator
scope="partial"
class="org.eclipse.wst.html.internal.validation.HTMLValidator"
- id="org.eclipse.wst.html.htmlsourcevalidator">
+ id="org.eclipse.wst.html.ui.internal.validation.htmlsyntaxvalidator">
<contentTypeIdentifier
id="org.eclipse.wst.html.core.htmlsource">
- <partitionType id="org.eclipse.wst.html.HTML_DEFAULT">
- </partitionType>
+ <partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
</contentTypeIdentifier>
+ </validator>
+ <validator
+ scope="partial"
+ class="org.eclipse.wst.xml.ui.internal.validation.MarkupValidator"
+ id="org.eclipse.wst.html.ui.internal.validation.markupvalidator">
<contentTypeIdentifier
- id="org.eclipse.jst.jsp.core.jspsource">
- <partitionType id="org.eclipse.wst.html.HTML_DEFAULT">
- </partitionType>
- <partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE">
- </partitionType>
+ id="org.eclipse.wst.html.core.htmlsource">
+ <partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
</contentTypeIdentifier>
</validator>
</extension>
diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.xml b/bundles/org.eclipse.wst.xml.ui/plugin.xml
index 688aae7..d2cf387 100644
--- a/bundles/org.eclipse.wst.xml.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xml.ui/plugin.xml
@@ -311,8 +311,8 @@
class="org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidatorForXML"
id="org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidatorForXML">
<contentTypeIdentifier id="org.eclipse.core.runtime.xml">
- <partitionType id="org.eclipse.wst.xml.XML_DEFAULT">
- </partitionType>
+ <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
</contentTypeIdentifier>
</validator>
</extension>
@@ -321,12 +321,10 @@
<validator
scope="partial"
class="org.eclipse.wst.xml.ui.internal.validation.MarkupValidator"
- id="org.eclipse.wst.xml.ui.internal.validation.sourcemarkupvalidator">
+ id="org.eclipse.wst.xml.ui.internal.validation.markupvalidator">
<contentTypeIdentifier id="org.eclipse.core.runtime.xml">
- <partitionType id="org.eclipse.wst.sse.ST_DEFAULT">
- </partitionType>
- <partitionType id="org.eclipse.wst.xml.XML_DEFAULT">
- </partitionType>
+ <partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
+ <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
</contentTypeIdentifier>
</validator>
</extension>