You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2008/02/19 16:29:05 UTC
svn commit: r629125 - in /jackrabbit/trunk/jackrabbit-core/src:
main/java/org/apache/jackrabbit/core/
main/java/org/apache/jackrabbit/core/query/
main/java/org/apache/jackrabbit/core/query/jsr283/
main/java/org/apache/jackrabbit/core/query/lucene/ main...
Author: mreutegg
Date: Tue Feb 19 07:29:03 2008
New Revision: 629125
URL: http://svn.apache.org/viewvc?rev=629125&view=rev
Log:
JCR-1347: Move Jackrabbit Query Parser from core to spi-commons
Added:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryObjectModelImpl.java (with props)
Removed:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql2/
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryManagerImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PreparedQueryImpl.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/AbstractQOMTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryTest.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java?rev=629125&r1=629124&r2=629125&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java Tue Feb 19 07:29:03 2008
@@ -27,15 +27,15 @@
import org.apache.jackrabbit.core.query.QueryHandlerContext;
import org.apache.jackrabbit.core.query.QueryImpl;
import org.apache.jackrabbit.core.query.PreparedQueryImpl;
+import org.apache.jackrabbit.core.query.QueryObjectModelImpl;
import org.apache.jackrabbit.core.query.qom.QueryObjectModelTree;
-import org.apache.jackrabbit.core.query.qom.QueryObjectModelImpl;
-import org.apache.jackrabbit.core.query.jsr283.PreparedQuery;
-import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModel;
import org.apache.jackrabbit.core.state.ItemStateException;
import org.apache.jackrabbit.core.state.ItemStateManager;
import org.apache.jackrabbit.core.state.NodeState;
import org.apache.jackrabbit.core.state.NodeStateIterator;
import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException;
+import org.apache.jackrabbit.spi.commons.query.jsr283.PreparedQuery;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModel;
import org.apache.jackrabbit.spi.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java?rev=629125&r1=629124&r2=629125&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java Tue Feb 19 07:29:03 2008
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.query.jsr283.PreparedQuery;
import org.apache.jackrabbit.core.query.qom.QueryObjectModelTree;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.ItemManager;
import org.apache.jackrabbit.spi.commons.conversion.NameException;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
+import org.apache.jackrabbit.spi.commons.query.jsr283.PreparedQuery;
import javax.jcr.Value;
import javax.jcr.RepositoryException;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryManagerImpl.java?rev=629125&r1=629124&r2=629125&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryManagerImpl.java Tue Feb 19 07:29:03 2008
@@ -19,12 +19,12 @@
import org.apache.jackrabbit.core.ItemManager;
import org.apache.jackrabbit.core.SearchManager;
import org.apache.jackrabbit.core.SessionImpl;
-import org.apache.jackrabbit.core.query.jsr283.PreparedQuery;
-import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelFactory;
-import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModel;
import org.apache.jackrabbit.core.query.qom.QueryObjectModelFactoryImpl;
import org.apache.jackrabbit.core.query.qom.QueryObjectModelTree;
import org.apache.jackrabbit.spi.commons.query.QueryTreeBuilderRegistry;
+import org.apache.jackrabbit.spi.commons.query.jsr283.PreparedQuery;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelFactory;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModel;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Added: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryObjectModelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryObjectModelImpl.java?rev=629125&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryObjectModelImpl.java (added)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryObjectModelImpl.java Tue Feb 19 07:29:03 2008
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.query;
+
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModel;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Source;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Ordering;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Constraint;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Column;
+
+/**
+ * <code>QueryObjectModelImpl</code>...
+ */
+public class QueryObjectModelImpl
+ extends PreparedQueryImpl
+ implements QueryObjectModel {
+
+ //-------------------------< QueryObjectModel >-----------------------------
+
+ /**
+ * Gets the node-tuple source for this query.
+ *
+ * @return the node-tuple source; non-null
+ */
+ public Source getSource() {
+ return qomTree.getSource();
+ }
+
+ /**
+ * Gets the constraint for this query.
+ *
+ * @return the constraint, or null if none
+ */
+ public Constraint getConstraint() {
+ return qomTree.getConstraint();
+ }
+
+ /**
+ * Gets the orderings for this query.
+ *
+ * @return an array of zero or more orderings; non-null
+ */
+ public Ordering[] getOrderings() {
+ return qomTree.getOrderings();
+ }
+
+ /**
+ * Gets the columns for this query.
+ *
+ * @return an array of zero or more columns; non-null
+ */
+ public Column[] getColumns() {
+ return qomTree.getColumns();
+ }
+}
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryObjectModelImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java?rev=629125&r1=629124&r2=629125&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java Tue Feb 19 07:29:03 2008
@@ -49,7 +49,7 @@
import org.apache.jackrabbit.core.query.qom.DynamicOperandImpl;
import org.apache.jackrabbit.core.query.qom.DefaultTraversingQOMTreeVisitor;
import org.apache.jackrabbit.core.query.PropertyTypeRegistry;
-import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelConstants;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants;
import org.apache.jackrabbit.core.query.lucene.fulltext.QueryParser;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.HierarchyManager;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PreparedQueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PreparedQueryImpl.java?rev=629125&r1=629124&r2=629125&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PreparedQueryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PreparedQueryImpl.java Tue Feb 19 07:29:03 2008
@@ -18,7 +18,7 @@
import org.apache.jackrabbit.core.query.ExecutablePreparedQuery;
import org.apache.jackrabbit.core.query.PropertyTypeRegistry;
-import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelConstants;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants;
import org.apache.jackrabbit.core.query.qom.QueryObjectModelTree;
import org.apache.jackrabbit.core.query.qom.DefaultTraversingQOMTreeVisitor;
import org.apache.jackrabbit.core.query.qom.BindVariableValueImpl;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/AbstractQOMTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/AbstractQOMTest.java?rev=629125&r1=629124&r2=629125&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/AbstractQOMTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/AbstractQOMTest.java Tue Feb 19 07:29:03 2008
@@ -18,7 +18,7 @@
import org.apache.jackrabbit.test.api.query.AbstractQueryTest;
-import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelFactory;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelFactory;
import org.apache.jackrabbit.core.query.QueryManagerImpl;
/**
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryTest.java?rev=629125&r1=629124&r2=629125&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryTest.java Tue Feb 19 07:29:03 2008
@@ -16,39 +16,39 @@
*/
package org.apache.jackrabbit.core.query.qom;
-import org.apache.jackrabbit.core.query.jsr283.qom.And;
-import org.apache.jackrabbit.core.query.jsr283.qom.PropertyExistence;
-import org.apache.jackrabbit.core.query.jsr283.qom.PropertyValue;
-import org.apache.jackrabbit.core.query.jsr283.qom.Ordering;
-import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelConstants;
-import org.apache.jackrabbit.core.query.jsr283.qom.BindVariableValue;
-import org.apache.jackrabbit.core.query.jsr283.qom.ChildNode;
-import org.apache.jackrabbit.core.query.jsr283.qom.ChildNodeJoinCondition;
-import org.apache.jackrabbit.core.query.jsr283.qom.Column;
-import org.apache.jackrabbit.core.query.jsr283.qom.Comparison;
-import org.apache.jackrabbit.core.query.jsr283.qom.DescendantNode;
-import org.apache.jackrabbit.core.query.jsr283.qom.DescendantNodeJoinCondition;
-import org.apache.jackrabbit.core.query.jsr283.qom.EquiJoinCondition;
-import org.apache.jackrabbit.core.query.jsr283.qom.FullTextSearch;
-import org.apache.jackrabbit.core.query.jsr283.qom.FullTextSearchScore;
-import org.apache.jackrabbit.core.query.jsr283.qom.Join;
-import org.apache.jackrabbit.core.query.jsr283.qom.Selector;
-import org.apache.jackrabbit.core.query.jsr283.qom.JoinCondition;
-import org.apache.jackrabbit.core.query.jsr283.qom.Length;
-import org.apache.jackrabbit.core.query.jsr283.qom.LowerCase;
-import org.apache.jackrabbit.core.query.jsr283.qom.NodeLocalName;
-import org.apache.jackrabbit.core.query.jsr283.qom.NodeName;
-import org.apache.jackrabbit.core.query.jsr283.qom.Not;
-import org.apache.jackrabbit.core.query.jsr283.qom.Or;
-import org.apache.jackrabbit.core.query.jsr283.qom.SameNode;
-import org.apache.jackrabbit.core.query.jsr283.qom.SameNodeJoinCondition;
-import org.apache.jackrabbit.core.query.jsr283.qom.UpperCase;
-import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelFactory;
-import org.apache.jackrabbit.core.query.jsr283.qom.Constraint;
-import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand;
-import org.apache.jackrabbit.core.query.jsr283.qom.StaticOperand;
-import org.apache.jackrabbit.core.query.jsr283.qom.Source;
-import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModel;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.And;
+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.Ordering;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.BindVariableValue;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.ChildNode;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.ChildNodeJoinCondition;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Column;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Comparison;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.DescendantNode;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.DescendantNodeJoinCondition;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.EquiJoinCondition;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.FullTextSearch;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.FullTextSearchScore;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Join;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Selector;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.JoinCondition;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Length;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.LowerCase;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.NodeLocalName;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.NodeName;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Not;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Or;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.SameNode;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.SameNodeJoinCondition;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.UpperCase;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelFactory;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Constraint;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.DynamicOperand;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.StaticOperand;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.Source;
+import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModel;
import javax.jcr.RepositoryException;
import java.util.Set;