You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2005/07/04 16:52:27 UTC
svn commit: r209089 [6/7] - in /incubator/jackrabbit/trunk: commons/
commons/src/java/org/apache/jackrabbit/
commons/src/java/org/apache/jackrabbit/core/
commons/src/java/org/apache/jackrabbit/name/
commons/src/java/org/apache/jackrabbit/util/ commons/...
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java Mon Jul 4 07:52:19 2005
@@ -16,28 +16,27 @@
*/
package org.apache.jackrabbit.core.nodetype.xml;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Vector;
-
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-import javax.jcr.version.OnParentVersionAction;
-
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.value.InternalValue;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.UnknownPrefixException;
-import org.apache.jackrabbit.core.nodetype.NodeDef;
import org.apache.jackrabbit.core.nodetype.InvalidConstraintException;
import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException;
+import org.apache.jackrabbit.core.nodetype.NodeDef;
+import org.apache.jackrabbit.core.nodetype.NodeDefImpl;
import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
import org.apache.jackrabbit.core.nodetype.PropDef;
-import org.apache.jackrabbit.core.nodetype.ValueConstraint;
import org.apache.jackrabbit.core.nodetype.PropDefImpl;
-import org.apache.jackrabbit.core.nodetype.NodeDefImpl;
+import org.apache.jackrabbit.core.nodetype.ValueConstraint;
import org.apache.jackrabbit.core.util.DOMWalker;
+import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
+
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.version.OnParentVersionAction;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Vector;
/**
* Node type definition reader. This class is used to read the
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java Mon Jul 4 07:52:19 2005
@@ -16,24 +16,23 @@
*/
package org.apache.jackrabbit.core.nodetype.xml;
-import java.io.IOException;
-import java.io.OutputStream;
+import org.apache.jackrabbit.core.nodetype.NodeDef;
+import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
+import org.apache.jackrabbit.core.nodetype.PropDef;
+import org.apache.jackrabbit.core.nodetype.ValueConstraint;
+import org.apache.jackrabbit.core.util.DOMBuilder;
+import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
import javax.jcr.NamespaceRegistry;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.version.OnParentVersionAction;
import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.jackrabbit.core.value.InternalValue;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.nodetype.NodeDef;
-import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
-import org.apache.jackrabbit.core.nodetype.PropDef;
-import org.apache.jackrabbit.core.nodetype.ValueConstraint;
-import org.apache.jackrabbit.core.util.DOMBuilder;
+import java.io.IOException;
+import java.io.OutputStream;
/**
* Node type definition writer. This class is used to write the
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java Mon Jul 4 07:52:19 2005
@@ -17,24 +17,24 @@
package org.apache.jackrabbit.core.observation;
import org.apache.jackrabbit.core.HierarchyManager;
-import org.apache.jackrabbit.core.ItemId;
import org.apache.jackrabbit.core.HierarchyManagerImpl;
-import org.apache.jackrabbit.core.NamespaceResolver;
+import org.apache.jackrabbit.core.ItemId;
import org.apache.jackrabbit.core.ZombieHierarchyManager;
-import org.apache.jackrabbit.core.Path;
import org.apache.jackrabbit.core.state.ChangeLog;
-import org.apache.jackrabbit.core.state.ItemStateManager;
import org.apache.jackrabbit.core.state.ItemState;
-import org.apache.jackrabbit.core.state.NoSuchItemStateException;
import org.apache.jackrabbit.core.state.ItemStateException;
+import org.apache.jackrabbit.core.state.ItemStateManager;
+import org.apache.jackrabbit.core.state.NoSuchItemStateException;
import org.apache.jackrabbit.core.state.NodeReferences;
import org.apache.jackrabbit.core.state.NodeReferencesId;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.Path;
import javax.jcr.ItemNotFoundException;
import javax.jcr.RepositoryException;
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
/**
* Implements a {@link HierarchyManager} that uses a {@link ChangeLog} for
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventFilter.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventFilter.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventFilter.java Mon Jul 4 07:52:19 2005
@@ -17,10 +17,10 @@
package org.apache.jackrabbit.core.observation;
import org.apache.jackrabbit.core.ItemManager;
-import org.apache.jackrabbit.core.MalformedPathException;
-import org.apache.jackrabbit.core.Path;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.Path;
import org.apache.log4j.Logger;
import javax.jcr.RepositoryException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventImpl.java Mon Jul 4 07:52:19 2005
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.core.observation;
-import org.apache.jackrabbit.core.MalformedPathException;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.Path;
import org.apache.jackrabbit.core.SessionImpl;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
import org.apache.log4j.Logger;
import javax.jcr.RepositoryException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventState.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventState.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventState.java Mon Jul 4 07:52:19 2005
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.core.observation;
-import org.apache.jackrabbit.core.Path;
import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
+import org.apache.jackrabbit.name.Path;
import javax.jcr.Session;
import javax.jcr.observation.Event;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventStateCollection.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventStateCollection.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventStateCollection.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/EventStateCollection.java Mon Jul 4 07:52:19 2005
@@ -18,10 +18,7 @@
import org.apache.jackrabbit.core.HierarchyManager;
import org.apache.jackrabbit.core.ItemId;
-import org.apache.jackrabbit.core.MalformedPathException;
import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.Path;
-import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
import org.apache.jackrabbit.core.state.ChangeLog;
@@ -30,6 +27,9 @@
import org.apache.jackrabbit.core.state.ItemStateManager;
import org.apache.jackrabbit.core.state.NoSuchItemStateException;
import org.apache.jackrabbit.core.state.NodeState;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
import org.apache.log4j.Logger;
import javax.jcr.PathNotFoundException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ObservationManagerFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ObservationManagerFactory.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ObservationManagerFactory.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ObservationManagerFactory.java Mon Jul 4 07:52:19 2005
@@ -19,9 +19,9 @@
import org.apache.commons.collections.Buffer;
import org.apache.commons.collections.BufferUtils;
import org.apache.commons.collections.buffer.UnboundedFifoBuffer;
-import org.apache.log4j.Logger;
-import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.ItemManager;
+import org.apache.jackrabbit.core.SessionImpl;
+import org.apache.log4j.Logger;
import java.util.Collections;
import java.util.HashSet;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java Mon Jul 4 07:52:19 2005
@@ -14,11 +14,11 @@
package org.apache.jackrabbit.core.observation;
import org.apache.jackrabbit.core.ItemManager;
-import org.apache.jackrabbit.core.MalformedPathException;
-import org.apache.jackrabbit.core.Path;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.Path;
import org.apache.log4j.Logger;
import javax.jcr.RepositoryException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/DerefQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/DerefQueryNode.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/DerefQueryNode.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/DerefQueryNode.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
/**
* Represents query node that dereferences a reference property into a node and
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/ExactQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/ExactQueryNode.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/ExactQueryNode.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/ExactQueryNode.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
/**
* Implements a query node that defines an exact match of a property and a
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/ExecutableQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/ExecutableQuery.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/ExecutableQuery.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/ExecutableQuery.java Mon Jul 4 07:52:19 2005
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.core.query;
-import javax.jcr.query.QueryResult;
import javax.jcr.RepositoryException;
+import javax.jcr.query.QueryResult;
/**
* Specifies an interface for a query object implementation that can just be
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/LocationStepQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/LocationStepQueryNode.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/LocationStepQueryNode.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/LocationStepQueryNode.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
/**
* Defines a location step for querying the path of a node.
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/NodeTypeQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/NodeTypeQueryNode.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/NodeTypeQueryNode.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/NodeTypeQueryNode.java Mon Jul 4 07:52:19 2005
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.Constants;
+import org.apache.jackrabbit.name.QName;
/**
* Implements a query node that defines a node type match.
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/OrderQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/OrderQueryNode.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/OrderQueryNode.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/OrderQueryNode.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java Mon Jul 4 07:52:19 2005
@@ -16,22 +16,22 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.Constants;
+import org.apache.jackrabbit.Constants;
+import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import org.apache.jackrabbit.core.nodetype.NodeTypeRegistryListener;
-import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
import org.apache.jackrabbit.core.nodetype.PropDef;
+import org.apache.jackrabbit.name.QName;
import org.apache.log4j.Logger;
import javax.jcr.PropertyType;
import javax.jcr.nodetype.NoSuchNodeTypeException;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Map;
/**
* The <code>PropertyTypeRegistry</code> keeps track of registered node type
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryConstants.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryConstants.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryConstants.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryConstants.java Mon Jul 4 07:52:19 2005
@@ -16,34 +16,11 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.NamespaceRegistryImpl;
-
/**
* This interface defines constants for data types and operation types
* used in queries.
*/
public interface QueryConstants {
-
- /**
- * QName for jcr:score
- */
- QName JCR_SCORE = new QName(NamespaceRegistryImpl.NS_JCR_URI, "score");
-
- /**
- * QName for jcr:path
- */
- QName JCR_PATH = new QName(NamespaceRegistryImpl.NS_JCR_URI, "path");
-
- /**
- * QName for jcr:statement
- */
- QName JCR_STATEMENT = new QName(NamespaceRegistryImpl.NS_JCR_URI, "statement");
-
- /**
- * QName for jcr:language
- */
- QName JCR_LANGUAGE = new QName(NamespaceRegistryImpl.NS_JCR_URI, "language");
/**
* long data type
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryHandler.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryHandler.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryHandler.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryHandler.java Mon Jul 4 07:52:19 2005
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.state.NodeState;
-import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.ItemManager;
+import org.apache.jackrabbit.core.SessionImpl;
+import org.apache.jackrabbit.core.state.NodeState;
-import javax.jcr.query.InvalidQueryException;
import javax.jcr.RepositoryException;
+import javax.jcr.query.InvalidQueryException;
import java.io.IOException;
/**
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryHandlerContext.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryHandlerContext.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryHandlerContext.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryHandlerContext.java Mon Jul 4 07:52:19 2005
@@ -17,8 +17,8 @@
package org.apache.jackrabbit.core.query;
import org.apache.jackrabbit.core.fs.FileSystem;
-import org.apache.jackrabbit.core.state.ItemStateManager;
import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+import org.apache.jackrabbit.core.state.ItemStateManager;
/**
* Acts as an argument for the {@link QueryHandler} to keep the interface
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryImpl.java Mon Jul 4 07:52:19 2005
@@ -16,13 +16,13 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.Constants;
+import org.apache.jackrabbit.Constants;
import org.apache.jackrabbit.core.ItemManager;
-import org.apache.jackrabbit.core.MalformedPathException;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.Path;
import org.apache.jackrabbit.core.SessionImpl;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
import javax.jcr.ItemExistsException;
import javax.jcr.ItemNotFoundException;
@@ -114,8 +114,8 @@
if (!node.isNodeType(Constants.NT_QUERY.toJCRName(session.getNamespaceResolver()))) {
throw new InvalidQueryException("node is not of type nt:query");
}
- statement = node.getProperty(QueryConstants.JCR_STATEMENT.toJCRName(session.getNamespaceResolver())).getString();
- language = node.getProperty(QueryConstants.JCR_LANGUAGE.toJCRName(session.getNamespaceResolver())).getString();
+ statement = node.getProperty(Constants.JCR_STATEMENT.toJCRName(session.getNamespaceResolver())).getString();
+ language = node.getProperty(Constants.JCR_LANGUAGE.toJCRName(session.getNamespaceResolver())).getString();
query = handler.createExecutableQuery(session, itemMgr, statement, language);
} catch (NoPrefixDeclaredException e) {
throw new RepositoryException(e.getMessage(), e);
@@ -184,8 +184,8 @@
Node queryNode = session.getRootNode().addNode(relPath,
Constants.NT_QUERY.toJCRName(resolver));
// set properties
- queryNode.setProperty(QueryConstants.JCR_LANGUAGE.toJCRName(resolver), language);
- queryNode.setProperty(QueryConstants.JCR_STATEMENT.toJCRName(resolver), statement);
+ queryNode.setProperty(Constants.JCR_LANGUAGE.toJCRName(resolver), language);
+ queryNode.setProperty(Constants.JCR_STATEMENT.toJCRName(resolver), statement);
node = queryNode;
return node;
} catch (MalformedPathException e) {
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryManagerImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryManagerImpl.java Mon Jul 4 07:52:19 2005
@@ -20,8 +20,8 @@
import org.apache.jackrabbit.core.SearchManager;
import org.apache.jackrabbit.core.SessionImpl;
-import javax.jcr.RepositoryException;
import javax.jcr.Node;
+import javax.jcr.RepositoryException;
import javax.jcr.query.InvalidQueryException;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryParser.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryParser.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryParser.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryParser.java Mon Jul 4 07:52:19 2005
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.query.xpath.XPathQueryBuilder;
import org.apache.jackrabbit.core.query.sql.JCRSQLQueryBuilder;
-import org.apache.jackrabbit.core.NamespaceResolver;
+import org.apache.jackrabbit.core.query.xpath.XPathQueryBuilder;
+import org.apache.jackrabbit.name.NamespaceResolver;
import javax.jcr.query.InvalidQueryException;
import javax.jcr.query.Query;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryRootNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryRootNode.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryRootNode.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryRootNode.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +32,7 @@
private PathQueryNode locationNode;
/**
- * The list of property names (as {@link org.apache.jackrabbit.core.QName}s
+ * The list of property names (as {@link org.apache.jackrabbit.name.QName}s
* to select.
*/
private List selectProperties = new ArrayList();
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryTreeDump.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryTreeDump.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryTreeDump.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/QueryTreeDump.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
import java.util.Arrays;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/RelationQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/RelationQueryNode.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/RelationQueryNode.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/RelationQueryNode.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
import java.util.Date;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/TextPlainTextFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/TextPlainTextFilter.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/TextPlainTextFilter.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/TextPlainTextFilter.java Mon Jul 4 07:52:19 2005
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.core.query;
+import org.apache.jackrabbit.core.query.lucene.FieldNames;
import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.core.value.BLOBFileValue;
-import org.apache.jackrabbit.core.query.lucene.FieldNames;
+import org.apache.jackrabbit.core.value.InternalValue;
import javax.jcr.RepositoryException;
-import java.util.Map;
-import java.util.HashMap;
import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
/**
* Implements a {@link TextFilter} that handles binary properties of mime-type
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/TextsearchQueryNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/TextsearchQueryNode.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/TextsearchQueryNode.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/TextsearchQueryNode.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
/**
* Implements a query node that defines a textsearch clause.
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java Mon Jul 4 07:52:19 2005
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.core.query.lucene;
+import org.apache.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.log4j.Logger;
import java.io.IOException;
-import java.io.PrintStream;
import java.io.OutputStream;
+import java.io.PrintStream;
/**
* Implements common functionality for a lucene index.
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/CachingIndexReader.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/CachingIndexReader.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/CachingIndexReader.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/CachingIndexReader.java Mon Jul 4 07:52:19 2005
@@ -16,21 +16,21 @@
*/
package org.apache.jackrabbit.core.query.lucene;
+import org.apache.log4j.Logger;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.FilterIndexReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
-import org.apache.lucene.index.FilterIndexReader;
import org.apache.lucene.index.TermEnum;
-import org.apache.lucene.document.Document;
-import org.apache.log4j.Logger;
import java.io.IOException;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* Implements an <code>IndexReader</code> that maintains caches to resolve
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/CachingMultiReader.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/CachingMultiReader.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/CachingMultiReader.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/CachingMultiReader.java Mon Jul 4 07:52:19 2005
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.TermDocs;
+import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.TermEnum;
import java.io.IOException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java Mon Jul 4 07:52:19 2005
@@ -16,6 +16,13 @@
*/
package org.apache.jackrabbit.core.query.lucene;
+import org.apache.jackrabbit.core.NodeId;
+import org.apache.jackrabbit.core.query.LocationStepQueryNode;
+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.name.QName;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
@@ -25,15 +32,8 @@
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Searcher;
import org.apache.lucene.search.Similarity;
-import org.apache.lucene.search.Weight;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.document.Document;
-import org.apache.jackrabbit.core.state.ItemStateManager;
-import org.apache.jackrabbit.core.state.NodeState;
-import org.apache.jackrabbit.core.state.ItemStateException;
-import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.query.LocationStepQueryNode;
+import org.apache.lucene.search.Weight;
import java.io.IOException;
import java.util.ArrayList;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/DerefQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/DerefQuery.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/DerefQuery.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/DerefQuery.java Mon Jul 4 07:52:19 2005
@@ -16,23 +16,23 @@
*/
package org.apache.jackrabbit.core.query.lucene;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermDocs;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.HitCollector;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Weight;
import org.apache.lucene.search.Searcher;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.Similarity;
-import org.apache.lucene.search.HitCollector;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermDocs;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.Weight;
import java.io.IOException;
-import java.util.BitSet;
-import java.util.List;
import java.util.ArrayList;
+import java.util.BitSet;
import java.util.Iterator;
+import java.util.List;
/**
* Implements a lucene <code>Query</code> which returns the nodes selected by
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/DocOrderNodeIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/DocOrderNodeIteratorImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/DocOrderNodeIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/DocOrderNodeIteratorImpl.java Mon Jul 4 07:52:19 2005
@@ -17,13 +17,13 @@
package org.apache.jackrabbit.core.query.lucene;
import org.apache.jackrabbit.core.ItemManager;
-import org.apache.jackrabbit.core.NodeImpl;
import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.Path;
+import org.apache.jackrabbit.core.NodeImpl;
+import org.apache.jackrabbit.name.Path;
import org.apache.log4j.Logger;
-import javax.jcr.NodeIterator;
import javax.jcr.Node;
+import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import java.util.Arrays;
import java.util.Comparator;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/IndexInfos.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/IndexInfos.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/IndexInfos.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/IndexInfos.java Mon Jul 4 07:52:19 2005
@@ -19,11 +19,11 @@
import org.apache.jackrabbit.core.fs.FileSystem;
import org.apache.jackrabbit.core.fs.FileSystemException;
-import java.io.IOException;
import java.io.DataInputStream;
import java.io.DataOutputStream;
-import java.util.List;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.List;
/**
*/
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java Mon Jul 4 07:52:19 2005
@@ -16,13 +16,7 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.MalformedPathException;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.Path;
-import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.SessionImpl;
-import org.apache.jackrabbit.core.UnknownPrefixException;
import org.apache.jackrabbit.core.query.AndQueryNode;
import org.apache.jackrabbit.core.query.DerefQueryNode;
import org.apache.jackrabbit.core.query.ExactQueryNode;
@@ -40,7 +34,13 @@
import org.apache.jackrabbit.core.query.RelationQueryNode;
import org.apache.jackrabbit.core.query.TextsearchQueryNode;
import org.apache.jackrabbit.core.state.ItemStateManager;
-import org.apache.jackrabbit.core.util.ISO8601;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
+import org.apache.jackrabbit.util.ISO8601;
import org.apache.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.Term;
@@ -80,12 +80,12 @@
/**
* QName for jcr:primaryType
*/
- private static QName primaryType = org.apache.jackrabbit.core.Constants.JCR_PRIMARYTYPE;
+ private static QName primaryType = org.apache.jackrabbit.Constants.JCR_PRIMARYTYPE;
/**
* QName for jcr:mixinTypes
*/
- private static QName mixinTypes = org.apache.jackrabbit.core.Constants.JCR_MIXINTYPES;
+ private static QName mixinTypes = org.apache.jackrabbit.Constants.JCR_MIXINTYPES;
/**
* Root node of the abstract query tree
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java Mon Jul 4 07:52:19 2005
@@ -16,27 +16,27 @@
*/
package org.apache.jackrabbit.core.query.lucene;
+import org.apache.jackrabbit.core.NodeId;
+import org.apache.jackrabbit.core.fs.BasedFileSystem;
import org.apache.jackrabbit.core.fs.FileSystem;
import org.apache.jackrabbit.core.fs.FileSystemException;
import org.apache.jackrabbit.core.fs.FileSystemResource;
-import org.apache.jackrabbit.core.fs.BasedFileSystem;
+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.NoSuchItemStateException;
-import org.apache.jackrabbit.core.state.ItemStateException;
-import org.apache.jackrabbit.core.NodeId;
+import org.apache.jackrabbit.core.state.NodeState;
+import org.apache.log4j.Logger;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
-import org.apache.log4j.Logger;
+import org.apache.lucene.index.Term;
import javax.jcr.RepositoryException;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
import java.util.Set;
-import java.util.HashSet;
/**
* A <code>MultiIndex</code> consists of a {@link VolatileIndex} and multiple
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java Mon Jul 4 07:52:19 2005
@@ -16,13 +16,13 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.UnknownPrefixException;
import org.apache.jackrabbit.core.fs.FileSystemException;
import org.apache.jackrabbit.core.fs.FileSystemResource;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
import org.apache.log4j.Logger;
import javax.jcr.NamespaceException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java Mon Jul 4 07:52:19 2005
@@ -16,12 +16,9 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
+import org.apache.jackrabbit.Constants;
import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.Path;
import org.apache.jackrabbit.core.PropertyId;
-import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.query.TextFilterService;
import org.apache.jackrabbit.core.state.ItemStateException;
import org.apache.jackrabbit.core.state.ItemStateManager;
@@ -29,6 +26,9 @@
import org.apache.jackrabbit.core.state.NodeState;
import org.apache.jackrabbit.core.state.PropertyState;
import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
import org.apache.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NotQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NotQuery.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NotQuery.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/NotQuery.java Mon Jul 4 07:52:19 2005
@@ -16,13 +16,13 @@
*/
package org.apache.jackrabbit.core.query.lucene;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Weight;
-import org.apache.lucene.search.Searcher;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.Searcher;
import org.apache.lucene.search.Similarity;
-import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.search.Weight;
import java.io.IOException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/PersistentIndex.java Mon Jul 4 07:52:19 2005
@@ -18,10 +18,10 @@
import org.apache.jackrabbit.core.fs.FileSystem;
import org.apache.jackrabbit.core.fs.FileSystemException;
+import org.apache.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.store.Directory;
import org.apache.lucene.index.IndexReader;
-import org.apache.log4j.Logger;
+import org.apache.lucene.store.Directory;
import java.io.IOException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java Mon Jul 4 07:52:19 2005
@@ -16,28 +16,27 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.jackrabbit.core.Constants;
+import org.apache.jackrabbit.Constants;
import org.apache.jackrabbit.core.ItemManager;
import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.QName;
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.query.AndQueryNode;
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.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.PropertyTypeRegistry;
import org.apache.jackrabbit.core.query.QueryParser;
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.TextsearchQueryNode;
-import org.apache.jackrabbit.core.query.PathQueryNode;
-import org.apache.jackrabbit.core.query.QueryConstants;
import org.apache.jackrabbit.core.security.AccessManager;
+import org.apache.jackrabbit.name.QName;
import org.apache.log4j.Logger;
import org.apache.lucene.search.Hits;
import org.apache.lucene.search.Query;
@@ -48,9 +47,9 @@
import javax.jcr.query.QueryResult;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.Arrays;
/**
* Implements the {@link ExecutableQuery} interface.
@@ -201,11 +200,11 @@
}
// add jcr:path
- selectProps.add(QueryConstants.JCR_PATH);
+ selectProps.add(Constants.JCR_PATH);
// add jcr:score if necessary
if (hasTextsearchNode(root.getLocationNode())) {
- selectProps.add(QueryConstants.JCR_SCORE);
+ selectProps.add(Constants.JCR_SCORE);
}
// return QueryResult
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java Mon Jul 4 07:52:19 2005
@@ -17,9 +17,9 @@
package org.apache.jackrabbit.core.query.lucene;
import org.apache.jackrabbit.core.ItemManager;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
import org.apache.log4j.Logger;
import javax.jcr.NodeIterator;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/RedoLog.java Mon Jul 4 07:52:19 2005
@@ -16,22 +16,22 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.jackrabbit.core.fs.FileSystemResource;
import org.apache.jackrabbit.core.fs.FileSystemException;
+import org.apache.jackrabbit.core.fs.FileSystemResource;
import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
-import org.apache.jackrabbit.core.util.uuid.Constants;
+import org.apache.jackrabbit.uuid.Constants;
import org.apache.log4j.Logger;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.Writer;
import java.io.OutputStreamWriter;
-import java.io.BufferedWriter;
-import java.util.List;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
/**
* Implements a redo log for the {@link VolatileIndex}. While nodes are added to
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java Mon Jul 4 07:52:19 2005
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.NamespaceResolver;
+import org.apache.jackrabbit.Constants;
import org.apache.jackrabbit.core.NodeImpl;
import org.apache.jackrabbit.core.PropertyImpl;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.UnknownPrefixException;
-import org.apache.jackrabbit.core.query.QueryConstants;
-import org.apache.jackrabbit.core.value.LongValue;
-import org.apache.jackrabbit.core.value.PathValue;
-import org.apache.jackrabbit.core.value.StringValue;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
+import org.apache.jackrabbit.value.LongValue;
+import org.apache.jackrabbit.value.PathValue;
+import org.apache.jackrabbit.value.StringValue;
import javax.jcr.ItemNotFoundException;
import javax.jcr.Property;
@@ -215,9 +215,9 @@
}
} else {
// property not set or jcr:path / jcr:score
- if (QueryConstants.JCR_PATH.equals(properties[i])) {
+ if (Constants.JCR_PATH.equals(properties[i])) {
tmp[i] = PathValue.valueOf(node.getPath());
- } else if (QueryConstants.JCR_SCORE.equals(properties[i])) {
+ } else if (Constants.JCR_SCORE.equals(properties[i])) {
tmp[i] = new LongValue((int) (score * 1000f));
} else {
tmp[i] = null;
@@ -265,9 +265,9 @@
}
} else {
// either jcr:score, jcr:path or not set
- if (QueryConstants.JCR_PATH.equals(prop)) {
+ if (Constants.JCR_PATH.equals(prop)) {
return PathValue.valueOf(node.getPath());
- } else if (QueryConstants.JCR_SCORE.equals(prop)) {
+ } else if (Constants.JCR_SCORE.equals(prop)) {
return new LongValue((int) (score * 1000f));
} else {
return null;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java Mon Jul 4 07:52:19 2005
@@ -17,29 +17,29 @@
package org.apache.jackrabbit.core.query.lucene;
import EDU.oswego.cs.dl.util.concurrent.FIFOReadWriteLock;
+import org.apache.jackrabbit.Constants;
+import org.apache.jackrabbit.core.ItemManager;
+import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.fs.FileSystemException;
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;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
import org.apache.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Hits;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.SortField;
import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.SortField;
-import javax.jcr.query.InvalidQueryException;
import javax.jcr.RepositoryException;
+import javax.jcr.query.InvalidQueryException;
import java.io.IOException;
/**
@@ -195,7 +195,7 @@
SortField[] sortFields = new SortField[orderProps.length];
for (int i = 0; i < orderProps.length; i++) {
String prop = null;
- if (QueryConstants.JCR_SCORE.equals(orderProps[i])) {
+ if (Constants.JCR_SCORE.equals(orderProps[i])) {
// order on jcr:score does not use the natural order as
// implemented in lucene. score ascending in lucene means that
// higher scores are first. JCR specs that lower score values
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldCache.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldCache.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldCache.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldCache.java Mon Jul 4 07:52:19 2005
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.search.SortComparator;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.TermEnum;
-import org.apache.lucene.index.Term;
+import org.apache.lucene.search.FieldCache;
+import org.apache.lucene.search.SortComparator;
import java.io.IOException;
+import java.util.HashMap;
import java.util.Map;
import java.util.WeakHashMap;
-import java.util.HashMap;
/**
* Implements a variant of the lucene class <code>org.apache.lucene.search.FieldCacheImpl</code>.
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldSortComparator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldSortComparator.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldSortComparator.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/SharedFieldSortComparator.java Mon Jul 4 07:52:19 2005
@@ -1,11 +1,11 @@
package org.apache.jackrabbit.core.query.lucene;
-import org.apache.lucene.search.SortComparator;
-import org.apache.lucene.search.ScoreDocComparator;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.ScoreDocComparator;
+import org.apache.lucene.search.SortComparator;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.index.IndexReader;
import java.io.IOException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java Mon Jul 4 07:52:19 2005
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.core.query.lucene;
+import org.apache.commons.collections.map.LinkedMap;
+import org.apache.jackrabbit.core.fs.FileSystemException;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
-import org.apache.jackrabbit.core.fs.FileSystemException;
-import org.apache.commons.collections.map.LinkedMap;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.store.RAMDirectory;
import java.io.IOException;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
/**
* Implements an in-memory index with a redo log.
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query.sql;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
public class ASTContainsExpression extends SimpleNode {
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query.sql;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
public class ASTIdentifier extends SimpleNode {
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.query.sql;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
public class ASTPredicate extends SimpleNode {
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java Mon Jul 4 07:52:19 2005
@@ -16,11 +16,7 @@
*/
package org.apache.jackrabbit.core.query.sql;
-import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.UnknownPrefixException;
+import org.apache.jackrabbit.Constants;
import org.apache.jackrabbit.core.query.AndQueryNode;
import org.apache.jackrabbit.core.query.LocationStepQueryNode;
import org.apache.jackrabbit.core.query.NAryQueryNode;
@@ -34,7 +30,11 @@
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.util.ISO8601;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
+import org.apache.jackrabbit.util.ISO8601;
import org.apache.log4j.Logger;
import javax.jcr.query.InvalidQueryException;
@@ -270,7 +270,7 @@
}, data);
QName identifier = tmp[0];
- if (identifier.equals(QueryConstants.JCR_PATH)) {
+ if (identifier.equals(Constants.JCR_PATH)) {
if (tmp[1] != null) {
// simply ignore, this is a join of a mixin node type
} else {
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java Mon Jul 4 07:52:19 2005
@@ -16,10 +16,7 @@
*/
package org.apache.jackrabbit.core.query.sql;
-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.Constants;
import org.apache.jackrabbit.core.query.AndQueryNode;
import org.apache.jackrabbit.core.query.DerefQueryNode;
import org.apache.jackrabbit.core.query.ExactQueryNode;
@@ -35,7 +32,10 @@
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.util.ISO8601;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.util.ISO8601;
import javax.jcr.query.InvalidQueryException;
import java.util.ArrayList;
@@ -284,7 +284,7 @@
try {
if (containsDescendantOrSelf(node)) {
sb.append("(");
- sb.append(QueryConstants.JCR_PATH.toJCRName(resolver));
+ sb.append(Constants.JCR_PATH.toJCRName(resolver));
sb.append(" LIKE '");
LocationStepQueryNode[] steps = node.getPathSteps();
for (int i = 0; i < steps.length; i++) {
@@ -299,7 +299,7 @@
}
sb.append('\'');
sb.append(" OR ");
- sb.append(QueryConstants.JCR_PATH.toJCRName(resolver));
+ sb.append(Constants.JCR_PATH.toJCRName(resolver));
sb.append(" LIKE '");
for (int i = 0; i < steps.length; i++) {
if (steps[i].getNameTest() == null
@@ -312,7 +312,7 @@
}
sb.append("')");
} else if (containsAllChildrenMatch(node)) {
- sb.append(QueryConstants.JCR_PATH.toJCRName(resolver));
+ sb.append(Constants.JCR_PATH.toJCRName(resolver));
sb.append(" LIKE '");
StringBuffer path = new StringBuffer();
LocationStepQueryNode[] steps = node.getPathSteps();
@@ -326,12 +326,12 @@
sb.append(path);
sb.append('\'');
sb.append(" AND NOT ");
- sb.append(QueryConstants.JCR_PATH.toJCRName(resolver));
+ sb.append(Constants.JCR_PATH.toJCRName(resolver));
sb.append(" LIKE '");
sb.append(path).append("/%").append('\'');
} else {
// just do a best effort
- sb.append(QueryConstants.JCR_PATH.toJCRName(resolver));
+ sb.append(Constants.JCR_PATH.toJCRName(resolver));
sb.append(" LIKE '");
LocationStepQueryNode[] steps = node.getPathSteps();
for (int i = 0; i < steps.length; i++) {
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java Mon Jul 4 07:52:19 2005
@@ -16,10 +16,7 @@
*/
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.Constants;
import org.apache.jackrabbit.core.query.AndQueryNode;
import org.apache.jackrabbit.core.query.DerefQueryNode;
import org.apache.jackrabbit.core.query.ExactQueryNode;
@@ -35,8 +32,11 @@
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.util.ISO8601;
import org.apache.jackrabbit.core.util.ISO9075;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.util.ISO8601;
import javax.jcr.query.InvalidQueryException;
import java.util.ArrayList;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java Mon Jul 4 07:52:19 2005
@@ -16,13 +16,8 @@
*/
package org.apache.jackrabbit.core.query.xpath;
-import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.Constants;
import org.apache.jackrabbit.core.SearchManager;
-import org.apache.jackrabbit.core.UnknownPrefixException;
import org.apache.jackrabbit.core.query.AndQueryNode;
import org.apache.jackrabbit.core.query.DerefQueryNode;
import org.apache.jackrabbit.core.query.LocationStepQueryNode;
@@ -37,8 +32,13 @@
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.util.ISO8601;
import org.apache.jackrabbit.core.util.ISO9075;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
+import org.apache.jackrabbit.util.ISO8601;
import javax.jcr.query.InvalidQueryException;
import java.io.StringReader;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/security/AuthContext.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/security/AuthContext.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/security/AuthContext.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/security/AuthContext.java Mon Jul 4 07:52:19 2005
@@ -16,17 +16,16 @@
*/
package org.apache.jackrabbit.core.security;
-import java.util.Collections;
-import java.util.Map;
+import org.apache.jackrabbit.core.config.ConfigurationException;
+import org.apache.jackrabbit.core.config.LoginModuleConfig;
import javax.jcr.Credentials;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-
-import org.apache.jackrabbit.core.config.ConfigurationException;
-import org.apache.jackrabbit.core.config.LoginModuleConfig;
+import java.util.Collections;
+import java.util.Map;
/**
* An authentication context used to authenticate users. It is similar to JAAS' <code>LoginContext</code>
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.security;
-import org.apache.jackrabbit.core.Constants;
+import org.apache.jackrabbit.Constants;
import org.apache.log4j.Logger;
import javax.jcr.Credentials;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemState.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemState.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemState.java Mon Jul 4 07:52:19 2005
@@ -33,7 +33,8 @@
*/
public abstract class ItemState implements ItemStateListener, Serializable {
- static final long serialVersionUID = -6632715936921139872L;
+ /** Serialization UID of this class. */
+ static final long serialVersionUID = -337199573967324199L;
private static Logger log = Logger.getLogger(ItemState.class);
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemStateCache.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemStateCache.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemStateCache.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemStateCache.java Mon Jul 4 07:52:19 2005
@@ -20,11 +20,11 @@
import org.apache.jackrabbit.core.ItemId;
import org.apache.log4j.Logger;
+import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import java.io.PrintStream;
/**
* An <code>ItemStateCache</code> maintains a cache of <code>ItemState</code>
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemStateException.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemStateException.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemStateException.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/ItemStateException.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.state;
-import org.apache.jackrabbit.core.BaseException;
+import org.apache.jackrabbit.BaseException;
/**
* The <code>ItemStateException</code> ...
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java Mon Jul 4 07:52:19 2005
@@ -19,9 +19,9 @@
import org.apache.jackrabbit.core.ItemId;
import org.apache.jackrabbit.core.NodeId;
import org.apache.jackrabbit.core.PropertyId;
-import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.WorkspaceImpl;
import org.apache.jackrabbit.core.observation.ObservationManagerImpl;
+import org.apache.jackrabbit.name.QName;
import org.apache.log4j.Logger;
import javax.jcr.RepositoryException;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/NodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/NodeState.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/NodeState.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/NodeState.java Mon Jul 4 07:52:19 2005
@@ -20,8 +20,8 @@
import org.apache.commons.collections.map.LinkedMap;
import org.apache.commons.collections.map.ReferenceMap;
import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.nodetype.NodeDefId;
+import org.apache.jackrabbit.name.QName;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -44,7 +44,7 @@
public class NodeState extends ItemState {
/** Serialization UID of this class. */
- static final long serialVersionUID = -1755253053645185279L;
+ static final long serialVersionUID = -764076390011517389L;
/** the uuid of this node */
protected String uuid;
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/NodeStateListener.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/NodeStateListener.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/NodeStateListener.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/NodeStateListener.java Mon Jul 4 07:52:19 2005
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.state;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
/**
* Extends the <code>ItemStateListener</code> allowing a client to be
Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/PMContext.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/PMContext.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/PMContext.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/state/PMContext.java Mon Jul 4 07:52:19 2005
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.core.state;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import org.apache.jackrabbit.core.fs.FileSystem;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import javax.jcr.NamespaceRegistry;
import java.io.File;