Index: src/main/java/org/apache/jackrabbit/name/NameException.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/NameException.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/NameException.java	(working copy)
@@ -21,6 +21,8 @@
 /**
  * Base class for exceptions about malformed or otherwise
  * invalid JCR names and paths.
+ *
+ * @deprecated 
  */
 public class NameException extends BaseException {
 
Index: src/main/java/org/apache/jackrabbit/name/QName.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/QName.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/QName.java	(working copy)
@@ -64,6 +64,10 @@
  * <p>
  * In addition to the prefixed JCR name format, a qualified name can also
  * be represented using the format "<code>{namespaceURI}localPart</code>".
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.spi.Name} and
+ * {@link org.apache.jackrabbit.spi.NameFactory} instead. A default implementation
+ * is provided by {@link org.apache.jackrabbit.name.NameFactoryImpl}.
  */
 public final class QName implements Cloneable, Comparable, Serializable {
 
Index: src/main/java/org/apache/jackrabbit/name/ParsingPathResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/ParsingPathResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/ParsingPathResolver.java	(working copy)
@@ -21,6 +21,8 @@
 /**
  * Path resolver that parsers and formats prefixed JCR paths.
  * A {@link NameResolver} is used for resolving the path element names.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.ParsingPathResolver}.
  */
 public class ParsingPathResolver implements PathResolver {
 
Index: src/main/java/org/apache/jackrabbit/name/NamespaceListener.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/NamespaceListener.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/NamespaceListener.java	(working copy)
@@ -18,6 +18,8 @@
 
 /**
  * Receives notifications when a namespace mapping changes.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.namespace.NamespaceListener} instead.
  */
 public interface NamespaceListener {
 
Index: src/main/java/org/apache/jackrabbit/name/NameResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/NameResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/NameResolver.java	(working copy)
@@ -21,6 +21,8 @@
 /**
  * Resolver for prefixed JCR names and namespace-qualified
  * {@link QName QNames}.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.NameResolver} instead.
  */
 public interface NameResolver {
 
Index: src/main/java/org/apache/jackrabbit/name/MalformedPathException.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/MalformedPathException.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/MalformedPathException.java	(working copy)
@@ -24,6 +24,8 @@
  * <p>
  * See the section 4.6 of the JCR 1.0 specification for details of the
  * JCR path syntax.
+ *
+ * @deprecated 
  */
 public class MalformedPathException extends NameException {
 
Index: src/main/java/org/apache/jackrabbit/name/AbstractNamespaceResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/AbstractNamespaceResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/AbstractNamespaceResolver.java	(working copy)
@@ -32,6 +32,8 @@
  * with <code>supportListeners</code> set to <code>true</code>. The default
  * constructor will not enable listener support and all listener related
  * methods will throw an {@link UnsupportedOperationException} in that case.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.namespace.AbstractNamespaceResolver} instead.
  */
 public abstract class AbstractNamespaceResolver implements NamespaceResolver {
 
Index: src/main/java/org/apache/jackrabbit/name/NameCache.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/NameCache.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/NameCache.java	(working copy)
@@ -22,6 +22,8 @@
  * <p/>
  * Please note, that the redundant naming of the methods is intentionally in
  * order to allow a class to implement several caches.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.NameCache} instead.
  */
 public interface NameCache {
 
Index: src/main/java/org/apache/jackrabbit/name/PathFormat.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/PathFormat.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/PathFormat.java	(working copy)
@@ -26,6 +26,8 @@
 /**
  * <code>PathFormat</code> formats a {@link Path} using a
  * {@link NamespaceResolver}.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.PathResolver} instead.
  */
 public class PathFormat {
 
Index: src/main/java/org/apache/jackrabbit/name/NamespaceResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/NamespaceResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/NamespaceResolver.java	(working copy)
@@ -25,6 +25,8 @@
  * methods. This interface is therefore used internally in many places where
  * the full namespace registry is either not available or some other mechanism
  * is used for resolving namespaces.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.name.NamespaceResolver} instead.
  */
 public interface NamespaceResolver {
 
Index: src/main/java/org/apache/jackrabbit/name/PathResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/PathResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/PathResolver.java	(working copy)
@@ -20,6 +20,8 @@
 
 /**
  * Resolver for JCR paths.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.PathResolver} instead.
  */
 public interface PathResolver {
 
Index: src/main/java/org/apache/jackrabbit/name/NamePathResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/NamePathResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/NamePathResolver.java	(working copy)
@@ -20,6 +20,8 @@
  * Combined name and path resolver. Can be used instead of the component
  * name and path resolver interfaces when a single dependency for both
  * name and path resolution is needed.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.NamePathResolver} instead.
  */
 public interface NamePathResolver extends NameResolver, PathResolver {
 }
Index: src/main/java/org/apache/jackrabbit/name/CachingNameResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/CachingNameResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/CachingNameResolver.java	(working copy)
@@ -22,6 +22,8 @@
  * Name resolver decorator that uses a generational cache to speed up
  * parsing and formatting of JCR names. Uncached names are resolved using
  * the underlying decorated name resolver.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.CachingNameResolver} instead.
  */
 public class CachingNameResolver implements NameResolver {
 
Index: src/main/java/org/apache/jackrabbit/name/SessionNamespaceResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/SessionNamespaceResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/SessionNamespaceResolver.java	(working copy)
@@ -23,6 +23,8 @@
 /**
  * helper class that exposes the <code>NamespaceResolver</code>
  * interface on a <code>Session</code>
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.namespace.SessionNamespaceResolver} instead. 
  */
 public class SessionNamespaceResolver extends AbstractNamespaceResolver {
 
Index: src/main/java/org/apache/jackrabbit/name/ParsingNameResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/ParsingNameResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/ParsingNameResolver.java	(working copy)
@@ -22,6 +22,8 @@
 /**
  * Name resolver that parsers and formats prefixed JCR names.
  * A {@link NamespaceResolver} is used for resolving the namespace prefixes.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.ParsingNameResolver}.
  */
 public class ParsingNameResolver implements NameResolver {
 
Index: src/main/java/org/apache/jackrabbit/name/NameFormat.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/NameFormat.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/NameFormat.java	(working copy)
@@ -24,6 +24,8 @@
 
 /**
  * <code>NameFormat</code> provides methods for formatting and parsing names.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.NameResolver} instead.
  */
 public class NameFormat {
 
Index: src/main/java/org/apache/jackrabbit/name/IllegalNameException.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/IllegalNameException.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/IllegalNameException.java	(working copy)
@@ -25,6 +25,8 @@
  * <p>
  * See the section 4.6 of the JCR 1.0 specification for details of the
  * JCR name syntax.
+ *
+ * @deprecated 
  */
 public class IllegalNameException extends NameException {
 
Index: src/main/java/org/apache/jackrabbit/name/CachingPathResolver.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/CachingPathResolver.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/CachingPathResolver.java	(working copy)
@@ -22,6 +22,8 @@
  * Path resolver decorator that uses a generational cache to speed up
  * parsing and formatting of JCR paths. Uncached paths are resolved using
  * the underlying decorated path resolver.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.CachingPathResolver} instead.
  */
 public class CachingPathResolver implements PathResolver {
 
Index: src/main/java/org/apache/jackrabbit/name/GenerationalCache.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/GenerationalCache.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/GenerationalCache.java	(working copy)
@@ -27,6 +27,8 @@
  * are used within two successive generations get promoted to the long term
  * cache. The entries within the long term cache are discarded only when the
  * size of the cache exceeds the given maximum cache size.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.conversion.GenerationalCache} instead.
  */
 class GenerationalCache {
 
Index: src/main/java/org/apache/jackrabbit/name/Path.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/Path.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/Path.java	(working copy)
@@ -79,6 +79,10 @@
  *                  ''', '"', '|' or any whitespace
  *                  character *)
  * </pre>
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.spi.Path} and
+ * {@link org.apache.jackrabbit.spi.PathFactory} instead. A default implementation
+ * is provided by {@link org.apache.jackrabbit.name.PathFactoryImpl}.
  */
 public final class Path implements Serializable {
 
Index: src/main/java/org/apache/jackrabbit/name/UnknownPrefixException.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/UnknownPrefixException.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/UnknownPrefixException.java	(working copy)
@@ -20,6 +20,8 @@
  * Thrown when a JCR name string with an unknown prefix is encountered.
  * This exception is thrown when attempting to parse a JCR name string
  * whose prefix is not bound to any namespace.
+ *
+ * @deprecated 
  */
 public class UnknownPrefixException extends NameException {
 
Index: src/main/java/org/apache/jackrabbit/name/NoPrefixDeclaredException.java
===================================================================
--- src/main/java/org/apache/jackrabbit/name/NoPrefixDeclaredException.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/name/NoPrefixDeclaredException.java	(working copy)
@@ -21,6 +21,8 @@
  * exception is thrown when trying to convert a qualified name whose namespace
  * prefix is not found into a JCR name string. The JCR name string can not be
  * created without the namespace prefix.
+ *
+ * @deprecated 
  */
 public class NoPrefixDeclaredException extends NameException {
 
Index: src/main/java/org/apache/jackrabbit/BaseException.java
===================================================================
--- src/main/java/org/apache/jackrabbit/BaseException.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/BaseException.java	(working copy)
@@ -20,6 +20,8 @@
  * The abstract class <code>BaseException</code> serves as the base class
  * for all exceptions that are specific to this JCR implementation and that
  * are not derived from <code>javax.jcr.RepositoryException</code>.
+ *
+ * @deprecated
  */
 public abstract class BaseException extends Exception {
 
Index: src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java
===================================================================
--- src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java	(working copy)
@@ -40,6 +40,8 @@
  * The resulting NamespaceMapping implements NamespaceResolver
  * and can be used by tools (such as o.a.j.tools.nodetype.CompactNodeTypeDefWriter)
  * to resolve namespaces.
+ *
+ * @deprecated User org.apache.jackrabbit.namespace.NamespaceExtractor instead
  */
 public class NamespaceExtractor {
     private static Logger log = LoggerFactory.getLogger(NamespaceExtractor.class);
Index: src/main/java/org/apache/jackrabbit/util/name/NamespaceMapping.java
===================================================================
--- src/main/java/org/apache/jackrabbit/util/name/NamespaceMapping.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/util/name/NamespaceMapping.java	(working copy)
@@ -30,6 +30,8 @@
  * A Simple Namespace Mapping table. Mappings can be added
  * and then the object can be used as a NamespaceResolver. Additionally, it can
  * be based on a underlying NamespaceResolver
+ *
+ * @deprecated Use org.apache.jackrabbit.namespace.NamespaceMapping instead.
  */
 public class NamespaceMapping extends AbstractNamespaceResolver {
 
Index: src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java
===================================================================
--- src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java	(working copy)
@@ -23,6 +23,9 @@
 import java.util.Map;
 import java.util.Iterator;
 
+/**
+ * @deprecated Use org.apache.jackrabbit.namespace.NamespaceAdder
+ */
 public class NamespaceAdder {
 
     private final NamespaceRegistry registry;
Index: src/main/java/org/apache/jackrabbit/util/Locked.java
===================================================================
--- src/main/java/org/apache/jackrabbit/util/Locked.java	(revision 581942)
+++ src/main/java/org/apache/jackrabbit/util/Locked.java	(working copy)
@@ -75,6 +75,8 @@
  *     long nextValue = ((Long) ret).longValue();
  * }
  * </pre>
+ *
+ * @deprecated Use org.apache.jackrabbit.lock.Locked instead.
  */
 public abstract class Locked {
 
Index: src/main/java/org/apache/jackrabbit/util/PathMap.java
===================================================================
--- src/main/java/org/apache/jackrabbit/util/PathMap.java	(revision 583163)
+++ src/main/java/org/apache/jackrabbit/util/PathMap.java	(working copy)
@@ -28,6 +28,8 @@
 /**
  * Generic path map that associates information with the individual path elements
  * of a path.
+ *
+ * @deprecated Use {@link org.apache.jackrabbit.name.PathMap} instead.
  */
 public class PathMap {