[118448] [validation] org.eclipse.wst.validation.validator support for facets
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
index 38daa3a..74d05dc 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
@@ -974,8 +974,10 @@
try {
Expression expression = vmd.getEnablementExpresion();
if (expression != null) {
- EvaluationResult result = vmd.getEnablementExpresion().evaluate(new EvaluationContext(null,project));
- return result.equals(EvaluationResult.TRUE);
+ EvaluationContext context = new EvaluationContext(null, project);
+ context.setAllowPluginActivation(true);
+ EvaluationResult result = expression.evaluate(context);
+ return result == EvaluationResult.TRUE;
}
} catch (CoreException ce) {
Logger.getLogger().log(ce);
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
index 8614cdb..c3b0d2e 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
@@ -235,6 +235,14 @@
</element>
<element name="facet">
+ <annotation>
+ <appInfo>
+ <meta.element deprecated="true"/>
+ </appInfo>
+ <documentation>
+ This element is deprecated and enablement is the new recommended approach to filter validators based on facets.
+ </documentation>
+ </annotation>
<complexType>
<attribute name="facetId" type="string">
<annotation>
