jackrabbit-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	ju...@apache.org
Subject	svn commit: r605147 [3/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/version/AbstractVersionManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java Tue Dec 18 01:08:39 2007 @@ -26,8 +26,8 @@ import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +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/version/InternalFrozenNodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java Tue Dec 18 01:08:39 2007 @@ -26,7 +26,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.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.NodeIterator; import javax.jcr.PropertyIterator; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.NodeId; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.RepositoryException; import javax.jcr.version.VersionException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Tue Dec 18 01:08:39 2007 @@ -25,7 +25,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.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/version/InternalVersionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java Tue Dec 18 01:08:39 2007 @@ -20,7 +20,7 @@ import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java Tue Dec 18 01:08:39 2007 @@ -32,7 +32,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.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import java.util.HashSet; import java.util.Iterator; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java Tue Dec 18 01:08:39 2007 @@ -22,7 +22,7 @@ import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.NodeImpl; import org.apache.jackrabbit.core.state.NodeState; -import org.apache.jackrabbit.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NameException; 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/version/VersionManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java Tue Dec 18 01:08:39 2007 @@ -44,9 +44,9 @@ import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider; 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.MalformedPathException; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.PathBuilder; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java Tue Dec 18 01:08:39 2007 @@ -40,7 +40,7 @@ import org.apache.jackrabbit.core.virtual.VirtualNodeState; import org.apache.jackrabbit.core.virtual.VirtualPropertyState; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.RepositoryException; import javax.jcr.Session; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java Tue Dec 18 01:08:39 2007 @@ -36,7 +36,7 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; import org.apache.jackrabbit.util.WeakIdentityCollection; -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/virtual/VirtualNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualNodeState.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualNodeState.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualNodeState.java Tue Dec 18 01:08:39 2007 @@ -22,7 +22,7 @@ import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/AbstractSAXEventGenerator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/AbstractSAXEventGenerator.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/AbstractSAXEventGenerator.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/AbstractSAXEventGenerator.java Tue Dec 18 01:08:39 2007 @@ -22,12 +22,12 @@ import java.util.SortedMap; import java.util.TreeMap; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.namespace.SessionNamespaceResolver; -import org.apache.jackrabbit.namespace.NamespaceResolver; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.namespace.SessionNamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.ContentHandler; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java Tue Dec 18 01:08:39 2007 @@ -21,7 +21,7 @@ import org.apache.jackrabbit.util.TransientFileFactory; import org.apache.jackrabbit.value.ValueHelper; import org.apache.jackrabbit.value.ValueFactoryImpl; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java Tue Dec 18 01:08:39 2007 @@ -17,11 +17,11 @@ package org.apache.jackrabbit.core.xml; import org.apache.jackrabbit.core.NodeId; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.conversion.NameParser; -import org.apache.jackrabbit.conversion.IllegalNameException; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NameParser; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.util.ISO9075; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.xml; -import org.apache.jackrabbit.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NameException; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.util.ISO9075; import org.apache.jackrabbit.value.ValueHelper; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ImportHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ImportHandler.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ImportHandler.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ImportHandler.java Tue Dec 18 01:08:39 2007 @@ -22,7 +22,7 @@ import javax.jcr.RepositoryException; import org.apache.jackrabbit.core.NamespaceRegistryImpl; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; 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/xml/NamespaceContext.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/NamespaceContext.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/NamespaceContext.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/NamespaceContext.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.core.xml; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import javax.jcr.NamespaceException; import java.util.HashMap; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java Tue Dec 18 01:08:39 2007 @@ -34,7 +34,7 @@ import org.apache.jackrabbit.core.util.ReferenceChangeTracker; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java Tue Dec 18 01:08:39 2007 @@ -23,8 +23,8 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.value.ReferenceValue; import org.apache.jackrabbit.uuid.UUID; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +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/xml/StringValue.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java Tue Dec 18 01:08:39 2007 @@ -20,7 +20,7 @@ import org.apache.jackrabbit.util.Base64; import org.apache.jackrabbit.value.ValueHelper; import org.apache.jackrabbit.value.ValueFactoryImpl; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java Tue Dec 18 01:08:39 2007 @@ -16,10 +16,10 @@ / package org.apache.jackrabbit.core.xml; -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.NameFactoryImpl; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.core.NodeId; import org.xml.sax.Attributes; import org.xml.sax.SAXException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewSAXEventGenerator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewSAXEventGenerator.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewSAXEventGenerator.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewSAXEventGenerator.java Tue Dec 18 01:08:39 2007 @@ -16,12 +16,12 @@ / package org.apache.jackrabbit.core.xml; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.conversion.ParsingNameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.ParsingNameResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.value.ValueHelper; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java Tue Dec 18 01:08:39 2007 @@ -18,8 +18,8 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; import java.util.Map; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TextValue.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TextValue.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TextValue.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TextValue.java Tue Dec 18 01:08:39 2007 @@ -21,7 +21,7 @@ import javax.jcr.ValueFormatException; import org.apache.jackrabbit.core.value.InternalValue; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; /** * <code>TextValue</code> represents a serialized property value read Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java Tue Dec 18 01:08:39 2007 @@ -32,12 +32,12 @@ import org.apache.jackrabbit.core.util.ReferenceChangeTracker; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.core.version.VersionManager; -import org.apache.jackrabbit.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/javacc/sql/JCRSQL.jjt URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/javacc/sql/JCRSQL.jjt?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/javacc/sql/JCRSQL.jjt (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/javacc/sql/JCRSQL.jjt Tue Dec 18 01:08:39 2007 @@ -41,10 +41,10 @@ / package org.apache.jackrabbit.core.query.sql; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import org.apache.jackrabbit.core.query.QueryConstants; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.apache.jackrabbit.spi.Name; import javax.jcr.NamespaceException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java Tue Dec 18 01:08:39 2007 @@ -16,8 +16,8 @@ / package org.apache.jackrabbit.core.nodetype; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.spi.NameFactory; import org.apache.jackrabbit.spi.Name; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java Tue Dec 18 01:08:39 2007 @@ -25,12 +25,12 @@ import org.apache.jackrabbit.core.nodetype.PropDefImpl; import org.apache.jackrabbit.core.nodetype.ValueConstraint; import org.apache.jackrabbit.core.value.InternalValue; -import org.apache.jackrabbit.name.NameFactoryImpl; -import org.apache.jackrabbit.namespace.NamespaceMapping; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceMapping; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.NameFactory; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; import javax.jcr.PropertyType; import javax.jcr.version.OnParentVersionAction; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java Tue Dec 18 01:08:39 2007 @@ -26,12 +26,12 @@ import org.apache.jackrabbit.core.nodetype.NodeTypeDef; import org.apache.jackrabbit.core.nodetype.PropDef; import org.apache.jackrabbit.core.value.InternalValue; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.NameFactory; -import org.apache.jackrabbit.conversion.DefaultNamePathResolver; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import javax.jcr.NamespaceException; import javax.jcr.NamespaceRegistry; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/PathQueryNodeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/PathQueryNodeTest.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/PathQueryNodeTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/PathQueryNodeTest.java Tue Dec 18 01:08:39 2007 @@ -21,11 +21,11 @@ import junit.framework.TestCase; import org.apache.jackrabbit.core.query.xpath.XPathQueryBuilder; -import org.apache.jackrabbit.namespace.NamespaceResolver; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; public class PathQueryNodeTest extends TestCase { Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/ChangeLogTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/ChangeLogTest.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/ChangeLogTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/ChangeLogTest.java Tue Dec 18 01:08:39 2007 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.core.state; import org.apache.jackrabbit.test.AbstractJCRTest; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.apache.jackrabbit.core.PropertyId; import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.uuid.UUID; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java Tue Dec 18 01:08:39 2007 @@ -29,7 +29,7 @@ import org.apache.jackrabbit.jcr2spi.version.VersionImpl; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.commons.collections.map.ReferenceMap; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.jcr2spi; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyManager; import org.apache.jackrabbit.jcr2spi.security.AccessManager; import org.apache.jackrabbit.jcr2spi.lock.LockManager; @@ -24,7 +24,7 @@ import org.apache.jackrabbit.jcr2spi.nodetype.ItemDefinitionProvider; import org.apache.jackrabbit.jcr2spi.nodetype.EffectiveNodeTypeProvider; import org.apache.jackrabbit.spi.QValueFactory; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import javax.jcr.ValueFactory; import javax.jcr.RepositoryException; @@ -34,11 +34,11 @@ / public interface ManagerProvider { - public org.apache.jackrabbit.conversion.NamePathResolver getNamePathResolver(); + public org.apache.jackrabbit.spi.commons.conversion.NamePathResolver getNamePathResolver(); public NameResolver getNameResolver(); - public org.apache.jackrabbit.conversion.PathResolver getPathResolver(); + public org.apache.jackrabbit.spi.commons.conversion.PathResolver getPathResolver(); public NamespaceResolver getNamespaceResolver(); Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java Tue Dec 18 01:08:39 2007 @@ -18,10 +18,10 @@ import org.apache.jackrabbit.util.ChildrenCollectorFilter; import org.apache.jackrabbit.value.ValueHelper; -import org.apache.jackrabbit.value.ValueFormat; +import org.apache.jackrabbit.spi.commons.value.ValueFormat; import org.apache.jackrabbit.commons.iterator.NodeIteratorAdapter; import org.apache.jackrabbit.commons.iterator.PropertyIteratorAdapter; -import org.apache.jackrabbit.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NameException; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.jcr2spi.state.NodeState; @@ -30,7 +30,7 @@ import org.apache.jackrabbit.jcr2spi.state.Status; import org.apache.jackrabbit.jcr2spi.nodetype.NodeTypeManagerImpl; import org.apache.jackrabbit.jcr2spi.nodetype.EffectiveNodeType; -import org.apache.jackrabbit.nodetype.NodeTypeConflictException; +import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeConflictException; import org.apache.jackrabbit.jcr2spi.nodetype.NodeTypeImpl; import org.apache.jackrabbit.jcr2spi.operation.SetMixin; import org.apache.jackrabbit.jcr2spi.operation.AddProperty; @@ -47,7 +47,7 @@ import org.apache.jackrabbit.spi.QPropertyDefinition; import org.apache.jackrabbit.spi.QNodeDefinition; import org.apache.jackrabbit.spi.QValue; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1572,7 +1572,7 @@ } } catch (PathNotFoundException e) { // item does not exist -> ignore and return null - } catch (org.apache.jackrabbit.conversion.NameException e) { + } catch (org.apache.jackrabbit.spi.commons.conversion.NameException e) { String msg = "Invalid relative path: " + relPath; log.debug(msg); throw new RepositoryException(msg, e); @@ -1615,7 +1615,7 @@ // ignore -> return null; } } - } catch (org.apache.jackrabbit.conversion.NameException e) { + } catch (org.apache.jackrabbit.spi.commons.conversion.NameException e) { String msg = "failed to resolve property path " + relPath + " relative to " + safeGetJCRPath(); log.debug(msg); throw new RepositoryException(msg, e); Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java Tue Dec 18 01:08:39 2007 @@ -20,12 +20,12 @@ import org.apache.jackrabbit.jcr2spi.operation.SetPropertyValue; import org.apache.jackrabbit.jcr2spi.operation.Operation; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.QValue; import org.apache.jackrabbit.spi.QPropertyDefinition; -import org.apache.jackrabbit.value.ValueFormat; +import org.apache.jackrabbit.spi.commons.value.ValueFormat; import org.apache.jackrabbit.value.ValueHelper; -import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java Tue Dec 18 01:08:39 2007 @@ -41,9 +41,9 @@ import org.apache.jackrabbit.jcr2spi.name.LocalNamespaceMappings; import org.apache.jackrabbit.jcr2spi.config.RepositoryConfig; import org.apache.jackrabbit.jcr2spi.config.CacheBehaviour; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.SessionInfo; import org.apache.jackrabbit.spi.NodeId; import org.apache.jackrabbit.spi.IdFactory; @@ -51,12 +51,12 @@ import org.apache.jackrabbit.spi.QValueFactory; import org.apache.jackrabbit.spi.NameFactory; import org.apache.jackrabbit.spi.PathFactory; -import org.apache.jackrabbit.value.ValueFactoryQImpl; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.conversion.PathResolver; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.conversion.DefaultNamePathResolver; +import org.apache.jackrabbit.spi.commons.value.ValueFactoryQImpl; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; import org.apache.commons.collections.map.ReferenceMap; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java Tue Dec 18 01:08:39 2007 @@ -48,10 +48,10 @@ import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.NameFactory; import org.apache.jackrabbit.spi.PathFactory; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.conversion.PathResolver; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.slf4j.LoggerFactory; import org.slf4j.Logger; import org.xml.sax.ContentHandler; @@ -359,7 +359,7 @@ /** * @see ManagerProvider#getNamePathResolver() / - public org.apache.jackrabbit.conversion.NamePathResolver getNamePathResolver() { + public org.apache.jackrabbit.spi.commons.conversion.NamePathResolver getNamePathResolver() { return session.getNamePathResolver(); } Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java Tue Dec 18 01:08:39 2007 @@ -33,8 +33,8 @@ import org.apache.jackrabbit.jcr2spi.state.PropertyState; import org.apache.jackrabbit.jcr2spi.state.ItemStateLifeCycleListener; import org.apache.jackrabbit.jcr2spi.util.StateUtility; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.name.PathBuilder; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.PathBuilder; import org.apache.jackrabbit.commons.iterator.RangeIteratorAdapter; import org.apache.commons.collections.iterators.IteratorChain; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java Tue Dec 18 01:08:39 2007 @@ -33,7 +33,7 @@ import org.apache.jackrabbit.jcr2spi.state.PropertyState; import org.apache.jackrabbit.spi.LockInfo; import org.apache.jackrabbit.spi.NodeId; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/LocalNamespaceMappings.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/LocalNamespaceMappings.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/LocalNamespaceMappings.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/LocalNamespaceMappings.java Tue Dec 18 01:08:39 2007 @@ -19,8 +19,8 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.jcr2spi.SessionImpl; import org.apache.jackrabbit.util.XMLChar; -import org.apache.jackrabbit.namespace.AbstractNamespaceResolver; -import org.apache.jackrabbit.namespace.NamespaceListener; +import org.apache.jackrabbit.spi.commons.namespace.AbstractNamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceListener; import javax.jcr.NamespaceException; import javax.jcr.RepositoryException; @@ -40,7 +40,7 @@ instance) and keeps track of local namespace mappings added by the session. * <p> * The namespace resolution methods required by the - * {@link org.apache.jackrabbit.namespace.NamespaceResolver NamespaceResolver} are implemented by first + * {@link org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver NamespaceResolver} are implemented by first * looking up the local namespace mapping and then backing to the * underlying namespace registry. / Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/NamespaceCache.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/NamespaceCache.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/NamespaceCache.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/NamespaceCache.java Tue Dec 18 01:08:39 2007 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.jcr2spi.name; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.namespace.NamespaceListener; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceListener; import org.apache.jackrabbit.util.XMLChar; import org.apache.jackrabbit.spi.RepositoryService; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryImpl.java Tue Dec 18 01:08:39 2007 @@ -16,8 +16,8 @@ / package org.apache.jackrabbit.jcr2spi.name; -import org.apache.jackrabbit.namespace.AbstractNamespaceResolver; -import org.apache.jackrabbit.namespace.NamespaceListener; +import org.apache.jackrabbit.spi.commons.namespace.AbstractNamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,7 +84,7 @@ /** * @see javax.jcr.NamespaceRegistry#getURI(String) - * @see org.apache.jackrabbit.namespace.NamespaceResolver#getURI(String) + * @see org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver#getURI(String) / public String getURI(String prefix) throws NamespaceException { // try to load the uri @@ -98,7 +98,7 @@ /* * @see javax.jcr.NamespaceRegistry#getPrefix(String) - * @see org.apache.jackrabbit.namespace.NamespaceResolver#getPrefix(String) + * @see org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver#getPrefix(String) / public String getPrefix(String uri) throws NamespaceException { // try to load the prefix Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java Tue Dec 18 01:08:39 2007 @@ -21,10 +21,10 @@ import org.apache.jackrabbit.spi.QNodeDefinition; import org.apache.jackrabbit.spi.QPropertyDefinition; import org.apache.jackrabbit.spi.QValue; -import org.apache.jackrabbit.nodetype.InvalidNodeTypeDefException; -import org.apache.jackrabbit.nodetype.NodeTypeConflictException; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.nodetype.InvalidNodeTypeDefException; +import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeConflictException; +import org.apache.jackrabbit.spi.commons.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java Tue Dec 18 01:08:39 2007 @@ -21,7 +21,7 @@ import org.apache.jackrabbit.spi.QPropertyDefinition; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.QNodeTypeDefinition; -import org.apache.jackrabbit.nodetype.NodeTypeConflictException; +import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeConflictException; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.jcr2spi.state.NodeState; -import org.apache.jackrabbit.nodetype.NodeTypeConflictException; +import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeConflictException; import javax.jcr.nodetype.NoSuchNodeTypeException; import javax.jcr.nodetype.ConstraintViolationException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionImpl.java Tue Dec 18 01:08:39 2007 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.jcr2spi.nodetype; import org.apache.jackrabbit.spi.QItemDefinition; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeDefinitionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeDefinitionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeDefinitionImpl.java Tue Dec 18 01:08:39 2007 @@ -18,8 +18,8 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.QNodeDefinition; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java Tue Dec 18 01:08:39 2007 @@ -16,8 +16,8 @@ / package org.apache.jackrabbit.jcr2spi.nodetype; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.QNodeDefinition; import org.apache.jackrabbit.spi.QPropertyDefinition; @@ -25,9 +25,9 @@ import org.apache.jackrabbit.spi.QValue; import org.apache.jackrabbit.spi.QValueFactory; import org.apache.jackrabbit.value.ValueHelper; -import org.apache.jackrabbit.value.ValueFormat; +import org.apache.jackrabbit.spi.commons.value.ValueFormat; import org.apache.jackrabbit.jcr2spi.ManagerProvider; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java Tue Dec 18 01:08:39 2007 @@ -17,10 +17,10 @@ package org.apache.jackrabbit.jcr2spi.nodetype; import org.apache.commons.collections.map.ReferenceMap; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver; import org.apache.jackrabbit.commons.iterator.NodeTypeIteratorAdapter; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.jcr2spi.util.Dumpable; import org.apache.jackrabbit.jcr2spi.ManagerProvider; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistry.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistry.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistry.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistry.java Tue Dec 18 01:08:39 2007 @@ -18,7 +18,7 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.QNodeTypeDefinition; -import org.apache.jackrabbit.nodetype.InvalidNodeTypeDefException; +import org.apache.jackrabbit.spi.commons.nodetype.InvalidNodeTypeDefException; import javax.jcr.nodetype.NoSuchNodeTypeException; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java Tue Dec 18 01:08:39 2007 @@ -27,9 +27,9 @@ import org.apache.jackrabbit.spi.QPropertyDefinition; import org.apache.jackrabbit.spi.QNodeTypeDefinition; import org.apache.jackrabbit.spi.QValue; -import org.apache.jackrabbit.nodetype.InvalidNodeTypeDefException; -import org.apache.jackrabbit.nodetype.NodeTypeConflictException; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.nodetype.InvalidNodeTypeDefException; +import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeConflictException; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/PropertyDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/PropertyDefinitionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/PropertyDefinitionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/PropertyDefinitionImpl.java Tue Dec 18 01:08:39 2007 @@ -18,9 +18,9 @@ import org.apache.jackrabbit.spi.QPropertyDefinition; import org.apache.jackrabbit.spi.QValue; -import org.apache.jackrabbit.value.ValueFormat; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.nodetype.InvalidConstraintException; +import org.apache.jackrabbit.spi.commons.value.ValueFormat; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.nodetype.InvalidConstraintException; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ValueConstraint.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ValueConstraint.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ValueConstraint.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ValueConstraint.java Tue Dec 18 01:08:39 2007 @@ -16,19 +16,19 @@ / package org.apache.jackrabbit.jcr2spi.nodetype; -import org.apache.jackrabbit.conversion.IllegalNameException; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.conversion.NameException; -import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.QPropertyDefinition; import org.apache.jackrabbit.spi.QValue; import org.apache.jackrabbit.value.DateValue; -import org.apache.jackrabbit.nodetype.InvalidConstraintException; -import org.apache.jackrabbit.name.PathFactoryImpl; -import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.nodetype.InvalidConstraintException; +import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java Tue Dec 18 01:08:39 2007 @@ -16,7 +16,7 @@ / package org.apache.jackrabbit.jcr2spi.observation; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java Tue Dec 18 01:08:39 2007 @@ -20,7 +20,7 @@ import org.slf4j.Logger; import org.apache.jackrabbit.spi.EventBundle; import org.apache.jackrabbit.spi.EventFilter; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import javax.jcr.observation.Event; import javax.jcr.observation.EventIterator; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java Tue Dec 18 01:08:39 2007 @@ -23,8 +23,8 @@ import org.apache.jackrabbit.spi.EventBundle; import org.apache.jackrabbit.spi.EventFilter; import org.apache.jackrabbit.commons.iterator.EventListenerIteratorAdapter; -import org.apache.jackrabbit.conversion.NamePathResolver; -import org.apache.jackrabbit.conversion.NameException; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java Tue Dec 18 01:08:39 2007 @@ -21,7 +21,7 @@ import org.apache.jackrabbit.jcr2spi.state.ItemState; import org.apache.jackrabbit.jcr2spi.state.NodeState; import org.apache.jackrabbit.jcr2spi.util.LogUtil; -import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java Tue Dec 18 01:08:39 2007 @@ -23,7 +23,7 @@ import org.apache.jackrabbit.jcr2spi.state.NodeState; import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry; import org.apache.jackrabbit.spi.NodeId; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.RepositoryException; import javax.jcr.AccessDeniedException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java Tue Dec 18 01:08:39 2007 @@ -23,7 +23,7 @@ import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.NodeId; -import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java Tue Dec 18 01:08:39 2007 @@ -23,7 +23,7 @@ import org.apache.jackrabbit.jcr2spi.state.NodeState; import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry; import org.apache.jackrabbit.spi.NodeId; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.RepositoryException; import javax.jcr.AccessDeniedException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java Tue Dec 18 01:08:39 2007 @@ -19,7 +19,7 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.jcr2spi.state.NodeState; import org.apache.jackrabbit.spi.NodeId; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.RepositoryException; import javax.jcr.AccessDeniedException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java Tue Dec 18 01:08:39 2007 @@ -21,9 +21,9 @@ import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyManager; import org.apache.jackrabbit.jcr2spi.name.LocalNamespaceMappings; import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.QueryInfo; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import javax.jcr.ItemExistsException; import javax.jcr.ItemNotFoundException; @@ -217,7 +217,7 @@ queryNode.setProperty(resolver.getJCRName(NameConstants.JCR_STATEMENT), statement); node = queryNode; return node; - } catch (org.apache.jackrabbit.conversion.NameException e) { + } catch (org.apache.jackrabbit.spi.commons.conversion.NameException e) { throw new RepositoryException(e.getMessage(), e); } } Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java Tue Dec 18 01:08:39 2007 @@ -20,7 +20,7 @@ import org.apache.jackrabbit.jcr2spi.WorkspaceManager; import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyManager; import org.apache.jackrabbit.jcr2spi.name.LocalNamespaceMappings; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import javax.jcr.Node; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java Tue Dec 18 01:08:39 2007 @@ -20,7 +20,7 @@ import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyManager; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.QueryInfo; -import org.apache.jackrabbit.conversion.NamePathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java Tue Dec 18 01:08:39 2007 @@ -29,12 +29,12 @@ import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -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.QueryInfo; import org.apache.jackrabbit.spi.QueryResultRow; import org.apache.jackrabbit.spi.QValue; -import org.apache.jackrabbit.value.ValueFormat; +import org.apache.jackrabbit.spi.commons.value.ValueFormat; /** * Implements the {@link javax.jcr.query.RowIterator} interface returned by @@ -55,7 +55,7 @@ /** * The <code>NamePathResolver</code> of the user <code>Session</code>. / - private final org.apache.jackrabbit.conversion.NamePathResolver resolver; + private final org.apache.jackrabbit.spi.commons.conversion.NamePathResolver resolver; /* * The JCR value factory. @@ -256,7 +256,7 @@ getValues(); } return values[idx.intValue()]; - } catch (org.apache.jackrabbit.conversion.NameException e) { + } catch (org.apache.jackrabbit.spi.commons.conversion.NameException e) { throw new RepositoryException(e.getMessage(), e); } } Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java Tue Dec 18 01:08:39 2007 @@ -21,7 +21,7 @@ import org.apache.jackrabbit.jcr2spi.operation.AddProperty; import org.apache.jackrabbit.jcr2spi.operation.SetMixin; import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.commons.collections.iterators.IteratorChain; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java Tue Dec 18 01:08:39 2007 @@ -172,7 +172,7 @@ * * @param itemState * @return JCR path - * @see LogUtil#safeGetJCRPath(ItemState,org.apache.jackrabbit.conversion.PathResolver) + * @see LogUtil#safeGetJCRPath(ItemState,org.apache.jackrabbit.spi.commons.conversion.PathResolver) */ private String safeGetJCRPath(ItemState itemState) { return LogUtil.safeGetJCRPath(itemState, mgrProvider.getPathResolver()); Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java Tue Dec 18 01:08:39 2007 @@ -26,7 +26,7 @@ import org.apache.jackrabbit.spi.ItemId; import org.apache.jackrabbit.spi.QNodeDefinition; import org.apache.jackrabbit.spi.NodeInfo; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.slf4j.LoggerFactory; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java Tue Dec 18 01:08:39 2007 @@ -54,7 +54,7 @@ import org.apache.jackrabbit.spi.QNodeDefinition; import org.apache.jackrabbit.spi.QValue; import org.apache.jackrabbit.spi.QValueFactory; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.InvalidItemStateException; import javax.jcr.ReferentialIntegrityException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java Tue Dec 18 01:08:39 2007 @@ -22,7 +22,7 @@ import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry; import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry; import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.NodeId; import org.apache.jackrabbit.spi.PropertyId; import org.apache.jackrabbit.spi.NodeInfo; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/LogUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/LogUtil.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/LogUtil.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/LogUtil.java Tue Dec 18 01:08:39 2007 @@ -22,8 +22,8 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.jcr2spi.state.ItemState; import org.apache.jackrabbit.spi.ItemId; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.commons.conversion.NameResolver; +import org.apache.jackrabbit.spi.commons.conversion.PathResolver; import javax.jcr.RepositoryException; import javax.jcr.NamespaceException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/StateUtility.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/StateUtility.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/StateUtility.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/StateUtility.java Tue Dec 18 01:08:39 2007 @@ -24,7 +24,7 @@ import org.apache.jackrabbit.jcr2spi.state.NodeState; import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry; import org.apache.jackrabbit.spi.QValue; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java Tue Dec 18 01:08:39 2007 @@ -27,9 +27,9 @@ import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry; import org.apache.jackrabbit.jcr2spi.state.NodeState; 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.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.commons.iterator.RangeIteratorAdapter; import javax.jcr.version.VersionHistory; @@ -359,7 +359,7 @@ } else { return vEntry.getNodeState(); } - } catch (org.apache.jackrabbit.conversion.NameException e) { + } catch (org.apache.jackrabbit.spi.commons.conversion.NameException e) { throw new RepositoryException(e); } } Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java?rev=605147&r1=605146&r2=605147&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java Tue Dec 18 01:08:39 2007 @@ -24,7 +24,7 @@ import org.apache.jackrabbit.jcr2spi.ItemLifeCycleListener; import org.apache.jackrabbit.jcr2spi.state.NodeState; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import javax.jcr.version.Version; import javax.jcr.version.VersionHistory;
Mime	Unnamed text/plain (inline, 7-Bit, 89563 bytes)
	View raw message