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 17:13:26 UTC
svn commit: r770278 - in
/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query:
jsr283/qom/ qom/
Author: reschke
Date: Thu Apr 30 15:13:25 2009
New Revision: 770278
URL: http://svn.apache.org/viewvc?rev=770278&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/FullTextSearch.java
Modified:
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/qom/FullTextSearchImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelFactoryImpl.java
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=770278&r1=770277&r2=770278&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 15:13:25 2009
@@ -28,6 +28,7 @@
import javax.jcr.query.qom.DescendantNodeJoinCondition;
import javax.jcr.query.qom.DynamicOperand;
import javax.jcr.query.qom.EquiJoinCondition;
+import javax.jcr.query.qom.FullTextSearch;
import javax.jcr.query.qom.FullTextSearchScore;
import javax.jcr.query.qom.Join;
import javax.jcr.query.qom.JoinCondition;
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchImpl.java?rev=770278&r1=770277&r2=770278&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/FullTextSearchImpl.java Thu Apr 30 15:13:25 2009
@@ -16,11 +16,12 @@
*/
package org.apache.jackrabbit.spi.commons.query.qom;
+import javax.jcr.query.qom.FullTextSearch;
+import javax.jcr.query.qom.StaticOperand;
+
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.FullTextSearch;
-
/**
* <code>FullTextSearchImpl</code>...
*/
@@ -41,12 +42,12 @@
/**
* Full text search expression.
*/
- private final String fullTextSearchExpression;
+ private final StaticOperand fullTextSearchExpression;
FullTextSearchImpl(NamePathResolver resolver,
Name selectorName,
Name propertyName,
- String fullTextSearchExpression) {
+ StaticOperand fullTextSearchExpression) {
super(resolver);
this.selectorName = selectorName;
this.propertyName = propertyName;
@@ -100,7 +101,7 @@
*
* @return the full-text search expression; non-null
*/
- public String getFullTextSearchExpression() {
+ public StaticOperand getFullTextSearchExpression() {
return fullTextSearchExpression;
}
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=770278&r1=770277&r2=770278&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 15:13:25 2009
@@ -22,7 +22,6 @@
import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelFactory;
-import org.apache.jackrabbit.spi.commons.query.jsr283.qom.FullTextSearch;
import javax.jcr.query.InvalidQueryException;
import javax.jcr.query.qom.And;
@@ -36,6 +35,7 @@
import javax.jcr.query.qom.DescendantNodeJoinCondition;
import javax.jcr.query.qom.DynamicOperand;
import javax.jcr.query.qom.EquiJoinCondition;
+import javax.jcr.query.qom.FullTextSearch;
import javax.jcr.query.qom.FullTextSearchScore;
import javax.jcr.query.qom.Join;
import javax.jcr.query.qom.JoinCondition;
@@ -528,7 +528,7 @@
* @throws javax.jcr.RepositoryException if the operation otherwise fails
*/
public FullTextSearch fullTextSearch(String propertyName,
- String fullTextSearchExpression)
+ StaticOperand fullTextSearchExpression)
throws InvalidQueryException, RepositoryException // CM
{
Name propName = null;
@@ -555,7 +555,7 @@
*/
public FullTextSearch fullTextSearch(String selectorName,
String propertyName,
- String fullTextSearchExpression)
+ StaticOperand fullTextSearchExpression)
throws InvalidQueryException, RepositoryException {
Name propName = null;
if (propertyName != null) {
@@ -1087,7 +1087,7 @@
}
}
- private String checkFullTextSearchExpression(String fullTextSearchExpression)
+ private StaticOperand checkFullTextSearchExpression(StaticOperand fullTextSearchExpression)
throws RepositoryException {
if (fullTextSearchExpression == null) {
// TODO: correct exception?