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 2005/04/15 12:30:22 UTC
svn commit: r161434 [2/2] - in incubator/jackrabbit/trunk: ./
applications/test/ applications/test/workspaces/default/
applications/test/workspaces/test/
contrib/jcr-server/webapp/src/webapp/WEB-INF/repository/
contrib/orm-persistence/applications/test/
contrib/orm-persistence/applications/test/workspaces/default/
contrib/tck-webapp/src/webapp/WEB-INF/content-repository/ contrib/vfs/
src/conf/ src/grammar/sql/ src/grammar/xpath/ src/java/META-INF/services/
src/java/org/apache/jackrabbit/core/
src/java/org/apache/jackrabbit/core/query/
src/java/org/apache/jackrabbit/core/query/lucene/
src/java/org/apache/jackrabbit/core/query/sql/
src/java/org/apache/jackrabbit/core/query/xpath/
src/java/org/apache/jackrabbit/core/search/
src/test/org/apache/jackrabbit/core/query/
src/test/org/apache/jackrabbit/core/search/
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.jackrabbit.core.NamespaceResolver;
import org.apache.jackrabbit.core.NoPrefixDeclaredException;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -30,7 +30,7 @@
import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.Path;
import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.search.TextFilterService;
+import org.apache.jackrabbit.core.query.TextFilterService;
import org.apache.log4j.Logger;
import javax.jcr.NamespaceException;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.jackrabbit.core.ItemManager;
import org.apache.jackrabbit.core.NodeId;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NotQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NotQuery.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NotQuery.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/NotQuery.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Weight;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.jackrabbit.core.fs.FileSystem;
import org.apache.jackrabbit.core.fs.FileSystemException;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.jackrabbit.core.Constants;
import org.apache.jackrabbit.core.ItemManager;
@@ -23,14 +23,14 @@
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
import org.apache.jackrabbit.core.nodetype.PropertyDefinitionImpl;
-import org.apache.jackrabbit.core.search.DefaultQueryNodeVisitor;
-import org.apache.jackrabbit.core.search.ExecutableQuery;
-import org.apache.jackrabbit.core.search.LocationStepQueryNode;
-import org.apache.jackrabbit.core.search.NodeTypeQueryNode;
-import org.apache.jackrabbit.core.search.OrderQueryNode;
-import org.apache.jackrabbit.core.search.PropertyTypeRegistry;
-import org.apache.jackrabbit.core.search.QueryParser;
-import org.apache.jackrabbit.core.search.QueryRootNode;
+import org.apache.jackrabbit.core.query.DefaultQueryNodeVisitor;
+import org.apache.jackrabbit.core.query.ExecutableQuery;
+import org.apache.jackrabbit.core.query.LocationStepQueryNode;
+import org.apache.jackrabbit.core.query.NodeTypeQueryNode;
+import org.apache.jackrabbit.core.query.OrderQueryNode;
+import org.apache.jackrabbit.core.query.PropertyTypeRegistry;
+import org.apache.jackrabbit.core.query.QueryParser;
+import org.apache.jackrabbit.core.query.QueryRootNode;
import org.apache.jackrabbit.core.security.AccessManager;
import org.apache.log4j.Logger;
import org.apache.lucene.search.Hits;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.jackrabbit.core.ItemManager;
import org.apache.jackrabbit.core.NamespaceResolver;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.jackrabbit.core.fs.FileSystemResource;
import org.apache.jackrabbit.core.fs.FileSystemException;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.NamespaceResolver;
@@ -22,7 +22,7 @@
import org.apache.jackrabbit.core.PropertyImpl;
import org.apache.jackrabbit.core.IllegalNameException;
import org.apache.jackrabbit.core.UnknownPrefixException;
-import org.apache.jackrabbit.core.search.QueryConstants;
+import org.apache.jackrabbit.core.query.QueryConstants;
import javax.jcr.query.RowIterator;
import javax.jcr.query.Row;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java Fri Apr 15 03:30:01 2005
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import EDU.oswego.cs.dl.util.concurrent.FIFOReadWriteLock;
import org.apache.jackrabbit.core.fs.FileSystemException;
-import org.apache.jackrabbit.core.search.AbstractQueryHandler;
-import org.apache.jackrabbit.core.search.QueryConstants;
-import org.apache.jackrabbit.core.search.ExecutableQuery;
-import org.apache.jackrabbit.core.search.QueryHandlerContext;
+import org.apache.jackrabbit.core.query.AbstractQueryHandler;
+import org.apache.jackrabbit.core.query.QueryConstants;
+import org.apache.jackrabbit.core.query.ExecutableQuery;
+import org.apache.jackrabbit.core.query.QueryHandlerContext;
import org.apache.jackrabbit.core.state.NodeState;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.ItemManager;
@@ -43,7 +43,7 @@
import java.io.IOException;
/**
- * Implements a {@link org.apache.jackrabbit.core.search.QueryHandler} using
+ * Implements a {@link org.apache.jackrabbit.core.query.QueryHandler} using
* Lucene.
*/
public class SearchIndex extends AbstractQueryHandler {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldCache.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldCache.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldCache.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldCache.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.SortComparator;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldSortComparator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldSortComparator.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldSortComparator.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldSortComparator.java Fri Apr 15 03:30:01 2005
@@ -1,4 +1,4 @@
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.lucene.search.SortComparator;
import org.apache.lucene.search.ScoreDocComparator;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.store.RAMDirectory;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/WildcardQuery.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lucene/WildcardTermEnum.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.lucene;
+package org.apache.jackrabbit.core.query.lucene;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.sql;
+package org.apache.jackrabbit.core.query.sql;
import org.apache.jackrabbit.core.QName;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.sql;
+package org.apache.jackrabbit.core.query.sql;
import org.apache.jackrabbit.core.QName;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTLiteral.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTLiteral.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTLiteral.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTLiteral.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.sql;
+package org.apache.jackrabbit.core.query.sql;
public class ASTLiteral extends SimpleNode {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.sql;
+package org.apache.jackrabbit.core.query.sql;
import org.apache.jackrabbit.core.QName;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/DefaultParserVisitor.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/DefaultParserVisitor.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/DefaultParserVisitor.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/DefaultParserVisitor.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.sql;
+package org.apache.jackrabbit.core.query.sql;
/**
* Implements a {@link JCRSQLParserVisitor} with default method implementations.
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java Fri Apr 15 03:30:01 2005
@@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.sql;
+package org.apache.jackrabbit.core.query.sql;
-import org.apache.jackrabbit.core.search.QueryRootNode;
-import org.apache.jackrabbit.core.search.AndQueryNode;
-import org.apache.jackrabbit.core.search.NodeTypeQueryNode;
-import org.apache.jackrabbit.core.search.NAryQueryNode;
-import org.apache.jackrabbit.core.search.OrQueryNode;
-import org.apache.jackrabbit.core.search.NotQueryNode;
-import org.apache.jackrabbit.core.search.OrderQueryNode;
-import org.apache.jackrabbit.core.search.RelationQueryNode;
-import org.apache.jackrabbit.core.search.QueryConstants;
-import org.apache.jackrabbit.core.search.QueryNode;
-import org.apache.jackrabbit.core.search.TextsearchQueryNode;
-import org.apache.jackrabbit.core.search.PathQueryNode;
-import org.apache.jackrabbit.core.search.LocationStepQueryNode;
+import org.apache.jackrabbit.core.query.QueryRootNode;
+import org.apache.jackrabbit.core.query.AndQueryNode;
+import org.apache.jackrabbit.core.query.NodeTypeQueryNode;
+import org.apache.jackrabbit.core.query.NAryQueryNode;
+import org.apache.jackrabbit.core.query.OrQueryNode;
+import org.apache.jackrabbit.core.query.NotQueryNode;
+import org.apache.jackrabbit.core.query.OrderQueryNode;
+import org.apache.jackrabbit.core.query.RelationQueryNode;
+import org.apache.jackrabbit.core.query.QueryConstants;
+import org.apache.jackrabbit.core.query.QueryNode;
+import org.apache.jackrabbit.core.query.TextsearchQueryNode;
+import org.apache.jackrabbit.core.query.PathQueryNode;
+import org.apache.jackrabbit.core.query.LocationStepQueryNode;
import org.apache.jackrabbit.core.NamespaceResolver;
import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.IllegalNameException;
@@ -57,7 +57,7 @@
/**
* DateFormat pattern for type
- * {@link org.apache.jackrabbit.core.search.QueryConstants.TYPE_DATE}.
+ * {@link org.apache.jackrabbit.core.query.QueryConstants.TYPE_DATE}.
*/
private static final String DATE_PATTERN = "yyyy-MM-dd";
@@ -427,7 +427,7 @@
//------------------------< internal >--------------------------------------
/**
- * Creates a new {@link org.apache.jackrabbit.core.search.RelationQueryNode}.
+ * Creates a new {@link org.apache.jackrabbit.core.query.RelationQueryNode}.
* @param parent the parent node for the created <code>RelationQueryNode</code>.
* @param propertyName the property name for the relation.
* @param operationType the operation type.
@@ -627,9 +627,9 @@
/**
* Creates a new <code>MergingPathQueryNode</code> with the operation
* tpye of a parent node. <code>operation</code> must be one of:
- * {@link org.apache.jackrabbit.core.search.QueryNode#TYPE_OR},
- * {@link org.apache.jackrabbit.core.search.QueryNode#TYPE_AND} or
- * {@link org.apache.jackrabbit.core.search.QueryNode#TYPE_NOT}.
+ * {@link org.apache.jackrabbit.core.query.QueryNode#TYPE_OR},
+ * {@link org.apache.jackrabbit.core.query.QueryNode#TYPE_AND} or
+ * {@link org.apache.jackrabbit.core.query.QueryNode#TYPE_NOT}.
* @param operation the operation type of the parent node.
*/
MergingPathQueryNode(int operation) {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java Fri Apr 15 03:30:01 2005
@@ -14,23 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.sql;
+package org.apache.jackrabbit.core.query.sql;
-import org.apache.jackrabbit.core.search.QueryNodeVisitor;
-import org.apache.jackrabbit.core.search.QueryRootNode;
-import org.apache.jackrabbit.core.search.OrQueryNode;
-import org.apache.jackrabbit.core.search.AndQueryNode;
-import org.apache.jackrabbit.core.search.NotQueryNode;
-import org.apache.jackrabbit.core.search.ExactQueryNode;
-import org.apache.jackrabbit.core.search.NodeTypeQueryNode;
-import org.apache.jackrabbit.core.search.TextsearchQueryNode;
-import org.apache.jackrabbit.core.search.PathQueryNode;
-import org.apache.jackrabbit.core.search.LocationStepQueryNode;
-import org.apache.jackrabbit.core.search.RelationQueryNode;
-import org.apache.jackrabbit.core.search.OrderQueryNode;
-import org.apache.jackrabbit.core.search.QueryNode;
-import org.apache.jackrabbit.core.search.QueryConstants;
-import org.apache.jackrabbit.core.search.DerefQueryNode;
+import org.apache.jackrabbit.core.query.QueryNodeVisitor;
+import org.apache.jackrabbit.core.query.QueryRootNode;
+import org.apache.jackrabbit.core.query.OrQueryNode;
+import org.apache.jackrabbit.core.query.AndQueryNode;
+import org.apache.jackrabbit.core.query.NotQueryNode;
+import org.apache.jackrabbit.core.query.ExactQueryNode;
+import org.apache.jackrabbit.core.query.NodeTypeQueryNode;
+import org.apache.jackrabbit.core.query.TextsearchQueryNode;
+import org.apache.jackrabbit.core.query.PathQueryNode;
+import org.apache.jackrabbit.core.query.LocationStepQueryNode;
+import org.apache.jackrabbit.core.query.RelationQueryNode;
+import org.apache.jackrabbit.core.query.OrderQueryNode;
+import org.apache.jackrabbit.core.query.QueryNode;
+import org.apache.jackrabbit.core.query.QueryConstants;
+import org.apache.jackrabbit.core.query.DerefQueryNode;
import org.apache.jackrabbit.core.NamespaceResolver;
import org.apache.jackrabbit.core.NoPrefixDeclaredException;
import org.apache.jackrabbit.core.QName;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java Fri Apr 15 03:30:01 2005
@@ -14,27 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.xpath;
+package org.apache.jackrabbit.core.query.xpath;
import org.apache.jackrabbit.core.Constants;
import org.apache.jackrabbit.core.NamespaceResolver;
import org.apache.jackrabbit.core.NoPrefixDeclaredException;
import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.search.AndQueryNode;
-import org.apache.jackrabbit.core.search.ExactQueryNode;
-import org.apache.jackrabbit.core.search.LocationStepQueryNode;
-import org.apache.jackrabbit.core.search.NodeTypeQueryNode;
-import org.apache.jackrabbit.core.search.NotQueryNode;
-import org.apache.jackrabbit.core.search.OrQueryNode;
-import org.apache.jackrabbit.core.search.OrderQueryNode;
-import org.apache.jackrabbit.core.search.PathQueryNode;
-import org.apache.jackrabbit.core.search.QueryConstants;
-import org.apache.jackrabbit.core.search.QueryNode;
-import org.apache.jackrabbit.core.search.QueryNodeVisitor;
-import org.apache.jackrabbit.core.search.QueryRootNode;
-import org.apache.jackrabbit.core.search.RelationQueryNode;
-import org.apache.jackrabbit.core.search.TextsearchQueryNode;
-import org.apache.jackrabbit.core.search.DerefQueryNode;
+import org.apache.jackrabbit.core.query.AndQueryNode;
+import org.apache.jackrabbit.core.query.ExactQueryNode;
+import org.apache.jackrabbit.core.query.LocationStepQueryNode;
+import org.apache.jackrabbit.core.query.NodeTypeQueryNode;
+import org.apache.jackrabbit.core.query.NotQueryNode;
+import org.apache.jackrabbit.core.query.OrQueryNode;
+import org.apache.jackrabbit.core.query.OrderQueryNode;
+import org.apache.jackrabbit.core.query.PathQueryNode;
+import org.apache.jackrabbit.core.query.QueryConstants;
+import org.apache.jackrabbit.core.query.QueryNode;
+import org.apache.jackrabbit.core.query.QueryNodeVisitor;
+import org.apache.jackrabbit.core.query.QueryRootNode;
+import org.apache.jackrabbit.core.query.RelationQueryNode;
+import org.apache.jackrabbit.core.query.TextsearchQueryNode;
+import org.apache.jackrabbit.core.query.DerefQueryNode;
import org.apache.jackrabbit.core.util.ISO9075;
import javax.jcr.query.InvalidQueryException;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/SimpleNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/SimpleNode.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/SimpleNode.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/SimpleNode.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.xpath;
+package org.apache.jackrabbit.core.query.xpath;
/**
* Implements a JavaCC Node interface.
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java?view=diff&r1=161433&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search.xpath;
+package org.apache.jackrabbit.core.query.xpath;
import org.apache.jackrabbit.core.Constants;
import org.apache.jackrabbit.core.IllegalNameException;
@@ -24,20 +24,20 @@
import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.SearchManager;
import org.apache.jackrabbit.core.UnknownPrefixException;
-import org.apache.jackrabbit.core.search.AndQueryNode;
-import org.apache.jackrabbit.core.search.LocationStepQueryNode;
-import org.apache.jackrabbit.core.search.NAryQueryNode;
-import org.apache.jackrabbit.core.search.NodeTypeQueryNode;
-import org.apache.jackrabbit.core.search.NotQueryNode;
-import org.apache.jackrabbit.core.search.OrQueryNode;
-import org.apache.jackrabbit.core.search.OrderQueryNode;
-import org.apache.jackrabbit.core.search.PathQueryNode;
-import org.apache.jackrabbit.core.search.QueryNode;
-import org.apache.jackrabbit.core.search.QueryRootNode;
-import org.apache.jackrabbit.core.search.RelationQueryNode;
-import org.apache.jackrabbit.core.search.TextsearchQueryNode;
-import org.apache.jackrabbit.core.search.QueryConstants;
-import org.apache.jackrabbit.core.search.DerefQueryNode;
+import org.apache.jackrabbit.core.query.AndQueryNode;
+import org.apache.jackrabbit.core.query.LocationStepQueryNode;
+import org.apache.jackrabbit.core.query.NAryQueryNode;
+import org.apache.jackrabbit.core.query.NodeTypeQueryNode;
+import org.apache.jackrabbit.core.query.NotQueryNode;
+import org.apache.jackrabbit.core.query.OrQueryNode;
+import org.apache.jackrabbit.core.query.OrderQueryNode;
+import org.apache.jackrabbit.core.query.PathQueryNode;
+import org.apache.jackrabbit.core.query.QueryNode;
+import org.apache.jackrabbit.core.query.QueryRootNode;
+import org.apache.jackrabbit.core.query.RelationQueryNode;
+import org.apache.jackrabbit.core.query.TextsearchQueryNode;
+import org.apache.jackrabbit.core.query.QueryConstants;
+import org.apache.jackrabbit.core.query.DerefQueryNode;
import org.apache.jackrabbit.core.util.ISO9075;
import javax.jcr.query.InvalidQueryException;
@@ -513,7 +513,7 @@
}
/**
- * Creates a new {@link org.apache.jackrabbit.core.search.RelationQueryNode}
+ * Creates a new {@link org.apache.jackrabbit.core.query.RelationQueryNode}
* with <code>queryNode</code> as its parent node.
*
* @param node a comparison expression node.
@@ -869,7 +869,7 @@
* Returns true if <code>node</code> has a child node which is the attribute
* axis.
*
- * @param node a node with type {@link org.apache.jackrabbit.core.search.xpath.XPathTreeConstants.JJTSTEPEXPR}.
+ * @param node a node with type {@link org.apache.jackrabbit.core.query.xpath.XPathTreeConstants.JJTSTEPEXPR}.
* @return <code>true</code> if this step expression uses the attribute axis.
*/
private boolean isAttributeAxis(SimpleNode node) {
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/AbstractQueryTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/AbstractQueryTest.java?view=diff&r1=161423&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/AbstractQueryTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/AbstractQueryTest.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search;
+package org.apache.jackrabbit.core.query;
import org.apache.jackrabbit.test.AbstractJCRTest;
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/FulltextQueryTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/FulltextQueryTest.java?view=diff&r1=161423&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/FulltextQueryTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/FulltextQueryTest.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search;
+package org.apache.jackrabbit.core.query;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/ISO9075Test.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/ISO9075Test.java?view=diff&r1=161423&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/ISO9075Test.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/ISO9075Test.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search;
+package org.apache.jackrabbit.core.query;
import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.util.ISO9075;
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/OrderByTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/OrderByTest.java?view=diff&r1=161423&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/OrderByTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/OrderByTest.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search;
+package org.apache.jackrabbit.core.query;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SQLTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SQLTest.java?view=diff&r1=161423&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SQLTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SQLTest.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search;
+package org.apache.jackrabbit.core.query;
import javax.jcr.Node;
import javax.jcr.query.Query;
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SelectClauseTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SelectClauseTest.java?view=diff&r1=161423&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SelectClauseTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SelectClauseTest.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search;
+package org.apache.jackrabbit.core.query;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Copied: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SimpleQueryTest.java (from r161425, incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/search/SimpleQueryTest.java)
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SimpleQueryTest.java?view=diff&rev=161434&p1=incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/search/SimpleQueryTest.java&r1=161425&p2=incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SimpleQueryTest.java&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/search/SimpleQueryTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SimpleQueryTest.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search;
+package org.apache.jackrabbit.core.query;
import javax.jcr.*;
import javax.jcr.query.Query;
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/TestAll.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/TestAll.java?view=diff&r1=161423&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/TestAll.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/TestAll.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search;
+package org.apache.jackrabbit.core.query;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/XPathAxisTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/XPathAxisTest.java?view=diff&r1=161423&r2=161434
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/XPathAxisTest.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/XPathAxisTest.java Fri Apr 15 03:30:01 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.core.search;
+package org.apache.jackrabbit.core.query;
import javax.jcr.RepositoryException;
import javax.jcr.Node;