jackrabbit-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	ju...@apache.org
Subject	svn commit: r605147 [2/5] - in /jackrabbit/trunk: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/ jackrabbit-c...
Date	Tue, 18 Dec 2007 09:08:57 GMT
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java Tue Dec 18 01:08:39 2007 @@ -27,10 +27,10 @@ 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.conversion.NameException; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.DefaultNamePathResolver; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.value.ValueHelper; import org.apache.jackrabbit.value.ValueFactoryImpl; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java Tue Dec 18 01:08:39 2007 @@ -22,9 +22,9 @@ 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.namespace.NamespaceResolver; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; import org.apache.jackrabbit.spi.Name; import javax.jcr.NamespaceRegistry; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java Tue Dec 18 01:08:39 2007 @@ -29,7 +29,7 @@ import org.apache.jackrabbit.core.state.NodeReferences; import org.apache.jackrabbit.core.state.NodeReferencesId; import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; import javax.jcr.ItemNotFoundException; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java Tue Dec 18 01:08:39 2007 @@ -23,7 +23,7 @@ import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.nodetype.NodeTypeImpl; -import org.apache.jackrabbit.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; import org.apache.jackrabbit.spi.Path; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventImpl.java Tue Dec 18 01:08:39 2007 @@ -18,9 +18,9 @@ import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.SessionImpl; -import org.apache.jackrabbit.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.name.PathFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java Tue Dec 18 01:08:39 2007 @@ -29,8 +29,8 @@ import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.PathFactoryImpl; -import org.apache.jackrabbit.name.PathBuilder; +import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.PathBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java Tue Dec 18 01:08:39 2007 @@ -21,7 +21,7 @@ import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.nodetype.NodeTypeImpl; import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl; -import org.apache.jackrabbit.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NameException; import org.apache.jackrabbit.spi.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java Tue Dec 18 01:08:39 2007 @@ -44,7 +44,7 @@ import org.apache.jackrabbit.core.persistence.bundle.util.HashMapIndex; import org.apache.jackrabbit.core.persistence.bundle.util.BundleBinding; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import java.util.HashMap; import java.util.HashSet; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java Tue Dec 18 01:08:39 2007 @@ -29,7 +29,7 @@ import org.apache.jackrabbit.core.nodetype.PropDefId; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import java.io.DataInputStream; import java.io.DataOutputStream; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ItemStateBinding.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ItemStateBinding.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ItemStateBinding.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ItemStateBinding.java Tue Dec 18 01:08:39 2007 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.core.nodetype.NodeDefId; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import java.io.DataInputStream; import java.io.DataOutputStream; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NodePropBundle.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NodePropBundle.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NodePropBundle.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NodePropBundle.java Tue Dec 18 01:08:39 2007 @@ -35,7 +35,7 @@ import org.apache.jackrabbit.core.nodetype.NodeDefId; import org.apache.jackrabbit.core.nodetype.PropDefId; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/Serializer.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/Serializer.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/Serializer.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/Serializer.java Tue Dec 18 01:08:39 2007 @@ -28,7 +28,7 @@ import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import javax.jcr.PropertyType; import java.io.DataInputStream; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/xml/XMLPersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/xml/XMLPersistenceManager.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/xml/XMLPersistenceManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/xml/XMLPersistenceManager.java Tue Dec 18 01:08:39 2007 @@ -42,7 +42,7 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.NameFactory; import org.apache.jackrabbit.util.Text; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/LocationStepQueryNode.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/LocationStepQueryNode.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/LocationStepQueryNode.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/LocationStepQueryNode.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.apache.jackrabbit.spi.Name; /* Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NodeTypeQueryNode.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NodeTypeQueryNode.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NodeTypeQueryNode.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NodeTypeQueryNode.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.Name; /* Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import java.util.List; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.Name; / Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java Tue Dec 18 01:08:39 2007 @@ -20,8 +20,8 @@ import org.apache.jackrabbit.core.query.qom.QueryObjectModelTree; import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.ItemManager; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.Value; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import org.apache.jackrabbit.core.ItemManager; import org.apache.jackrabbit.core.SessionImpl; -import org.apache.jackrabbit.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NameException; import org.apache.jackrabbit.spi.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ import javax.jcr.query.InvalidQueryException; import javax.jcr.query.QueryResult; import org.apache.jackrabbit.core.query.qom.QueryObjectModelTree; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.version.VersionException; import java.text.NumberFormat; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryParser.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryParser.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryParser.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryParser.java Tue Dec 18 01:08:39 2007 @@ -19,7 +19,7 @@ import javax.jcr.query.InvalidQueryException; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; / * This class acts as the central entry point for parsing query statements from Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import javax.jcr.query.InvalidQueryException; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; /** * Specifies an interface for a query tree builder. Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/RelationQueryNode.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/RelationQueryNode.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/RelationQueryNode.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/RelationQueryNode.java Tue Dec 18 01:08:39 2007 @@ -20,9 +20,9 @@ import javax.jcr.RepositoryException; -import org.apache.jackrabbit.conversion.MalformedPathException; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.name.PathBuilder; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.PathBuilder; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/TextsearchQueryNode.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/TextsearchQueryNode.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/TextsearchQueryNode.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/TextsearchQueryNode.java Tue Dec 18 01:08:39 2007 @@ -16,8 +16,8 @@ / package org.apache.jackrabbit.core.query; -import org.apache.jackrabbit.conversion.MalformedPathException; -import org.apache.jackrabbit.name.PathBuilder; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.name.PathBuilder; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java Tue Dec 18 01:08:39 2007 @@ -18,11 +18,11 @@ import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.name.PathBuilder; -import org.apache.jackrabbit.conversion.IllegalNameException; -import org.apache.jackrabbit.conversion.MalformedPathException; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.PathBuilder; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.ItemStateManager; import org.apache.jackrabbit.core.state.ItemStateException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.apache.lucene.search.Query; import java.io.IOException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FileBasedNamespaceMappings.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FileBasedNamespaceMappings.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FileBasedNamespaceMappings.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FileBasedNamespaceMappings.java Tue Dec 18 01:08:39 2007 @@ -16,9 +16,9 @@ / package org.apache.jackrabbit.core.query.lucene; -import org.apache.jackrabbit.conversion.IllegalNameException; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.namespace.AbstractNamespaceResolver; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.namespace.AbstractNamespaceResolver; import org.apache.jackrabbit.spi.Name; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java Tue Dec 18 01:08:39 2007 @@ -16,12 +16,12 @@ / package org.apache.jackrabbit.core.query.lucene; -import org.apache.jackrabbit.conversion.IllegalNameException; -import org.apache.jackrabbit.conversion.MalformedPathException; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.conversion.ParsingNameResolver; -import org.apache.jackrabbit.conversion.PathResolver; -import org.apache.jackrabbit.conversion.ParsingPathResolver; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.ParsingNameResolver; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.conversion.ParsingPathResolver; import org.apache.jackrabbit.core.state.ItemStateManager; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.ItemStateException; @@ -33,11 +33,11 @@ import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry; import org.apache.jackrabbit.core.query.QueryHandlerContext; import org.apache.jackrabbit.core.value.InternalValue; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.name.PathFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.util.ISO9075; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.apache.lucene.analysis.Analyzer; import org.apache.commons.collections.iterators.AbstractIteratorDecorator; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java Tue Dec 18 01:08:39 2007 @@ -59,8 +59,8 @@ import org.apache.jackrabbit.core.state.ItemStateManager; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.search.Query; import org.apache.lucene.search.BooleanQuery; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java Tue Dec 18 01:08:39 2007 @@ -46,11 +46,11 @@ import org.apache.jackrabbit.core.state.ItemStateManager; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.name.PathBuilder; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.PathBuilder; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; import org.apache.jackrabbit.util.ISO8601; import org.apache.jackrabbit.util.XMLChar; import org.apache.jackrabbit.util.ISO9075; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NSRegistryBasedNamespaceMappings.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NSRegistryBasedNamespaceMappings.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NSRegistryBasedNamespaceMappings.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NSRegistryBasedNamespaceMappings.java Tue Dec 18 01:08:39 2007 @@ -16,10 +16,10 @@ / package org.apache.jackrabbit.core.query.lucene; -import org.apache.jackrabbit.conversion.IllegalNameException; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import org.apache.jackrabbit.core.NamespaceRegistryImpl; -import org.apache.jackrabbit.namespace.AbstractNamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.AbstractNamespaceResolver; import org.apache.jackrabbit.spi.Name; import javax.jcr.NamespaceException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java Tue Dec 18 01:08:39 2007 @@ -21,16 +21,16 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.NameFactory; import org.apache.jackrabbit.spi.PathFactory; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.conversion.IllegalNameException; -import org.apache.jackrabbit.conversion.NameParser; -import org.apache.jackrabbit.conversion.DefaultNamePathResolver; -import org.apache.jackrabbit.conversion.ParsingPathResolver; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.PathResolver; -import org.apache.jackrabbit.namespace.NamespaceResolver; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.name.PathFactoryImpl; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.conversion.NameParser; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.ParsingPathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; import javax.jcr.NamespaceException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java Tue Dec 18 01:08:39 2007 @@ -16,8 +16,8 @@ / package org.apache.jackrabbit.core.query.lucene; -import org.apache.jackrabbit.conversion.IllegalNameException; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.apache.jackrabbit.spi.Name; /* Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java Tue Dec 18 01:08:39 2007 @@ -26,10 +26,10 @@ import org.apache.jackrabbit.core.value.BLOBFileValue; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.extractor.TextExtractor; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.uuid.UUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java Tue Dec 18 01:08:39 2007 @@ -32,7 +32,7 @@ import org.apache.jackrabbit.core.query.AndQueryNode; import org.apache.jackrabbit.core.query.QueryNodeFactory; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.lucene.search.Query; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java Tue Dec 18 01:08:39 2007 @@ -21,7 +21,7 @@ import org.apache.jackrabbit.core.NodeImpl; import org.apache.jackrabbit.core.security.AccessManager; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.lucene.search.Query; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java Tue Dec 18 01:08:39 2007 @@ -19,11 +19,11 @@ import org.apache.jackrabbit.core.NodeImpl; import org.apache.jackrabbit.core.PropertyImpl; import org.apache.jackrabbit.core.NodeId; -import org.apache.jackrabbit.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NameException; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.value.ValueFactoryImpl; import org.apache.jackrabbit.util.ISO9075; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java Tue Dec 18 01:08:39 2007 @@ -32,9 +32,9 @@ import org.apache.jackrabbit.core.state.ItemStateManager; import org.apache.jackrabbit.extractor.DefaultTextExtractor; import org.apache.jackrabbit.extractor.TextExtractor; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.uuid.UUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java Tue Dec 18 01:08:39 2007 @@ -19,7 +19,7 @@ import org.apache.commons.collections.iterators.IteratorChain; import org.apache.jackrabbit.core.NodeImpl; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import javax.jcr.query.QueryResult; import javax.jcr.query.RowIterator; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AbstractQOMNode.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AbstractQOMNode.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AbstractQOMNode.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AbstractQOMNode.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AndImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AndImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AndImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AndImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.And; import org.apache.jackrabbit.core.query.jsr283.qom.Constraint; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/BindVariableValueImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/BindVariableValueImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/BindVariableValueImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/BindVariableValueImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.query.jsr283.qom.BindVariableValue; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeImpl.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.ChildNode; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeJoinConditionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeJoinConditionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeJoinConditionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeJoinConditionImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.query.jsr283.qom.ChildNodeJoinCondition; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ColumnImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ColumnImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ColumnImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ColumnImpl.java Tue Dec 18 01:08:39 2007 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.core.query.qom; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.Column; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ComparisonImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ComparisonImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ComparisonImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ComparisonImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.Comparison; import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ConstraintImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ConstraintImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ConstraintImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ConstraintImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.Constraint; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeJoinConditionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeJoinConditionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeJoinConditionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeJoinConditionImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.query.jsr283.qom.DescendantNodeJoinCondition; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DynamicOperandImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DynamicOperandImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DynamicOperandImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DynamicOperandImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/EquiJoinConditionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/EquiJoinConditionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/EquiJoinConditionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/EquiJoinConditionImpl.java Tue Dec 18 01:08:39 2007 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.core.query.qom; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.EquiJoinCondition; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchImpl.java Tue Dec 18 01:08:39 2007 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.core.query.qom; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.FullTextSearch; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchScoreImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchScoreImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchScoreImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchScoreImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.query.jsr283.qom.FullTextSearchScore; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinConditionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinConditionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinConditionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinConditionImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.JoinCondition; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.Join; import org.apache.jackrabbit.core.query.jsr283.qom.Source; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LengthImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LengthImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LengthImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LengthImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.Length; import org.apache.jackrabbit.core.query.jsr283.qom.PropertyValue; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LiteralImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LiteralImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LiteralImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LiteralImpl.java Tue Dec 18 01:08:39 2007 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.core.query.qom; import org.apache.jackrabbit.core.query.jsr283.qom.Literal; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import javax.jcr.Value; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LowerCaseImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LowerCaseImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LowerCaseImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LowerCaseImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.LowerCase; import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeLocalNameImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeLocalNameImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeLocalNameImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeLocalNameImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.query.jsr283.qom.NodeLocalName; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeNameImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeNameImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeNameImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeNameImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.query.jsr283.qom.NodeName; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NotImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NotImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NotImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NotImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.Not; import org.apache.jackrabbit.core.query.jsr283.qom.Constraint; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.Or; import org.apache.jackrabbit.core.query.jsr283.qom.Constraint; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrderingImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrderingImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrderingImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrderingImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.Ordering; import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyExistenceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyExistenceImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyExistenceImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyExistenceImpl.java Tue Dec 18 01:08:39 2007 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.core.query.qom; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.PropertyExistence; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyValueImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyValueImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyValueImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyValueImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.query.jsr283.qom.PropertyValue; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryImpl.java Tue Dec 18 01:08:39 2007 @@ -16,9 +16,9 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NameException; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelTree.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelTree.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelTree.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelTree.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import javax.jcr.query.InvalidQueryException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeImpl.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.SameNode; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeJoinConditionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeJoinConditionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeJoinConditionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeJoinConditionImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SelectorImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SelectorImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SelectorImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SelectorImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.query.jsr283.qom.Selector; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SourceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SourceImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SourceImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SourceImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.Source; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/StaticOperandImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/StaticOperandImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/StaticOperandImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/StaticOperandImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.StaticOperand; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/UpperCaseImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/UpperCaseImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/UpperCaseImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/UpperCaseImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.query.qom; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.core.query.jsr283.qom.UpperCase; import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java Tue Dec 18 01:08:39 2007 @@ -31,14 +31,14 @@ import org.apache.jackrabbit.core.query.TextsearchQueryNode; import org.apache.jackrabbit.core.query.PropertyFunctionQueryNode; import org.apache.jackrabbit.core.query.QueryNodeFactory; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.name.PathBuilder; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.PathBuilder; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.conversion.MalformedPathException; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import org.apache.jackrabbit.util.ISO8601; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryBuilder.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryBuilder.java Tue Dec 18 01:08:39 2007 @@ -19,7 +19,7 @@ import org.apache.jackrabbit.core.query.QueryTreeBuilder; import org.apache.jackrabbit.core.query.QueryRootNode; import org.apache.jackrabbit.core.query.QueryNodeFactory; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import javax.jcr.query.InvalidQueryException; import javax.jcr.query.Query; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java Tue Dec 18 01:08:39 2007 @@ -32,11 +32,11 @@ import org.apache.jackrabbit.core.query.RelationQueryNode; import org.apache.jackrabbit.core.query.TextsearchQueryNode; import org.apache.jackrabbit.core.query.PropertyFunctionQueryNode; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.util.ISO8601; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import javax.jcr.query.InvalidQueryException; import javax.jcr.NamespaceException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryBuilder.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryBuilder.java Tue Dec 18 01:08:39 2007 @@ -19,7 +19,7 @@ import org.apache.jackrabbit.core.query.QueryTreeBuilder; import org.apache.jackrabbit.core.query.QueryRootNode; import org.apache.jackrabbit.core.query.QueryNodeFactory; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import javax.jcr.query.InvalidQueryException; import javax.jcr.query.Query; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java Tue Dec 18 01:08:39 2007 @@ -37,8 +37,8 @@ import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.util.ISO8601; import org.apache.jackrabbit.util.ISO9075; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import javax.jcr.query.InvalidQueryException; import javax.jcr.NamespaceException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java Tue Dec 18 01:08:39 2007 @@ -16,9 +16,9 @@ / package org.apache.jackrabbit.core.query.xpath; -import org.apache.jackrabbit.conversion.IllegalNameException; -import org.apache.jackrabbit.conversion.MalformedPathException; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import org.apache.jackrabbit.core.query.DerefQueryNode; import org.apache.jackrabbit.core.query.LocationStepQueryNode; import org.apache.jackrabbit.core.query.NAryQueryNode; @@ -34,11 +34,11 @@ import org.apache.jackrabbit.core.query.PropertyFunctionQueryNode; import org.apache.jackrabbit.core.query.DefaultQueryNodeVisitor; import org.apache.jackrabbit.core.query.QueryNodeFactory; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.name.PathBuilder; -import org.apache.jackrabbit.name.PathFactoryImpl; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.PathBuilder; +import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.NameFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AMContext.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AMContext.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AMContext.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AMContext.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.fs.FileSystem; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import javax.security.auth.Subject; import java.io.File; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java Tue Dec 18 01:08:39 2007 @@ -23,7 +23,7 @@ import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.nodetype.NodeDefId; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import java.io.IOException; import java.io.ObjectInputStream; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java Tue Dec 18 01:08:39 2007 @@ -24,7 +24,7 @@ import org.apache.jackrabbit.core.PropertyId; import org.apache.jackrabbit.core.ZombieHierarchyManager; import org.apache.jackrabbit.core.util.Dumpable; -import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; import org.apache.jackrabbit.spi.Name; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Tue Dec 18 01:08:39 2007 @@ -35,7 +35,7 @@ import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java Tue Dec 18 01:08:39 2007 @@ -18,9 +18,9 @@ import org.apache.jackrabbit.core.data.DataStore; import org.apache.jackrabbit.core.fs.FileSystemResource; -import org.apache.jackrabbit.conversion.MalformedPathException; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.util.ISO8601; @@ -34,8 +34,8 @@ import org.apache.jackrabbit.value.PathValue; import org.apache.jackrabbit.value.ReferenceValue; import org.apache.jackrabbit.value.StringValue; -import org.apache.jackrabbit.name.PathFactoryImpl; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import javax.jcr.PropertyType; import javax.jcr.RepositoryException;
Mime	Unnamed text/plain (inline, 7-Bit, 89572 bytes)
	View raw message