Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

Evolveum · Mar 13, 2014 · bba2696 · bba2696
2 parents c79bcb5 + d59a8e1
commit bba2696
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/infra/prism/src/main/resources/xml/ns/public/query-2.xsd b/infra/prism/src/main/resources/xml/ns/public/query-2.xsd
@@ -248,7 +248,7 @@
         <xsd:complexContent>
             <xsd:extension base="tns:FilterType">
                 <xsd:sequence>
-                    <xsd:element name="property" type="t:XPathType">
+                    <xsd:element name="path" type="t:XPathType">
                         <xsd:annotation>
                             <xsd:documentation>
                                 XPath to the property being queried.

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
@@ -55,6 +55,7 @@
 import com.evolveum.midpoint.prism.query.SubstringFilter;
 import com.evolveum.midpoint.prism.query.ValueFilter;
 import com.evolveum.midpoint.prism.xml.XsdTypeMapper;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.holder.XPathHolder;
 import com.evolveum.midpoint.util.DOMUtil;
 import com.evolveum.midpoint.util.QNameUtil;
@@ -376,10 +377,6 @@ public static ObjectFilter parseFilter(PrismContainerDefinition pcd, Node filter
 			return createEqualFilter(pcd, filter);
 		}
 
-		if (QNameUtil.compareQName(SchemaConstantsGenerated.Q_EQUAL, filter)) {
-			return createEqualFilter(pcd, filter);
-		}
-
 		if (QNameUtil.compareQName(SchemaConstantsGenerated.Q_REF, filter)) {
 			return createRefFilter(pcd, filter);
 		}