More plugin cleanup/server fixing
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
index afc3229..65dfe01 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/schema/adapterFactory.exsd
@@ -70,6 +70,13 @@
</documentation>
</annotation>
</attribute>
+ <attribute name="functionGroupID" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
</complexType>
</element>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
index 0508bdc..fcffea2 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
@@ -111,12 +111,18 @@
</complexType>
</element>
- <element name="selectionEnablement" type="string">
+ <element name="selectionEnablement">
<annotation>
<documentation>
The selectionEnablement element allows you to filter which kinds of selection your object is applicable to using Standard Eclipse Action Expresions.
</documentation>
</annotation>
+ <complexType>
+ <choice>
+ <element ref="objectClass"/>
+ <element ref="or"/>
+ </choice>
+ </complexType>
</element>
<element name="slaveOperation">
@@ -150,6 +156,63 @@
</complexType>
</element>
+ <element name="or">
+ <complexType>
+ <choice>
+ <element ref="objectClass"/>
+ <element ref="and"/>
+ <element ref="objectState"/>
+ </choice>
+ </complexType>
+ </element>
+
+ <element name="objectClass">
+ <complexType>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="adaptable" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="and">
+ <complexType>
+ <choice>
+ <element ref="objectClass"/>
+ <element ref="or"/>
+ </choice>
+ </complexType>
+ </element>
+
+ <element name="objectState">
+ <complexType>
+ <attribute name="value" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
<annotation>
<appInfo>
<meta.section type="since"/>
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
index ba8c964..d9c0d62 100644
--- a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
@@ -47,7 +47,22 @@
<element ref="helper"/>
<element ref="dependentValidator" minOccurs="0" maxOccurs="1"/>
<element ref="run"/>
+ <element ref="migrate"/>
</sequence>
+ <attribute name="to" type="string">
+ <annotation>
+ <documentation>
+ Optional migration tag
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="from" type="string">
+ <annotation>
+ <documentation>
+ Optional migration tag
+ </documentation>
+ </annotation>
+ </attribute>
</complexType>
</element>
@@ -162,6 +177,20 @@
</complexType>
</element>
+ <element name="migrate">
+ <complexType>
+ <sequence>
+ <element ref="validator"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="from" type="string">
+ </element>
+
+ <element name="to" type="string">
+ </element>
+
<annotation>
<appInfo>
<meta.section type="since"/>
