You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2009/04/30 16:48:05 UTC
svn commit: r770256 - in
/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query:
jsr283/qom/ qom/ sql2/
Author: reschke
Date: Thu Apr 30 14:48:04 2009
New Revision: 770256
URL: http://svn.apache.org/viewvc?rev=770256&view=rev
Log:
JCR-2092: remove more old interfaces
Removed:
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/Comparison.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/DescendantNodeJoinCondition.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/Join.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/JoinCondition.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/Length.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/Ordering.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/PropertyExistence.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/PropertyValue.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModelConstants.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/Selector.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/Source.java
Modified:
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/ChildNodeJoinCondition.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/EquiJoinCondition.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModel.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModelFactory.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/SameNodeJoinCondition.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ComparisonImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeJoinConditionImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinConditionImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LengthImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrderingImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyExistenceImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyValueImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SelectorImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SourceImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/ChildNodeJoinCondition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/ChildNodeJoinCondition.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/ChildNodeJoinCondition.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/ChildNodeJoinCondition.java Thu Apr 30 14:48:04 2009
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.spi.commons.query.jsr283.qom;
+import javax.jcr.query.qom.JoinCondition;
+
/**
* Tests whether the {@link #getChildSelectorName childSelector} node is a child
* of the {@link #getParentSelectorName parentSelector} node. A node-tuple
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/EquiJoinCondition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/EquiJoinCondition.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/EquiJoinCondition.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/EquiJoinCondition.java Thu Apr 30 14:48:04 2009
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.spi.commons.query.jsr283.qom;
+import javax.jcr.query.qom.JoinCondition;
+
/**
* Tests whether the value of a property in a first selector is equal to the
* value of a property in a second selector.
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModel.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModel.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModel.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModel.java Thu Apr 30 14:48:04 2009
@@ -18,6 +18,8 @@
import javax.jcr.query.Query;
import javax.jcr.query.qom.Constraint;
+import javax.jcr.query.qom.Ordering;
+import javax.jcr.query.qom.Source;
/**
* A query in the JCR query object model.
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModelFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModelFactory.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModelFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/QueryObjectModelFactory.java Thu Apr 30 14:48:04 2009
@@ -18,13 +18,24 @@
import javax.jcr.query.InvalidQueryException;
import javax.jcr.query.qom.BindVariableValue;
+import javax.jcr.query.qom.Comparison;
import javax.jcr.query.qom.Constraint;
+import javax.jcr.query.qom.DescendantNodeJoinCondition;
import javax.jcr.query.qom.DynamicOperand;
+import javax.jcr.query.qom.Join;
+import javax.jcr.query.qom.JoinCondition;
+import javax.jcr.query.qom.Length;
import javax.jcr.query.qom.Literal;
import javax.jcr.query.qom.LowerCase;
import javax.jcr.query.qom.NodeLocalName;
import javax.jcr.query.qom.NodeName;
+import javax.jcr.query.qom.Ordering;
+import javax.jcr.query.qom.PropertyExistence;
+import javax.jcr.query.qom.PropertyValue;
+import javax.jcr.query.qom.QueryObjectModelConstants;
import javax.jcr.query.qom.SameNode;
+import javax.jcr.query.qom.Selector;
+import javax.jcr.query.qom.Source;
import javax.jcr.query.qom.StaticOperand;
import javax.jcr.query.qom.UpperCase;
import javax.jcr.RepositoryException;
@@ -127,9 +138,9 @@
* @param right the right node-tuple source; non-null
* @param joinType either
* <ul>
- * <li>{@link QueryObjectModelConstants#JOIN_TYPE_INNER},</li>
- * <li>{@link QueryObjectModelConstants#JOIN_TYPE_LEFT_OUTER},</li>
- * <li>{@link QueryObjectModelConstants#JOIN_TYPE_RIGHT_OUTER}</li>
+ * <li>{@link QueryObjectModelConstants#JCR_JOIN_TYPE_INNER},</li>
+ * <li>{@link QueryObjectModelConstants#JCR_JOIN_TYPE_LEFT_OUTER},</li>
+ * <li>{@link QueryObjectModelConstants#JCR_JOIN_TYPE_RIGHT_OUTER}</li>
* </ul>
* @param joinCondition the join condition; non-null
* @return the join; non-null
@@ -138,7 +149,7 @@
*/
Join join(
Source left, Source right,
- int joinType, JoinCondition joinCondition)
+ String joinType, JoinCondition joinCondition)
throws InvalidQueryException, RepositoryException;
///
@@ -264,13 +275,13 @@
* @param operand1 the first operand; non-null
* @param operator the operator; either
* <ul>
- * <li>{@link #OPERATOR_EQUAL_TO},</li>
- * <li>{@link #OPERATOR_NOT_EQUAL_TO},</li>
- * <li>{@link #OPERATOR_LESS_THAN},</li>
- * <li>{@link #OPERATOR_LESS_THAN_OR_EQUAL_TO},</li>
- * <li>{@link #OPERATOR_GREATER_THAN},</li>
- * <li>{@link #OPERATOR_GREATER_THAN_OR_EQUAL_TO}, or</li>
- * <li>{@link #OPERATOR_LIKE}</li>
+ * <li>{@link #JCR_OPERATOR_EQUAL_TO},</li>
+ * <li>{@link #JCR_OPERATOR_NOT_EQUAL_TO},</li>
+ * <li>{@link #JCR_OPERATOR_LESS_THAN},</li>
+ * <li>{@link #JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO},</li>
+ * <li>{@link #JCR_OPERATOR_GREATER_THAN},</li>
+ * <li>{@link #JCR_OPERATOR_GREATER_THAN_OR_EQUAL_TO}, or</li>
+ * <li>{@link #JCR_OPERATOR_LIKE}</li>
* </ul>
* @param operand2 the second operand; non-null
* @return the constraint; non-null
@@ -278,7 +289,7 @@
* @throws RepositoryException if the operation otherwise fails
*/
Comparison comparison(
- DynamicOperand operand1, int operator, StaticOperand operand2)
+ DynamicOperand operand1, String operator, StaticOperand operand2)
throws InvalidQueryException, RepositoryException;
/**
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/SameNodeJoinCondition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/SameNodeJoinCondition.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/SameNodeJoinCondition.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/jsr283/qom/SameNodeJoinCondition.java Thu Apr 30 14:48:04 2009
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.spi.commons.query.jsr283.qom;
+import javax.jcr.query.qom.JoinCondition;
+
/**
* Tests whether two nodes are "the same" according to the <code>isSame</code>
* method of <code>javax.jcr.Item</code>.
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ComparisonImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ComparisonImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ComparisonImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ComparisonImpl.java Thu Apr 30 14:48:04 2009
@@ -16,13 +16,13 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
+import javax.jcr.query.qom.Comparison;
import javax.jcr.query.qom.DynamicOperand;
+import javax.jcr.query.qom.QueryObjectModelConstants;
import javax.jcr.query.qom.StaticOperand;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Comparison;
-
/**
* <code>ComparisonImpl</code>...
*/
@@ -36,7 +36,7 @@
/**
* The operator.
*/
- private final int operator;
+ private final String operator;
/**
* The second operand.
@@ -45,7 +45,7 @@
ComparisonImpl(NamePathResolver resolver,
DynamicOperandImpl operand1,
- int operator,
+ String operator,
StaticOperandImpl operand2) {
super(resolver);
this.operand1 = operand1;
@@ -65,16 +65,16 @@
/**
* Gets the operator.
*
- * @return either <ul> <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#OPERATOR_EQUAL_TO},</li>
- * <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#OPERATOR_NOT_EQUAL_TO},</li>
- * <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#OPERATOR_LESS_THAN},</li>
- * <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#OPERATOR_LESS_THAN_OR_EQUAL_TO},</li>
- * <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#OPERATOR_GREATER_THAN},</li>
- * <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#OPERATOR_GREATER_THAN_OR_EQUAL_TO},
- * or</li> <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#OPERATOR_LIKE}</li>
+ * @return either <ul> <li>{@link QueryObjectModelConstants#JCR_OPERATOR_EQUAL_TO},</li>
+ * <li>{@link QueryObjectModelConstants#JCR_OPERATOR_NOT_EQUAL_TO},</li>
+ * <li>{@link QueryObjectModelConstants#JCR_OPERATOR_LESS_THAN},</li>
+ * <li>{@link QueryObjectModelConstants#JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO},</li>
+ * <li>{@link QueryObjectModelConstants#JCR_OPERATOR_GREATER_THAN},</li>
+ * <li>{@link QueryObjectModelConstants#JCR_OPERATOR_GREATER_THAN_OR_EQUAL_TO},
+ * or</li> <li>{@link QueryObjectModelConstants#JCR_OPERATOR_LIKE}</li>
* </ul>
*/
- public int getOperator() {
+ public String getOperator() {
return operator;
}
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeJoinConditionImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeJoinConditionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeJoinConditionImpl.java Thu Apr 30 14:48:04 2009
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
+import javax.jcr.query.qom.DescendantNodeJoinCondition;
+
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.DescendantNodeJoinCondition;
-
/**
* <code>DescendantNodeJoinConditionImpl</code>...
*/
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinConditionImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinConditionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinConditionImpl.java Thu Apr 30 14:48:04 2009
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+import javax.jcr.query.qom.JoinCondition;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.JoinCondition;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
/**
* <code>JoinConditionImpl</code>...
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinImpl.java Thu Apr 30 14:48:04 2009
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+import javax.jcr.query.qom.Join;
+import javax.jcr.query.qom.JoinCondition;
+import javax.jcr.query.qom.Source;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Join;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Source;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.JoinCondition;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
/**
* <code>JoinImpl</code>...
@@ -40,7 +40,7 @@
/**
* The join type.
*/
- private final int joinType;
+ private final String joinType;
/**
* The join condition.
@@ -50,7 +50,7 @@
JoinImpl(NamePathResolver resolver,
SourceImpl left,
SourceImpl right,
- int joinType,
+ String joinType,
JoinConditionImpl joinCondition) {
super(resolver);
this.left = left;
@@ -85,7 +85,7 @@
* <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_RIGHT_OUTER}</li>
* </ul>
*/
- public int getJoinType() {
+ public String getJoinType() {
return joinType;
}
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LengthImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LengthImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LengthImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/LengthImpl.java Thu Apr 30 14:48:04 2009
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+import javax.jcr.query.qom.Length;
+import javax.jcr.query.qom.PropertyValue;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Length;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.PropertyValue;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
/**
* <code>LengthImpl</code>...
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrderingImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrderingImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrderingImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/OrderingImpl.java Thu Apr 30 14:48:04 2009
@@ -17,11 +17,11 @@
package org.apache.jackrabbit.spi.commons.query.qom;
import javax.jcr.query.qom.DynamicOperand;
+import javax.jcr.query.qom.Ordering;
+import javax.jcr.query.qom.QueryObjectModelConstants;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Ordering;
-
/**
* <code>OrderingImpl</code>...
*/
@@ -40,11 +40,11 @@
/**
* The order.
*/
- private final int order;
+ private final String order;
OrderingImpl(NamePathResolver resolver,
DynamicOperandImpl operand,
- int order) {
+ String order) {
super(resolver);
this.operand = operand;
this.order = order;
@@ -62,11 +62,11 @@
/**
* Gets the order.
*
- * @return either <ul> <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#ORDER_ASCENDING}
- * or</li> <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#ORDER_DESCENDING}</li>
+ * @return either <ul> <li>{@link QueryObjectModelConstants#JCR_ORDER_ASCENDING}
+ * or</li> <li>{@link QueryObjectModelConstants#JCR_ORDER_DESCENDING}</li>
* </ul>
*/
- public int getOrder() {
+ public String getOrder() {
return order;
}
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyExistenceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyExistenceImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyExistenceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyExistenceImpl.java Thu Apr 30 14:48:04 2009
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
+import javax.jcr.query.qom.PropertyExistence;
+
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.PropertyExistence;
-
/**
* <code>PropertyExistenceImpl</code>...
*/
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyValueImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyValueImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyValueImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/PropertyValueImpl.java Thu Apr 30 14:48:04 2009
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
+import javax.jcr.query.qom.PropertyValue;
+
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.PropertyValue;
-
/**
* <code>PropertyValueImpl</code>...
*/
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java Thu Apr 30 14:48:04 2009
@@ -23,43 +23,44 @@
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelFactory;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModel;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Selector;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Ordering;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Column;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Source;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Join;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.JoinCondition;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.EquiJoinCondition;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.SameNodeJoinCondition;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.ChildNodeJoinCondition;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.DescendantNodeJoinCondition;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.And;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Or;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Not;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Comparison;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.PropertyExistence;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.FullTextSearch;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.ChildNode;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.DescendantNode;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.PropertyValue;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Length;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.FullTextSearchScore;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants;
import javax.jcr.query.InvalidQueryException;
import javax.jcr.query.qom.BindVariableValue;
+import javax.jcr.query.qom.Comparison;
import javax.jcr.query.qom.Constraint;
+import javax.jcr.query.qom.DescendantNodeJoinCondition;
import javax.jcr.query.qom.DynamicOperand;
+import javax.jcr.query.qom.Join;
+import javax.jcr.query.qom.JoinCondition;
+import javax.jcr.query.qom.Length;
import javax.jcr.query.qom.Literal;
import javax.jcr.query.qom.LowerCase;
import javax.jcr.query.qom.NodeLocalName;
import javax.jcr.query.qom.NodeName;
+import javax.jcr.query.qom.Ordering;
+import javax.jcr.query.qom.PropertyExistence;
+import javax.jcr.query.qom.PropertyValue;
+import javax.jcr.query.qom.QueryObjectModelConstants;
import javax.jcr.query.qom.SameNode;
+import javax.jcr.query.qom.Selector;
+import javax.jcr.query.qom.Source;
import javax.jcr.query.qom.StaticOperand;
import javax.jcr.query.qom.UpperCase;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import java.util.BitSet;
+import java.util.HashSet;
+import java.util.Set;
/**
* <code>QueryObjectModelFactoryImpl</code> implements the query object model
@@ -67,27 +68,27 @@
*/
public abstract class QueryObjectModelFactoryImpl implements QueryObjectModelFactory {
- private static final BitSet VALID_OPERATORS = new BitSet();
+ private static final Set<String> VALID_OPERATORS = new HashSet<String>();
- private static final BitSet VALID_JOIN_TYPES = new BitSet();
+ private static final Set<String> VALID_JOIN_TYPES = new HashSet<String>();
- private static final BitSet VALID_ORDERS = new BitSet();
+ private static final Set<String> VALID_ORDERS = new HashSet<String>();
static {
- VALID_OPERATORS.set(QueryObjectModelConstants.OPERATOR_EQUAL_TO);
- VALID_OPERATORS.set(QueryObjectModelConstants.OPERATOR_GREATER_THAN);
- VALID_OPERATORS.set(QueryObjectModelConstants.OPERATOR_GREATER_THAN_OR_EQUAL_TO);
- VALID_OPERATORS.set(QueryObjectModelConstants.OPERATOR_LESS_THAN);
- VALID_OPERATORS.set(QueryObjectModelConstants.OPERATOR_LESS_THAN_OR_EQUAL_TO);
- VALID_OPERATORS.set(QueryObjectModelConstants.OPERATOR_LIKE);
- VALID_OPERATORS.set(QueryObjectModelConstants.OPERATOR_NOT_EQUAL_TO);
-
- VALID_JOIN_TYPES.set(QueryObjectModelConstants.JOIN_TYPE_INNER);
- VALID_JOIN_TYPES.set(QueryObjectModelConstants.JOIN_TYPE_LEFT_OUTER);
- VALID_JOIN_TYPES.set(QueryObjectModelConstants.JOIN_TYPE_RIGHT_OUTER);
+ VALID_OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO);
+ VALID_OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN);
+ VALID_OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN_OR_EQUAL_TO);
+ VALID_OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN);
+ VALID_OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO);
+ VALID_OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_LIKE);
+ VALID_OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_NOT_EQUAL_TO);
+
+ VALID_JOIN_TYPES.add(QueryObjectModelConstants.JCR_JOIN_TYPE_INNER);
+ VALID_JOIN_TYPES.add(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER);
+ VALID_JOIN_TYPES.add(QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER);
- VALID_ORDERS.set(QueryObjectModelConstants.ORDER_ASCENDING);
- VALID_ORDERS.set(QueryObjectModelConstants.ORDER_DESCENDING);
+ VALID_ORDERS.add(QueryObjectModelConstants.JCR_ORDER_ASCENDING);
+ VALID_ORDERS.add(QueryObjectModelConstants.JCR_ORDER_DESCENDING);
}
/**
@@ -235,9 +236,9 @@
*
* @param left the left node-tuple source; non-null
* @param right the right node-tuple source; non-null
- * @param joinType either <ul> <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_INNER},</li>
- * <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_LEFT_OUTER},</li>
- * <li>{@link org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_RIGHT_OUTER}</li>
+ * @param joinType either <ul> <li>{@link QueryObjectModelConstants#JCR_JOIN_TYPE_INNER},</li>
+ * <li>{@link QueryObjectModelConstants#JCR_JOIN_TYPE_LEFT_OUTER},</li>
+ * <li>{@link QueryObjectModelConstants#JCR_JOIN_TYPE_RIGHT_OUTER}</li>
* </ul>
* @param joinCondition the join condition; non-null
* @return the join; non-null
@@ -247,7 +248,7 @@
*/
public Join join(Source left,
Source right,
- int joinType,
+ String joinType,
JoinCondition joinCondition)
throws InvalidQueryException, RepositoryException {
if (!(left instanceof SourceImpl) || !(right instanceof SourceImpl)) {
@@ -256,7 +257,7 @@
if (!(joinCondition instanceof JoinConditionImpl)) {
throw new RepositoryException("Unknwon JoinCondition implementation");
}
- if (!VALID_JOIN_TYPES.get(joinType)) {
+ if (!VALID_JOIN_TYPES.contains(joinType)) {
throw new RepositoryException("Invalid joinType");
}
return new JoinImpl(resolver, (SourceImpl) left, (SourceImpl) right,
@@ -443,12 +444,12 @@
* Filters node-tuples based on the outcome of a binary operation.
*
* @param operand1 the first operand; non-null
- * @param operator the operator; either <ul> <li>{@link #OPERATOR_EQUAL_TO},</li>
- * <li>{@link #OPERATOR_NOT_EQUAL_TO},</li> <li>{@link
- * #OPERATOR_LESS_THAN},</li> <li>{@link #OPERATOR_LESS_THAN_OR_EQUAL_TO},</li>
- * <li>{@link #OPERATOR_GREATER_THAN},</li> <li>{@link
- * #OPERATOR_GREATER_THAN_OR_EQUAL_TO}, or</li> <li>{@link
- * #OPERATOR_LIKE}</li> </ul>
+ * @param operator the operator; either <ul> <li>{@link #JCR_OPERATOR_EQUAL_TO},</li>
+ * <li>{@link #JCR_OPERATOR_NOT_EQUAL_TO},</li> <li>{@link
+ * #JCR_OPERATOR_LESS_THAN},</li> <li>{@link #JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO},</li>
+ * <li>{@link #JCR_OPERATOR_GREATER_THAN},</li> <li>{@link
+ * #JCR_OPERATOR_GREATER_THAN_OR_EQUAL_TO}, or</li> <li>{@link
+ * #JCR_OPERATOR_LIKE}</li> </ul>
* @param operand2 the second operand; non-null
* @return the constraint; non-null
* @throws javax.jcr.query.InvalidQueryException
@@ -456,14 +457,14 @@
* @throws javax.jcr.RepositoryException if the operation otherwise fails
*/
public Comparison comparison(DynamicOperand operand1,
- int operator,
+ String operator,
StaticOperand operand2)
throws InvalidQueryException, RepositoryException {
if (operand1 == null || operand2 == null) {
// TODO: correct exception?
throw new RepositoryException("operands must not be null");
}
- if (!VALID_OPERATORS.get(operator)) {
+ if (!VALID_OPERATORS.contains(operator)) {
// TODO: correct exception?
throw new RepositoryException("invalid operator");
}
@@ -900,7 +901,7 @@
throw new RepositoryException("Unknown DynamicOperand implementation");
}
return new OrderingImpl(resolver, (DynamicOperandImpl) operand,
- QueryObjectModelConstants.ORDER_ASCENDING);
+ QueryObjectModelConstants.JCR_ORDER_ASCENDING);
}
/**
@@ -918,7 +919,7 @@
throw new RepositoryException("Unknown DynamicOperand implementation");
}
return new OrderingImpl(resolver, (DynamicOperandImpl) operand,
- QueryObjectModelConstants.ORDER_DESCENDING);
+ QueryObjectModelConstants.JCR_ORDER_DESCENDING);
}
/**
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SelectorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SelectorImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SelectorImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SelectorImpl.java Thu Apr 30 14:48:04 2009
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
+import javax.jcr.query.qom.Selector;
+
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Selector;
-
/**
* <code>SelectorImpl</code>...
*/
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SourceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SourceImpl.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SourceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/SourceImpl.java Thu Apr 30 14:48:04 2009
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+import javax.jcr.query.qom.Source;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Source;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
/**
* <code>SourceImpl</code>...
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java?rev=770256&r1=770255&r2=770256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/Parser.java Thu Apr 30 14:48:04 2009
@@ -17,14 +17,7 @@
package org.apache.jackrabbit.spi.commons.query.sql2;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Column;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.JoinCondition;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Ordering;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.PropertyExistence;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.PropertyValue;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelFactory;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Selector;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Source;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModel;
import java.math.BigDecimal;
@@ -39,7 +32,14 @@
import javax.jcr.query.qom.BindVariableValue;
import javax.jcr.query.qom.Constraint;
import javax.jcr.query.qom.DynamicOperand;
+import javax.jcr.query.qom.JoinCondition;
import javax.jcr.query.qom.Literal;
+import javax.jcr.query.qom.Ordering;
+import javax.jcr.query.qom.PropertyExistence;
+import javax.jcr.query.qom.PropertyValue;
+import javax.jcr.query.qom.QueryObjectModelConstants;
+import javax.jcr.query.qom.Selector;
+import javax.jcr.query.qom.Source;
import javax.jcr.query.qom.StaticOperand;
/**
@@ -168,15 +168,15 @@
selectors.add(selector);
Source source = selector;
while (true) {
- int type;
+ String type;
if (readIf("RIGHT")) {
read("OUTER");
- type = QueryObjectModelConstants.JOIN_TYPE_RIGHT_OUTER;
+ type = QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER;
} else if (readIf("LEFT")) {
read("OUTER");
- type = QueryObjectModelConstants.JOIN_TYPE_LEFT_OUTER;
+ type = QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER;
} else if (readIf("INNER")) {
- type = QueryObjectModelConstants.JOIN_TYPE_INNER;
+ type = QueryObjectModelConstants.JCR_JOIN_TYPE_INNER;
} else {
break;
}
@@ -278,33 +278,33 @@
Constraint c;
if (readIf("=")) {
c = factory.comparison(left,
- QueryObjectModelConstants.OPERATOR_EQUAL_TO,
+ QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
parseStaticOperand());
} else if (readIf("<>")) {
c = factory.comparison(left,
- QueryObjectModelConstants.OPERATOR_NOT_EQUAL_TO,
+ QueryObjectModelConstants.JCR_OPERATOR_NOT_EQUAL_TO,
parseStaticOperand());
} else if (readIf("<")) {
c = factory.comparison(left,
- QueryObjectModelConstants.OPERATOR_LESS_THAN,
+ QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN,
parseStaticOperand());
} else if (readIf(">")) {
c = factory.comparison(left,
- QueryObjectModelConstants.OPERATOR_GREATER_THAN,
+ QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN,
parseStaticOperand());
} else if (readIf("<=")) {
c = factory.comparison(left,
- QueryObjectModelConstants.OPERATOR_LESS_THAN_OR_EQUAL_TO,
+ QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO,
parseStaticOperand());
} else if (readIf(">=")) {
c = factory
.comparison(
left,
- QueryObjectModelConstants.OPERATOR_GREATER_THAN_OR_EQUAL_TO,
+ QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN_OR_EQUAL_TO,
parseStaticOperand());
} else if (readIf("LIKE")) {
c = factory.comparison(left,
- QueryObjectModelConstants.OPERATOR_LIKE,
+ QueryObjectModelConstants.JCR_OPERATOR_LIKE,
parseStaticOperand());
} else if (readIf("IS")) {
boolean not = readIf("NOT");
@@ -330,7 +330,7 @@
} else {
read("LIKE");
c = factory.not(factory.comparison(left,
- QueryObjectModelConstants.OPERATOR_LIKE,
+ QueryObjectModelConstants.JCR_OPERATOR_LIKE,
parseStaticOperand()));
}
} else {