jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r156190 [1/3] - in incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core: ./ fs/ fs/local/ jndi/ jndi/provider/ nodetype/ observation/ search/ search/lucene/ security/ state/ state/mem/ state/xml/ util/ version/ version/persistence/ xml/
Date Fri, 04 Mar 2005 18:00:17 GMT
Author: stefan
Date: Fri Mar  4 09:59:44 2005
New Revision: 156190

URL: http://svn.apache.org/viewcvs?view=rev&rev=156190
Log:
changing javadoc pattern for implementation of interface methods
from  @see ... style to {@inheritDoc}
(old dog learning new trick :)

Modified:
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/BLOBFileValue.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/CachingHierarchyManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyId.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SystemSession.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/XASessionImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/BasedFileSystem.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/local/RAFOutputStream.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepository.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/BindableRepositoryFactory.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyContext.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/jndi/provider/DummyInitialContextFactory.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventState.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/AndQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/ExactQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/LocationStepQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NodeTypeQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/NotQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/OrderQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/PathQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryManagerImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryRootNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/RelationQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/TextsearchQueryNode.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/ChildAxisQuery.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/DescendantSelfAxisQuery.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/FileSystemDirectory.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllScorer.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/MatchAllWeight.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/QueryResultImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/AnonymousPrincipal.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/CredentialsCallbackHandler.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/SimpleAccessManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/SystemPrincipal.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/UserPrincipal.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/AbstractPersistenceManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/ItemState.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/NodeReferencesId.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/NodeState.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/PropertyState.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/TransactionalItemStateManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/TransientItemStateManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/mem/InMemPersistenceManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/xml/XMLPersistenceManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollector.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/IteratorHelper.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersion.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionNodeState.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenNodeImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenVHImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/ImportHandler.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SessionImporter.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewSAXEventGenerator.java

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/BLOBFileValue.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/BLOBFileValue.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/BLOBFileValue.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/BLOBFileValue.java Fri Mar  4 09:59:44 2005
@@ -24,7 +24,15 @@
 import javax.jcr.Value;
 import javax.jcr.ValueFormatException;
 import javax.jcr.util.ISO8601;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.Calendar;
 
 /**
@@ -262,14 +270,14 @@
 
     //----------------------------------------------------------------< Value >
     /**
-     * @see Value#getType
+     * {@inheritDoc}
      */
     public int getType() {
         return TYPE;
     }
 
     /**
-     * @see Value#getString
+     * {@inheritDoc}
      */
     public String getString() throws ValueFormatException, IllegalStateException, RepositoryException {
         if (text == null) {
@@ -294,7 +302,7 @@
     }
 
     /**
-     * @see Value#getStream
+     * {@inheritDoc}
      */
     public InputStream getStream() throws ValueFormatException, IllegalStateException, RepositoryException {
         // always return a 'fresh' stream
@@ -316,7 +324,7 @@
     }
 
     /**
-     * @see Value#getDouble
+     * {@inheritDoc}
      */
     public double getDouble() throws ValueFormatException, IllegalStateException, RepositoryException {
         try {
@@ -327,7 +335,7 @@
     }
 
     /**
-     * @see Value#getDate
+     * {@inheritDoc}
      */
     public Calendar getDate() throws ValueFormatException, IllegalStateException, RepositoryException {
         Calendar cal = ISO8601.parse(getString());
@@ -339,7 +347,7 @@
     }
 
     /**
-     * @see Value#getLong
+     * {@inheritDoc}
      */
     public long getLong() throws ValueFormatException, IllegalStateException, RepositoryException {
         try {
@@ -350,7 +358,7 @@
     }
 
     /**
-     * @see Value#getBoolean
+     * {@inheritDoc}
      */
     public boolean getBoolean() throws ValueFormatException, IllegalStateException, RepositoryException {
         return Boolean.valueOf(getString()).booleanValue();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/CachingHierarchyManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/CachingHierarchyManager.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/CachingHierarchyManager.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/CachingHierarchyManager.java Fri Mar  4 09:59:44 2005
@@ -75,21 +75,21 @@
 
     //-----------------------------------------------------< HierarchyManager >
     /**
-     * @see HierarchyManager#listParents(ItemId)
+     * {@inheritDoc}
      */
     public NodeId[] listParents(ItemId id) throws ItemNotFoundException, RepositoryException {
         return delegatee.listParents(id);
     }
 
     /**
-     * @see HierarchyManager#listChildren(NodeId)
+     * {@inheritDoc}
      */
     public ItemId[] listChildren(NodeId id) throws ItemNotFoundException, RepositoryException {
         return delegatee.listChildren(id);
     }
 
     /**
-     * @see HierarchyManager#listZombieChildren(NodeId)
+     * {@inheritDoc}
      */
     public ItemId[] listZombieChildren(NodeId id)
             throws ItemNotFoundException, RepositoryException {
@@ -97,7 +97,7 @@
     }
 
     /**
-     * @see HierarchyManager#resolvePath(Path)
+     * {@inheritDoc}
      */
     public synchronized ItemId resolvePath(Path path)
             throws PathNotFoundException, RepositoryException {
@@ -112,14 +112,14 @@
     }
 
     /**
-     * @see HierarchyManager#getPath(ItemId)
+     * {@inheritDoc}
      */
     public synchronized Path getPath(ItemId id) throws ItemNotFoundException, RepositoryException {
         return getAllPaths(id, false)[0];
     }
 
     /**
-     * @see HierarchyManager#getName(ItemId)
+     * {@inheritDoc}
      */
     public QName getName(ItemId itemId) throws ItemNotFoundException, RepositoryException {
         if (itemId.denotesNode()) {
@@ -131,14 +131,14 @@
     }
 
     /**
-     * @see HierarchyManager#getAllPaths(ItemId)
+     * {@inheritDoc}
      */
     public synchronized Path[] getAllPaths(ItemId id) throws ItemNotFoundException, RepositoryException {
         return getAllPaths(id, false);
     }
 
     /**
-     * @see HierarchyManager#getAllPaths(ItemId, boolean)
+     * {@inheritDoc}
      */
     public synchronized Path[] getAllPaths(ItemId id, boolean includeZombies)
             throws ItemNotFoundException, RepositoryException {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java Fri Mar  4 09:59:44 2005
@@ -99,7 +99,7 @@
 
     //-----------------------------------------------------< HierarchyManager >
     /**
-     * @see HierarchyManager#listParents(ItemId)
+     * {@inheritDoc}
      */
     public NodeId[] listParents(ItemId id) throws ItemNotFoundException, RepositoryException {
         ArrayList list = new ArrayList();
@@ -127,7 +127,7 @@
     }
 
     /**
-     * @see HierarchyManager#listChildren(NodeId)
+     * {@inheritDoc}
      */
     public ItemId[] listChildren(NodeId id) throws ItemNotFoundException, RepositoryException {
         NodeState parentState;
@@ -159,7 +159,7 @@
     }
 
     /**
-     * @see HierarchyManager#listZombieChildren(NodeId)
+     * {@inheritDoc}
      */
     public ItemId[] listZombieChildren(NodeId id)
             throws ItemNotFoundException, RepositoryException {
@@ -194,7 +194,7 @@
     }
 
     /**
-     * @see HierarchyManager#resolvePath(Path)
+     * {@inheritDoc}
      */
     public synchronized ItemId resolvePath(Path path)
             throws PathNotFoundException, RepositoryException {
@@ -260,7 +260,7 @@
     }
 
     /**
-     * @see HierarchyManager#getPath(ItemId)
+     * {@inheritDoc}
      */
     public synchronized Path getPath(ItemId id) throws ItemNotFoundException, RepositoryException {
         try {
@@ -329,7 +329,7 @@
     }
 
     /**
-     * @see HierarchyManager#getName(ItemId)
+     * {@inheritDoc}
      */
     public QName getName(ItemId itemId) throws ItemNotFoundException, RepositoryException {
         if (itemId.denotesNode()) {
@@ -370,14 +370,14 @@
     }
 
     /**
-     * @see HierarchyManager#getAllPaths(ItemId)
+     * {@inheritDoc}
      */
     public synchronized Path[] getAllPaths(ItemId id) throws ItemNotFoundException, RepositoryException {
         return getAllPaths(id, false);
     }
 
     /**
-     * @see HierarchyManager#getAllPaths(ItemId, boolean)
+     * {@inheritDoc}
      */
     public synchronized Path[] getAllPaths(ItemId id, boolean includeZombies)
             throws ItemNotFoundException, RepositoryException {
@@ -385,7 +385,7 @@
         ArrayList list = new ArrayList();
         list.add(builder);
 
-        NodeId nodeId = null;
+        NodeId nodeId;
         if (!id.denotesNode()) {
             try {
                 PropertyState propState = (PropertyState) getItemState(id, includeZombies);
@@ -425,6 +425,7 @@
         return paths;
     }
 
+    //------------------------------------------------------< private methods >
     /**
      * @param id
      * @return

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java Fri Mar  4 09:59:44 2005
@@ -880,14 +880,14 @@
 
     //----------------------------------------------------< ItemStateListener >
     /**
-     * @see ItemStateListener#stateCreated
+     * {@inheritDoc}
      */
     public void stateCreated(ItemState created) {
         status = STATUS_NORMAL;
     }
 
     /**
-     * @see ItemStateListener#stateDestroyed
+     * {@inheritDoc}
      */
     public void stateDestroyed(ItemState destroyed) {
         // underlying state has been permanently destroyed
@@ -907,14 +907,14 @@
     }
 
     /**
-     * @see ItemStateListener#stateModified
+     * {@inheritDoc}
      */
     public void stateModified(ItemState modified) {
         status = STATUS_MODIFIED;
     }
 
     /**
-     * @see ItemStateListener#stateDiscarded
+     * {@inheritDoc}
      */
     public void stateDiscarded(ItemState discarded) {
         /**
@@ -997,50 +997,50 @@
 
     //-----------------------------------------------------------------< Item >
     /**
-     * @see Item#accept
+     * {@inheritDoc}
      */
     public abstract void accept(ItemVisitor visitor)
             throws RepositoryException;
 
     /**
-     * @see Item#isNode
+     * {@inheritDoc}
      */
     public abstract boolean isNode();
 
     /**
-     * @see Item#getName
+     * {@inheritDoc}
      */
     public abstract String getName() throws RepositoryException;
 
     /**
-     * @see Item#getParent
+     * {@inheritDoc}
      */
     public abstract Node getParent()
             throws ItemNotFoundException, AccessDeniedException, RepositoryException;
 
     /**
-     * @see Item#isNew
+     * {@inheritDoc}
      */
     public boolean isNew() {
         return state.getStatus() == ItemState.STATUS_NEW;
     }
 
     /**
-     * @see Item#isModified
+     * {@inheritDoc}
      */
     public boolean isModified() {
         return state.isTransient() && state.getOverlayedState() != null;
     }
 
     /**
-     * @see Item#remove
+     * {@inheritDoc}
      */
     public void remove() throws VersionException, LockException, RepositoryException {
         internalRemove(false);
     }
 
     /**
-     * @see Item#remove
+     * {@inheritDoc}
      */
     protected void internalRemove(boolean noChecks)
             throws VersionException, LockException, RepositoryException {
@@ -1103,7 +1103,7 @@
     }
 
     /**
-     * @see Item#save
+     * {@inheritDoc}
      */
     public void save()
             throws AccessDeniedException, ConstraintViolationException,
@@ -1258,7 +1258,7 @@
     }
 
     /**
-     * @see Item#refresh
+     * {@inheritDoc}
      */
     public synchronized void refresh(boolean keepChanges)
             throws InvalidItemStateException, RepositoryException {
@@ -1354,7 +1354,7 @@
     }
 
     /**
-     * @see Item#getAncestor
+     * {@inheritDoc}
      */
     public Item getAncestor(int degree)
             throws ItemNotFoundException, AccessDeniedException, RepositoryException {
@@ -1381,7 +1381,7 @@
     }
 
     /**
-     * @see Item#getPath
+     * {@inheritDoc}
      */
     public String getPath() throws RepositoryException {
         try {
@@ -1395,21 +1395,21 @@
     }
 
     /**
-     * @see Item#getDepth
+     * {@inheritDoc}
      */
     public int getDepth() throws RepositoryException {
         return getPrimaryPath().getAncestorCount();
     }
 
     /**
-     * @see Item#getSession
+     * {@inheritDoc}
      */
     public Session getSession() throws RepositoryException {
         return session;
     }
 
     /**
-     * @see Item#isSame(Item)
+     * {@inheritDoc}
      */
     public boolean isSame(Item otherItem) {
         if (this == otherItem) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemManager.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemManager.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemManager.java Fri Mar  4 09:59:44 2005
@@ -17,11 +17,11 @@
 package org.apache.jackrabbit.core;
 
 import org.apache.commons.collections.ReferenceMap;
-import org.apache.jackrabbit.core.security.AccessManager;
 import org.apache.jackrabbit.core.nodetype.NodeDefId;
 import org.apache.jackrabbit.core.nodetype.NodeDefImpl;
 import org.apache.jackrabbit.core.nodetype.PropDefId;
 import org.apache.jackrabbit.core.nodetype.PropertyDefImpl;
+import org.apache.jackrabbit.core.security.AccessManager;
 import org.apache.jackrabbit.core.state.ItemState;
 import org.apache.jackrabbit.core.state.ItemStateException;
 import org.apache.jackrabbit.core.state.ItemStateManager;
@@ -726,7 +726,7 @@
 
     //------------------------------------------------< ItemLifeCycleListener >
     /**
-     * @see ItemLifeCycleListener#itemCreated
+     * {@inheritDoc}
      */
     public void itemCreated(ItemImpl item) {
         log.debug("created item " + item.getId());
@@ -735,7 +735,7 @@
     }
 
     /**
-     * @see ItemLifeCycleListener#itemInvalidated
+     * {@inheritDoc}
      */
     public void itemInvalidated(ItemId id, ItemImpl item) {
         log.debug("invalidated item " + id);
@@ -744,7 +744,7 @@
     }
 
     /**
-     * @see ItemLifeCycleListener#itemDestroyed
+     * {@inheritDoc}
      */
     public void itemDestroyed(ItemId id, ItemImpl item) {
         log.debug("destroyed item " + id);

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java Fri Mar  4 09:59:44 2005
@@ -161,7 +161,7 @@
 
     //----------------------------------------------------< NamespaceResolver >
     /**
-     * @see NamespaceResolver#getURI
+     * {@inheritDoc}
      */
     public String getURI(String prefix) throws NamespaceException {
         if (prefixToURI.isEmpty()) {
@@ -182,7 +182,7 @@
     }
 
     /**
-     * @see NamespaceResolver#getPrefix
+     * {@inheritDoc}
      */
     public String getPrefix(String uri) throws NamespaceException {
         if (prefixToURI.isEmpty()) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java Fri Mar  4 09:59:44 2005
@@ -193,7 +193,7 @@
 
     //----------------------------------------------------< NamespaceRegistry >
     /**
-     * @see NamespaceRegistry#registerNamespace
+     * {@inheritDoc}
      */
     public void registerNamespace(String prefix, String uri)
             throws NamespaceException, UnsupportedRepositoryOperationException,
@@ -254,7 +254,7 @@
     }
 
     /**
-     * @see NamespaceRegistry#unregisterNamespace
+     * {@inheritDoc}
      */
     public void unregisterNamespace(String prefix)
             throws NamespaceException, UnsupportedRepositoryOperationException,
@@ -274,14 +274,14 @@
     }
 
     /**
-     * @see NamespaceRegistry#getPrefixes
+     * {@inheritDoc}
      */
     public String[] getPrefixes() throws RepositoryException {
         return (String[]) prefixToURI.keySet().toArray(new String[prefixToURI.keySet().size()]);
     }
 
     /**
-     * @see NamespaceRegistry#getURIs
+     * {@inheritDoc}
      */
     public String[] getURIs() throws RepositoryException {
         return (String[]) uriToPrefix.keySet().toArray(new String[uriToPrefix.keySet().size()]);
@@ -289,8 +289,7 @@
 
     //--------------------------------< NamespaceRegistry & NamespaceResolver >
     /**
-     * @see NamespaceRegistry#getURI
-     * @see NamespaceResolver#getURI
+     * {@inheritDoc}
      */
     public String getURI(String prefix) throws NamespaceException {
         if (!prefixToURI.containsKey(prefix)) {
@@ -300,8 +299,7 @@
     }
 
     /**
-     * @see NamespaceRegistry#getPrefix
-     * @see NamespaceResolver#getPrefix
+     * {@inheritDoc}
      */
     public String getPrefix(String uri) throws NamespaceException {
         if (!uriToPrefix.containsKey(uri)) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java Fri Mar  4 09:59:44 2005
@@ -1521,14 +1521,14 @@
 
     //-----------------------------------------------------------------< Item >
     /**
-     * @see Item#isNode()
+     * {@inheritDoc}
      */
     public boolean isNode() {
         return true;
     }
 
     /**
-     * @see Item#getName
+     * {@inheritDoc}
      */
     public String getName() throws RepositoryException {
         if (state.getParentUUID() == null) {
@@ -1549,7 +1549,7 @@
     }
 
     /**
-     * @see Item#accept(ItemVisitor)
+     * {@inheritDoc}
      */
     public void accept(ItemVisitor visitor) throws RepositoryException {
         // check state of this instance
@@ -1559,7 +1559,7 @@
     }
 
     /**
-     * @see Item#getParent
+     * {@inheritDoc}
      */
     public Node getParent()
             throws ItemNotFoundException, AccessDeniedException, RepositoryException {
@@ -1580,7 +1580,7 @@
 
     //-----------------------------------------------------------------< Node >
     /**
-     * @see Node#addNode(String)
+     * {@inheritDoc}
      */
     public synchronized Node addNode(String relPath)
             throws ItemExistsException, PathNotFoundException, VersionException,
@@ -1592,7 +1592,7 @@
     }
 
     /**
-     * @see Node#addNode(String, String)
+     * {@inheritDoc}
      */
     public synchronized Node addNode(String relPath, String nodeTypeName)
             throws ItemExistsException, PathNotFoundException,
@@ -1606,7 +1606,7 @@
     }
 
     /**
-     * @see Node#orderBefore(String, String)
+     * {@inheritDoc}
      */
     public synchronized void orderBefore(String srcName, String destName)
             throws UnsupportedRepositoryOperationException, VersionException,
@@ -1734,7 +1734,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, Value[])
+     * {@inheritDoc}
      */
     public Property setProperty(String name, Value[] values)
             throws ValueFormatException, VersionException, LockException,
@@ -1749,7 +1749,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, Value[], int)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, Value[] values, int type)
             throws ValueFormatException, VersionException, LockException,
@@ -1780,7 +1780,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, String[])
+     * {@inheritDoc}
      */
     public Property setProperty(String name, String[] values)
             throws ValueFormatException, VersionException, LockException,
@@ -1793,7 +1793,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, String[], int)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, String[] values, int type)
             throws ValueFormatException, VersionException, LockException,
@@ -1824,7 +1824,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, String)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, String value)
             throws ValueFormatException, VersionException, LockException,
@@ -1859,7 +1859,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, Value)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, Value value)
             throws ValueFormatException, VersionException, LockException,
@@ -1892,7 +1892,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, InputStream)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, InputStream value)
             throws ValueFormatException, VersionException, LockException,
@@ -1923,7 +1923,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, boolean)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, boolean value)
             throws ValueFormatException, VersionException, LockException,
@@ -1954,7 +1954,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, double)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, double value)
             throws ValueFormatException, VersionException, LockException,
@@ -1985,7 +1985,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, long)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, long value)
             throws ValueFormatException, VersionException, LockException,
@@ -2016,7 +2016,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, Calendar)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, Calendar value)
             throws ValueFormatException, VersionException, LockException,
@@ -2047,7 +2047,7 @@
     }
 
     /**
-     * @see Node#setProperty(String, Node)
+     * {@inheritDoc}
      */
     public Property setProperty(String name, Node value)
             throws ValueFormatException, VersionException, LockException,
@@ -2078,7 +2078,7 @@
     }
 
     /**
-     * @see Node#getNode(String)
+     * {@inheritDoc}
      */
     public Node getNode(String relPath)
             throws PathNotFoundException, RepositoryException {
@@ -2118,7 +2118,7 @@
     }
 
     /**
-     * @see Node#getNodes()
+     * {@inheritDoc}
      */
     public NodeIterator getNodes() throws RepositoryException {
         // check state of this instance
@@ -2145,7 +2145,7 @@
     }
 
     /**
-     * @see Node#getProperties()
+     * {@inheritDoc}
      */
     public PropertyIterator getProperties() throws RepositoryException {
         // check state of this instance
@@ -2172,7 +2172,7 @@
     }
 
     /**
-     * @see Node#getProperty(String)
+     * {@inheritDoc}
      */
     public Property getProperty(String relPath)
             throws PathNotFoundException, RepositoryException {
@@ -2212,7 +2212,7 @@
     }
 
     /**
-     * @see Node#hasNode(String)
+     * {@inheritDoc}
      */
     public boolean hasNode(String relPath) throws RepositoryException {
 /*
@@ -2231,7 +2231,7 @@
     }
 
     /**
-     * @see Node#hasNodes()
+     * {@inheritDoc}
      */
     public boolean hasNodes() throws RepositoryException {
         // check state of this instance
@@ -2247,7 +2247,7 @@
     }
 
     /**
-     * @see Node#hasProperties()
+     * {@inheritDoc}
      */
     public boolean hasProperties() throws RepositoryException {
         // check state of this instance
@@ -2263,7 +2263,7 @@
     }
 
     /**
-     * @see Node#isNodeType(String)
+     * {@inheritDoc}
      */
     public boolean isNodeType(String nodeTypeName) throws RepositoryException {
         QName ntName;
@@ -2278,14 +2278,14 @@
     }
 
     /**
-     * @see Node#getPrimaryNodeType()
+     * {@inheritDoc}
      */
     public NodeType getPrimaryNodeType() throws RepositoryException {
         return nodeType;
     }
 
     /**
-     * @see Node#getMixinNodeTypes()
+     * {@inheritDoc}
      */
     public NodeType[] getMixinNodeTypes() throws RepositoryException {
         Set mixinNames = ((NodeState) state).getMixinTypeNames();
@@ -2302,7 +2302,7 @@
     }
 
     /**
-     * @see Node#addMixin(String)
+     * {@inheritDoc}
      */
     public void addMixin(String mixinName)
             throws NoSuchNodeTypeException, VersionException,
@@ -2320,7 +2320,7 @@
     }
 
     /**
-     * @see Node#removeMixin(String)
+     * {@inheritDoc}
      */
     public void removeMixin(String mixinName)
             throws NoSuchNodeTypeException, VersionException,
@@ -2338,7 +2338,7 @@
     }
 
     /**
-     * @see Node#canAddMixin(String)
+     * {@inheritDoc}
      */
     public boolean canAddMixin(String mixinName) throws RepositoryException {
         // check state of this instance
@@ -2397,7 +2397,7 @@
     }
 
     /**
-     * @see Node#hasProperty(String)
+     * {@inheritDoc}
      */
     public boolean hasProperty(String relPath) throws RepositoryException {
 /*
@@ -2416,7 +2416,7 @@
     }
 
     /**
-     * @see Node#getReferences()
+     * {@inheritDoc}
      */
     public PropertyIterator getReferences() throws RepositoryException {
         return getReferences(false);
@@ -2447,14 +2447,14 @@
     }
 
     /**
-     * @see Node#getDefinition()
+     * {@inheritDoc}
      */
     public NodeDef getDefinition() throws RepositoryException {
         return definition;
     }
 
     /**
-     * @see Node#getNodes(String)
+     * {@inheritDoc}
      */
     public NodeIterator getNodes(String namePattern) throws RepositoryException {
         // check state of this instance
@@ -2467,7 +2467,7 @@
     }
 
     /**
-     * @see Node#getProperties(String)
+     * {@inheritDoc}
      */
     public PropertyIterator getProperties(String namePattern) throws RepositoryException {
         // check state of this instance
@@ -2480,7 +2480,7 @@
     }
 
     /**
-     * @see Node#getPrimaryItem()
+     * {@inheritDoc}
      */
     public Item getPrimaryItem() throws ItemNotFoundException, RepositoryException {
         // check state of this instance
@@ -2500,7 +2500,7 @@
     }
 
     /**
-     * @see Node#getUUID()
+     * {@inheritDoc}
      */
     public String getUUID() throws UnsupportedRepositoryOperationException, RepositoryException {
         // check state of this instance
@@ -2514,7 +2514,7 @@
     }
 
     /**
-     * @see Node#getCorrespondingNodePath(String)
+     * {@inheritDoc}
      */
     public String getCorrespondingNodePath(String workspaceName)
             throws ItemNotFoundException, NoSuchWorkspaceException,
@@ -2570,7 +2570,7 @@
     }
 
     /**
-     * @see Node#getIndex()
+     * {@inheritDoc}
      */
     public int getIndex() throws RepositoryException {
         // check state of this instance
@@ -2583,7 +2583,7 @@
 
     //------------------------------< versioning support: public Node methods >
     /**
-     * @see Node#checkin()
+     * {@inheritDoc}
      */
     public Version checkin()
             throws VersionException, UnsupportedRepositoryOperationException,
@@ -2626,7 +2626,7 @@
     }
 
     /**
-     * @see Node#checkout()
+     * {@inheritDoc}
      */
     public void checkout()
             throws UnsupportedRepositoryOperationException, LockException,
@@ -2654,7 +2654,7 @@
     }
 
     /**
-     * @see Node#update(String)
+     * {@inheritDoc}
      */
     public void update(String srcWorkspaceName)
             throws NoSuchWorkspaceException, AccessDeniedException,
@@ -2700,112 +2700,7 @@
     }
 
     /**
-     * updates this node with the state given by <code>srcNode</code>
-     *
-     * @param srcNode
-     * @param removeExisting
-     * @param replaceExisting
-     * @throws RepositoryException
-     */
-    private void internalUpdate(NodeImpl srcNode, boolean removeExisting, boolean replaceExisting)
-            throws RepositoryException {
-        /*
-         * The "state" of the node in this context means the set of properties and
-         * child nodes it has. In other words, when a node is updated, its set of
-         * properties and child nodes is replaced by that of its corresponding node in the
-         * source workspace. One repercussion of this is that if a node further down the
-         * subtree does not have a corresponding node, then that node is removed (thus
-         * aligning the state of its parent with <i>its</i> correspondee in the other
-         * workspace).
-         */
-
-        // update the properties
-        PropertyIterator iter = getProperties();
-        while (iter.hasNext()) {
-            PropertyImpl p = (PropertyImpl) iter.nextProperty();
-            if (!srcNode.hasProperty(p.getQName())) {
-                p.internalRemove(true);
-            }
-        }
-        iter = srcNode.getProperties();
-        while (iter.hasNext()) {
-            PropertyImpl p = (PropertyImpl) iter.nextProperty();
-            // ignore system types
-            if (p.getQName().equals(JCR_PRIMARYTYPE)
-                    || p.getQName().equals(JCR_MIXINTYPES)
-                    || p.getQName().equals(JCR_UUID)) {
-                continue;
-            }
-            if (p.getDefinition().isMultiple()) {
-                internalSetProperty(p.getQName(), p.internalGetValues());
-            } else {
-                internalSetProperty(p.getQName(), p.internalGetValue());
-            }
-        }
-
-        // update the nodes. remove all dst nodes first
-        NodeIterator niter = getNodes();
-        while (niter.hasNext()) {
-            ((NodeImpl) niter.nextNode()).internalRemove(true);
-        }
-        // add src ones
-        niter = srcNode.getNodes();
-        while (niter.hasNext()) {
-            NodeImpl child = (NodeImpl) niter.nextNode();
-            NodeImpl dstNode = null;
-            String uuid = child.internalGetUUID();
-            if (child.isNodeType(MIX_REFERENCEABLE)) {
-                // if child is referenceable, check if correspondance exist in this workspace
-                try {
-                    dstNode = (NodeImpl) session.getNodeByUUID(uuid);
-                    if (removeExisting) {
-                        // get applicable definition of target node at new location
-                        NodeTypeImpl nt = (NodeTypeImpl) dstNode.getPrimaryNodeType();
-                        NodeDefImpl newTargetDef;
-                        try {
-                            newTargetDef = ((NodeImpl) getParent()).getApplicableChildNodeDef(child.getQName(), nt.getQName());
-                        } catch (RepositoryException re) {
-                            String msg = dstNode.safeGetJCRPath() + ": no definition found in parent node's node type for new node";
-                            log.debug(msg);
-                            throw new ConstraintViolationException(msg, re);
-                        }
-
-                        // add target to new parent and remove from old one
-                        createChildNodeLink(child.getQName(), uuid);
-                        ((NodeImpl) dstNode.getParent()).removeChildNode(child.getQName(), child.getIndex() == 0 ? 1 : child.getIndex());
-                        // change definition of target if necessary
-                        NodeDefImpl oldTargetDef = (NodeDefImpl) dstNode.getDefinition();
-                        NodeDefId oldTargetDefId = new NodeDefId(oldTargetDef.unwrap());
-                        NodeDefId newTargetDefId = new NodeDefId(newTargetDef.unwrap());
-                        if (!oldTargetDefId.equals(newTargetDefId)) {
-                            dstNode.onRedefine(newTargetDefId);
-                        }
-                    } else if (replaceExisting) {
-                        // node exists outside of this update tree, so continue there
-                    } else {
-                        throw new ItemExistsException("Unable to update node: " + dstNode.safeGetJCRPath());
-                    }
-                } catch (ItemNotFoundException e) {
-                    // does not exist
-                }
-            } else {
-                // if child is not referenceable, adjust state
-                uuid = null;
-            }
-            if (dstNode == null) {
-                dstNode = internalAddChildNode(child.getQName(), (NodeTypeImpl) child.getPrimaryNodeType(), uuid);
-                // add mixins
-                NodeType[] mixins = child.getMixinNodeTypes();
-                for (int i = 0; i < mixins.length; i++) {
-                    dstNode.addMixin(mixins[i].getName());
-                }
-            }
-            dstNode.internalUpdate(child, removeExisting, replaceExisting);
-        }
-    }
-
-    /**
-     * @see Node#merge(String, boolean)
+     * {@inheritDoc}
      */
     public void merge(String srcWorkspace, boolean bestEffort)
             throws UnsupportedRepositoryOperationException,
@@ -2883,7 +2778,7 @@
     }
 
     /**
-     * @see Node#cancelMerge(Version)
+     * {@inheritDoc}
      */
     public void cancelMerge(Version version)
             throws VersionException, InvalidItemStateException,
@@ -2903,7 +2798,7 @@
     }
 
     /**
-     * @see Node#doneMerge(Version)
+     * {@inheritDoc}
      */
     public void doneMerge(Version version) throws VersionException,
             InvalidItemStateException, UnsupportedRepositoryOperationException,
@@ -2923,7 +2818,7 @@
     }
 
     /**
-     * @see Node#isCheckedOut()
+     * {@inheritDoc}
      */
     public boolean isCheckedOut() throws RepositoryException {
         // check state of this instance
@@ -2933,7 +2828,7 @@
     }
 
     /**
-     * @see Node#restore(String, boolean)
+     * {@inheritDoc}
      */
     public void restore(String versionName, boolean removeExisting)
             throws VersionException, ItemExistsException,
@@ -2957,7 +2852,7 @@
     }
 
     /**
-     * @see Node#restore(Version, boolean)
+     * {@inheritDoc}
      */
     public void restore(Version version, boolean removeExisting)
             throws VersionException, ItemExistsException,
@@ -2984,7 +2879,7 @@
     }
 
     /**
-     * @see Node#restore(Version, String, boolean)
+     * {@inheritDoc}
      */
     public void restore(Version version, String relPath, boolean removeExisting)
             throws PathNotFoundException, ItemExistsException, VersionException,
@@ -3012,7 +2907,7 @@
     }
 
     /**
-     * @see Node#restoreByLabel(String, boolean)
+     * {@inheritDoc}
      */
     public void restoreByLabel(String versionLabel, boolean removeExisting)
             throws VersionException, ItemExistsException,
@@ -3037,7 +2932,7 @@
     }
 
     /**
-     * @see Node#getVersionHistory()
+     * {@inheritDoc}
      */
     public VersionHistory getVersionHistory()
             throws UnsupportedRepositoryOperationException, RepositoryException {
@@ -3049,7 +2944,7 @@
     }
 
     /**
-     * @see Node#getBaseVersion()
+     * {@inheritDoc}
      */
     public Version getBaseVersion()
             throws UnsupportedRepositoryOperationException, RepositoryException {
@@ -3327,6 +3222,110 @@
         return node;
     }
 
+    /**
+     * updates this node with the state given by <code>srcNode</code>
+     *
+     * @param srcNode
+     * @param removeExisting
+     * @param replaceExisting
+     * @throws RepositoryException
+     */
+    private void internalUpdate(NodeImpl srcNode, boolean removeExisting, boolean replaceExisting)
+            throws RepositoryException {
+        /*
+         * The "state" of the node in this context means the set of properties and
+         * child nodes it has. In other words, when a node is updated, its set of
+         * properties and child nodes is replaced by that of its corresponding node in the
+         * source workspace. One repercussion of this is that if a node further down the
+         * subtree does not have a corresponding node, then that node is removed (thus
+         * aligning the state of its parent with <i>its</i> correspondee in the other
+         * workspace).
+         */
+
+        // update the properties
+        PropertyIterator iter = getProperties();
+        while (iter.hasNext()) {
+            PropertyImpl p = (PropertyImpl) iter.nextProperty();
+            if (!srcNode.hasProperty(p.getQName())) {
+                p.internalRemove(true);
+            }
+        }
+        iter = srcNode.getProperties();
+        while (iter.hasNext()) {
+            PropertyImpl p = (PropertyImpl) iter.nextProperty();
+            // ignore system types
+            if (p.getQName().equals(JCR_PRIMARYTYPE)
+                    || p.getQName().equals(JCR_MIXINTYPES)
+                    || p.getQName().equals(JCR_UUID)) {
+                continue;
+            }
+            if (p.getDefinition().isMultiple()) {
+                internalSetProperty(p.getQName(), p.internalGetValues());
+            } else {
+                internalSetProperty(p.getQName(), p.internalGetValue());
+            }
+        }
+
+        // update the nodes. remove all dst nodes first
+        NodeIterator niter = getNodes();
+        while (niter.hasNext()) {
+            ((NodeImpl) niter.nextNode()).internalRemove(true);
+        }
+        // add src ones
+        niter = srcNode.getNodes();
+        while (niter.hasNext()) {
+            NodeImpl child = (NodeImpl) niter.nextNode();
+            NodeImpl dstNode = null;
+            String uuid = child.internalGetUUID();
+            if (child.isNodeType(MIX_REFERENCEABLE)) {
+                // if child is referenceable, check if correspondance exist in this workspace
+                try {
+                    dstNode = (NodeImpl) session.getNodeByUUID(uuid);
+                    if (removeExisting) {
+                        // get applicable definition of target node at new location
+                        NodeTypeImpl nt = (NodeTypeImpl) dstNode.getPrimaryNodeType();
+                        NodeDefImpl newTargetDef;
+                        try {
+                            newTargetDef = ((NodeImpl) getParent()).getApplicableChildNodeDef(child.getQName(), nt.getQName());
+                        } catch (RepositoryException re) {
+                            String msg = dstNode.safeGetJCRPath() + ": no definition found in parent node's node type for new node";
+                            log.debug(msg);
+                            throw new ConstraintViolationException(msg, re);
+                        }
+
+                        // add target to new parent and remove from old one
+                        createChildNodeLink(child.getQName(), uuid);
+                        ((NodeImpl) dstNode.getParent()).removeChildNode(child.getQName(), child.getIndex() == 0 ? 1 : child.getIndex());
+                        // change definition of target if necessary
+                        NodeDefImpl oldTargetDef = (NodeDefImpl) dstNode.getDefinition();
+                        NodeDefId oldTargetDefId = new NodeDefId(oldTargetDef.unwrap());
+                        NodeDefId newTargetDefId = new NodeDefId(newTargetDef.unwrap());
+                        if (!oldTargetDefId.equals(newTargetDefId)) {
+                            dstNode.onRedefine(newTargetDefId);
+                        }
+                    } else if (replaceExisting) {
+                        // node exists outside of this update tree, so continue there
+                    } else {
+                        throw new ItemExistsException("Unable to update node: " + dstNode.safeGetJCRPath());
+                    }
+                } catch (ItemNotFoundException e) {
+                    // does not exist
+                }
+            } else {
+                // if child is not referenceable, adjust state
+                uuid = null;
+            }
+            if (dstNode == null) {
+                dstNode = internalAddChildNode(child.getQName(), (NodeTypeImpl) child.getPrimaryNodeType(), uuid);
+                // add mixins
+                NodeType[] mixins = child.getMixinNodeTypes();
+                for (int i = 0; i < mixins.length; i++) {
+                    dstNode.addMixin(mixins[i].getName());
+                }
+            }
+            dstNode.internalUpdate(child, removeExisting, replaceExisting);
+        }
+    }
 
     /**
      * Internal method to restore a version.
@@ -3539,7 +3538,7 @@
 
     //------------------------------------------------------< locking support >
     /**
-     * @see Node#lock(boolean, boolean)
+     * {@inheritDoc}
      */
     public Lock lock(boolean isDeep, boolean isSessionScoped)
             throws UnsupportedRepositoryOperationException, LockException,
@@ -3562,7 +3561,7 @@
     }
 
     /**
-     * @see Node#getLock()
+     * {@inheritDoc}
      */
     public Lock getLock()
             throws UnsupportedRepositoryOperationException, LockException,
@@ -3577,7 +3576,7 @@
     }
 
     /**
-     * @see Node#unlock()
+     * {@inheritDoc}
      */
     public void unlock()
             throws UnsupportedRepositoryOperationException, LockException,
@@ -3600,7 +3599,7 @@
     }
 
     /**
-     * @see Node#holdsLock()
+     * {@inheritDoc}
      */
     public boolean holdsLock() throws RepositoryException {
         // check state of this instance
@@ -3611,7 +3610,7 @@
     }
 
     /**
-     * @see Node#isLocked()
+     * {@inheritDoc}
      */
     public boolean isLocked() throws RepositoryException {
         // check state of this instance

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyId.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyId.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyId.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyId.java Fri Mar  4 09:59:44 2005
@@ -38,7 +38,7 @@
     }
 
     /**
-     * @see ItemId#denotesNode
+     * {@inheritDoc}
      */
     public boolean denotesNode() {
         return false;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/PropertyImpl.java Fri Mar  4 09:59:44 2005
@@ -16,12 +16,25 @@
  */
 package org.apache.jackrabbit.core;
 
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
-import org.apache.jackrabbit.core.state.*;
+import org.apache.jackrabbit.core.state.ItemState;
+import org.apache.jackrabbit.core.state.ItemStateException;
+import org.apache.jackrabbit.core.state.PropertyState;
 import org.apache.jackrabbit.core.util.uuid.UUID;
 import org.apache.log4j.Logger;
 
-import javax.jcr.*;
+import javax.jcr.AccessDeniedException;
+import javax.jcr.BooleanValue;
+import javax.jcr.DateValue;
+import javax.jcr.DoubleValue;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.ItemVisitor;
+import javax.jcr.LongValue;
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.ValueFormatException;
 import javax.jcr.lock.LockException;
 import javax.jcr.nodetype.ConstraintViolationException;
 import javax.jcr.nodetype.PropertyDef;
@@ -90,8 +103,7 @@
         PropertyState persistentState = (PropertyState) transientState.getOverlayedState();
         if (persistentState == null) {
             // this property is 'new'
-            persistentState = stateMgr.createNew(
-                    transientState.getName(),
+            persistentState = stateMgr.createNew(transientState.getName(),
                     transientState.getParentUUID());
         }
         // copy state from transient state
@@ -279,7 +291,7 @@
     }
 
     /**
-     * @see ItemImpl#getQName()
+     * {@inheritDoc}
      */
     public QName getQName() {
         PropertyId propId = (PropertyId) id;
@@ -327,7 +339,7 @@
 
     //-------------------------------------------------------------< Property >
     /**
-     * @see Property#getValues()
+     * {@inheritDoc}
      */
     public Value[] getValues() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -348,7 +360,7 @@
     }
 
     /**
-     * @see Property#getValue()
+     * {@inheritDoc}
      */
     public Value getValue() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -372,7 +384,7 @@
     }
 
     /**
-     * @see Property#getString()
+     * {@inheritDoc}
      */
     public String getString() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -387,7 +399,7 @@
     }
 
     /**
-     * @see Property#getStream()
+     * {@inheritDoc}
      */
     public InputStream getStream() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -402,7 +414,7 @@
     }
 
     /**
-     * @see Property#getLong()
+     * {@inheritDoc}
      */
     public long getLong() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -424,7 +436,7 @@
     }
 
     /**
-     * @see Property#getDouble()
+     * {@inheritDoc}
      */
     public double getDouble() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -447,7 +459,7 @@
     }
 
     /**
-     * @see Property#getDate()
+     * {@inheritDoc}
      */
     public Calendar getDate() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -470,7 +482,7 @@
     }
 
     /**
-     * @see Property#getBoolean()
+     * {@inheritDoc}
      */
     public boolean getBoolean() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -493,7 +505,7 @@
     }
 
     /**
-     * @see Property#getNode()
+     * {@inheritDoc}
      */
     public Node getNode() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -516,7 +528,7 @@
     }
 
     /**
-     * @see Property#setValue(Calendar)
+     * {@inheritDoc}
      */
     public void setValue(Calendar date)
             throws ValueFormatException, VersionException,
@@ -563,7 +575,7 @@
     }
 
     /**
-     * @see Property#setValue(double)
+     * {@inheritDoc}
      */
     public void setValue(double number)
             throws ValueFormatException, VersionException,
@@ -605,7 +617,7 @@
     }
 
     /**
-     * @see Property#setValue(java.io.InputStream)
+     * {@inheritDoc}
      */
     public void setValue(InputStream stream)
             throws ValueFormatException, VersionException,
@@ -658,7 +670,7 @@
     }
 
     /**
-     * @see Property#setValue(String)
+     * {@inheritDoc}
      */
     public void setValue(String string)
             throws ValueFormatException, VersionException,
@@ -704,7 +716,7 @@
     }
 
     /**
-     * @see Property#setValue(String)
+     * {@inheritDoc}
      */
     public void setValue(String[] strings)
             throws ValueFormatException, VersionException,
@@ -757,7 +769,7 @@
     }
 
     /**
-     * @see Property#setValue(boolean)
+     * {@inheritDoc}
      */
     public void setValue(boolean b)
             throws ValueFormatException, VersionException,
@@ -799,7 +811,7 @@
     }
 
     /**
-     * @see Property#setValue(Node)
+     * {@inheritDoc}
      */
     public void setValue(Node target)
             throws ValueFormatException, VersionException,
@@ -853,7 +865,7 @@
     }
 
     /**
-     * @see Property#setValue(long)
+     * {@inheritDoc}
      */
     public void setValue(long number)
             throws ValueFormatException, VersionException,
@@ -895,7 +907,7 @@
     }
 
     /**
-     * @see Property#setValue(Value)
+     * {@inheritDoc}
      */
     public synchronized void setValue(Value value)
             throws ValueFormatException, VersionException,
@@ -943,7 +955,7 @@
     }
 
     /**
-     * @see Property#setValue(Value[])
+     * {@inheritDoc}
      */
     public void setValue(Value[] values)
             throws ValueFormatException, VersionException,
@@ -998,7 +1010,7 @@
     }
 
     /**
-     * @see Property#getLength
+     * {@inheritDoc}
      */
     public long getLength() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -1050,7 +1062,7 @@
     }
 
     /**
-     * @see Property#getLengths
+     * {@inheritDoc}
      */
     public long[] getLengths() throws ValueFormatException, RepositoryException {
         // check state of this instance
@@ -1108,14 +1120,14 @@
     }
 
     /**
-     * @see Property#getDefinition()
+     * {@inheritDoc}
      */
     public PropertyDef getDefinition() {
         return definition;
     }
 
     /**
-     * @see Property#getType()
+     * {@inheritDoc}
      */
     public int getType() throws RepositoryException {
         // check state of this instance
@@ -1126,14 +1138,14 @@
 
     //-----------------------------------------------------------------< Item >
     /**
-     * @see Item#isNode()
+     * {@inheritDoc}
      */
     public boolean isNode() {
         return false;
     }
 
     /**
-     * @see Item#getName
+     * {@inheritDoc}
      */
     public String getName() throws RepositoryException {
         PropertyId propId = (PropertyId) id;
@@ -1149,7 +1161,7 @@
     }
 
     /**
-     * @see Item#accept(ItemVisitor)
+     * {@inheritDoc}
      */
     public void accept(ItemVisitor visitor) throws RepositoryException {
         // check state of this instance
@@ -1159,7 +1171,7 @@
     }
 
     /**
-     * @see Item#getParent
+     * {@inheritDoc}
      */
     public Node getParent()
             throws ItemNotFoundException, AccessDeniedException, RepositoryException {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java Fri Mar  4 09:59:44 2005
@@ -654,7 +654,7 @@
 
     //-----------------------------------------------------------< Repository >
     /**
-     * @see Repository#login(Credentials, String)
+     * {@inheritDoc}
      */
     public Session login(Credentials credentials, String workspaceName)
             throws LoginException, NoSuchWorkspaceException, RepositoryException {
@@ -687,7 +687,7 @@
     }
 
     /**
-     * @see Repository#login(String)
+     * {@inheritDoc}
      */
     public Session login(String workspaceName)
             throws LoginException, NoSuchWorkspaceException, RepositoryException {
@@ -695,14 +695,14 @@
     }
 
     /**
-     * @see Repository#login()
+     * {@inheritDoc}
      */
     public Session login() throws LoginException, RepositoryException {
         return login(null, null);
     }
 
     /**
-     * @see Repository#login(Credentials)
+     * {@inheritDoc}
      */
     public Session login(Credentials credentials)
             throws LoginException, RepositoryException {
@@ -710,14 +710,14 @@
     }
 
     /**
-     * @see Repository#getDescriptor(String)
+     * {@inheritDoc}
      */
     public String getDescriptor(String key) {
         return repProps.getProperty(key);
     }
 
     /**
-     * @see Repository#getDescriptorKeys()
+     * {@inheritDoc}
      */
     public String[] getDescriptorKeys() {
         String[] keys = (String[]) repProps.keySet().toArray(new String[repProps.keySet().size()]);
@@ -727,7 +727,7 @@
 
     //------------------------------------------------------< SessionListener >
     /**
-     * @see SessionListener#loggedOut(SessionImpl)
+     * {@inheritDoc}
      */
     public void loggedOut(SessionImpl session) {
         // remove session from active sessions
@@ -736,7 +736,7 @@
 
     //--------------------------------------------------------< EventListener >
     /**
-     * @see EventListener#onEvent(EventIterator)
+     * {@inheritDoc}
      */
     public void onEvent(EventIterator events) {
         // check state

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionImpl.java Fri Mar  4 09:59:44 2005
@@ -441,7 +441,7 @@
 
     //--------------------------------------------------------------< Session >
     /**
-     * @see Session#checkPermission(String, String)
+     * {@inheritDoc}
      */
     public void checkPermission(String absPath, String actions)
             throws AccessControlException {
@@ -588,14 +588,14 @@
     }
 
     /**
-     * @see Session#getWorkspace()
+     * {@inheritDoc}
      */
     public Workspace getWorkspace() {
         return wsp;
     }
 
     /**
-     * @see Session#impersonate(Credentials)
+     * {@inheritDoc}
      */
     public Session impersonate(Credentials otherCredentials)
             throws LoginException, RepositoryException {
@@ -621,7 +621,7 @@
     }
 
     /**
-     * @see Session#getRootNode
+     * {@inheritDoc}
      */
     public Node getRootNode() throws RepositoryException {
         // check sanity of this session
@@ -631,7 +631,7 @@
     }
 
     /**
-     * @see Session#getNodeByUUID(String)
+     * {@inheritDoc}
      */
     public Node getNodeByUUID(String uuid) throws ItemNotFoundException, RepositoryException {
         // check sanity of this session
@@ -651,7 +651,7 @@
     }
 
     /**
-     * @see Session#getItem(String)
+     * {@inheritDoc}
      */
     public Item getItem(String absPath) throws PathNotFoundException, RepositoryException {
         // check sanity of this session
@@ -669,7 +669,7 @@
     }
 
     /**
-     * @see Session#itemExists(String)
+     * {@inheritDoc}
      */
     public boolean itemExists(String absPath) {
         try {
@@ -687,7 +687,7 @@
     }
 
     /**
-     * @see Session#save
+     * {@inheritDoc}
      */
     public void save()
             throws AccessDeniedException, ConstraintViolationException,
@@ -700,7 +700,7 @@
     }
 
     /**
-     * @see Session#refresh(boolean)
+     * {@inheritDoc}
      */
     public void refresh(boolean keepChanges) throws RepositoryException {
         // check sanity of this session
@@ -715,7 +715,7 @@
     }
 
     /**
-     * @see Session#hasPendingChanges
+     * {@inheritDoc}
      */
     public boolean hasPendingChanges() throws RepositoryException {
         // check sanity of this session
@@ -725,7 +725,7 @@
     }
 
     /**
-     * @see Session#move(String, String)
+     * {@inheritDoc}
      */
     public void move(String srcAbsPath, String destAbsPath)
             throws ItemExistsException, PathNotFoundException,
@@ -862,7 +862,7 @@
     }
 
     /**
-     * @see Session#getImportContentHandler(String)
+     * {@inheritDoc}
      */
     public ContentHandler getImportContentHandler(String parentAbsPath)
             throws PathNotFoundException, ConstraintViolationException,
@@ -904,7 +904,7 @@
     }
 
     /**
-     * @see Session#importXML(String, InputStream)
+     * {@inheritDoc}
      */
     public void importXML(String parentAbsPath, InputStream in)
             throws IOException, PathNotFoundException, ItemExistsException,
@@ -933,7 +933,7 @@
     }
 
     /**
-     * @see Session#exportDocView(String, ContentHandler, boolean, boolean)
+     * {@inheritDoc}
      */
     public void exportDocView(String absPath, ContentHandler contentHandler,
                               boolean skipBinary, boolean noRecurse)
@@ -952,7 +952,7 @@
     }
 
     /**
-     * @see Session#exportDocView(String, OutputStream, boolean, boolean)
+     * {@inheritDoc}
      */
     public void exportDocView(String absPath, OutputStream out,
                               boolean skipBinary, boolean noRecurse)
@@ -969,7 +969,7 @@
     }
 
     /**
-     * @see Session#exportSysView(String, ContentHandler, boolean, boolean)
+     * {@inheritDoc}
      */
     public void exportSysView(String absPath, ContentHandler contentHandler,
                               boolean skipBinary, boolean noRecurse)
@@ -987,7 +987,7 @@
     }
 
     /**
-     * @see Session#exportSysView(String, OutputStream, boolean, boolean)
+     * {@inheritDoc}
      */
     public void exportSysView(String absPath, OutputStream out,
                               boolean skipBinary, boolean noRecurse)
@@ -1003,7 +1003,7 @@
     }
 
     /**
-     * @see Session#logout()
+     * {@inheritDoc}
      */
     public synchronized void logout() {
         if (!alive) {
@@ -1044,35 +1044,35 @@
     }
 
     /**
-     * @see Session#getRepository
+     * {@inheritDoc}
      */
     public Repository getRepository() {
         return rep;
     }
 
     /**
-     * @see Session#getUserId
+     * {@inheritDoc}
      */
     public String getUserId() {
         return userId;
     }
 
     /**
-     * @see Session#getAttribute
+     * {@inheritDoc}
      */
     public Object getAttribute(String name) {
         return attributes.get(name);
     }
 
     /**
-     * @see Session#getAttributeNames
+     * {@inheritDoc}
      */
     public String[] getAttributeNames() {
         return (String[]) attributes.keySet().toArray(new String[attributes.size()]);
     }
 
     /**
-     * @see Session#setNamespacePrefix(String, String)
+     * {@inheritDoc}
      */
     public void setNamespacePrefix(String prefix, String uri)
             throws NamespaceException, RepositoryException {
@@ -1080,7 +1080,7 @@
     }
 
     /**
-     * @see Session#getNamespacePrefixes
+     * {@inheritDoc}
      */
     public String[] getNamespacePrefixes()
             throws NamespaceException, RepositoryException {
@@ -1088,7 +1088,7 @@
     }
 
     /**
-     * @see Session#getNamespaceURI(String)
+     * {@inheritDoc}
      */
     public String getNamespaceURI(String prefix)
             throws NamespaceException, RepositoryException {
@@ -1096,7 +1096,7 @@
     }
 
     /**
-     * @see Session#getNamespaceURI(String)
+     * {@inheritDoc}
      */
     public String getNamespacePrefix(String uri)
             throws NamespaceException, RepositoryException {
@@ -1105,7 +1105,7 @@
 
     //------------------------------------------------------< locking support >
     /**
-     * @see Session#addLockToken(String)
+     * {@inheritDoc}
      */
     public void addLockToken(String lt) {
         // @todo implement locking support
@@ -1113,7 +1113,7 @@
     }
 
     /**
-     * @see Session#getLockTokens()
+     * {@inheritDoc}
      */
     public String[] getLockTokens() {
         // @todo implement locking support
@@ -1121,7 +1121,7 @@
     }
 
     /**
-     * @see Session#removeLockToken(String)
+     * {@inheritDoc}
      */
     public void removeLockToken(String lt) {
         // @todo implement locking support

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SystemSession.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SystemSession.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SystemSession.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SystemSession.java Fri Mar  4 09:59:44 2005
@@ -94,7 +94,7 @@
 
         //----------------------------------------------------< AccessManager >
         /**
-         * @see AccessManager#checkPermission(ItemId, int)
+         * {@inheritDoc}
          */
         public void checkPermission(ItemId id, int permissions)
                 throws AccessDeniedException, ItemNotFoundException,
@@ -103,7 +103,7 @@
         }
 
         /**
-         * @see AccessManager#isGranted(ItemId, int)
+         * {@inheritDoc}
          */
         public boolean isGranted(ItemId id, int permissions)
                 throws ItemNotFoundException, RepositoryException {
@@ -112,14 +112,14 @@
         }
 
         /**
-         * @see AccessManager#init(AMContext)
+         * {@inheritDoc}
          */
         public void init(AMContext context) throws Exception {
             // nop
         }
 
         /**
-         * @see AccessManager#close()
+         * {@inheritDoc}
          */
         public void close() throws Exception {
             // nop

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java Fri Mar  4 09:59:44 2005
@@ -716,21 +716,21 @@
 
     //------------------------------------------------------------< Workspace >
     /**
-     * @see Workspace#getName
+     * {@inheritDoc}
      */
     public String getName() {
         return wspConfig.getName();
     }
 
     /**
-     * @see Workspace#getSession
+     * {@inheritDoc}
      */
     public Session getSession() {
         return session;
     }
 
     /**
-     * @see Workspace#getNamespaceRegistry
+     * {@inheritDoc}
      */
     public NamespaceRegistry getNamespaceRegistry() throws RepositoryException {
         // check state of this instance
@@ -740,7 +740,7 @@
     }
 
     /**
-     * @see Workspace#getNodeTypeManager
+     * {@inheritDoc}
      */
     public NodeTypeManager getNodeTypeManager() throws RepositoryException {
         // check state of this instance
@@ -750,7 +750,7 @@
     }
 
     /**
-     * @see Workspace#clone(String, String, String, boolean)
+     * {@inheritDoc}
      */
     public void clone(String srcWorkspace, String srcAbsPath,
                       String destAbsPath, boolean removeExisting)
@@ -777,7 +777,7 @@
     }
 
     /**
-     * @see Workspace#copy(String, String)
+     * {@inheritDoc}
      */
     public void copy(String srcAbsPath, String destAbsPath)
             throws ConstraintViolationException, VersionException,
@@ -795,7 +795,7 @@
     }
 
     /**
-     * @see Workspace#copy(String, String, String)
+     * {@inheritDoc}
      */
     public void copy(String srcWorkspace, String srcAbsPath, String destAbsPath)
             throws NoSuchWorkspaceException, ConstraintViolationException,
@@ -818,7 +818,7 @@
     }
 
     /**
-     * @see Workspace#move
+     * {@inheritDoc}
      */
     public void move(String srcAbsPath, String destAbsPath)
             throws ConstraintViolationException, VersionException,
@@ -934,21 +934,10 @@
     }
 
     /**
-     * @see Workspace#getObservationManager
+     * {@inheritDoc}
      */
     public ObservationManager getObservationManager()
             throws UnsupportedRepositoryOperationException, RepositoryException {
-        return getObservationManagerImpl();
-    }
-
-    /**
-     * Returns the ObservationManagerImpl for this workspace instance.
-     *
-     * @return the ObservationManagerImpl for this workspace instance.
-     */
-    public synchronized ObservationManagerImpl getObservationManagerImpl()
-            throws UnsupportedRepositoryOperationException, RepositoryException {
-
         // check state of this instance
         sanityCheck();
 
@@ -966,7 +955,7 @@
     }
 
     /**
-     * @see Workspace#getQueryManager
+     * {@inheritDoc}
      */
     public synchronized QueryManager getQueryManager() throws RepositoryException {
 
@@ -994,7 +983,7 @@
     }
 
     /**
-     * @see Workspace#restore(Version[], boolean)
+     * {@inheritDoc}
      */
     public void restore(Version[] versions, boolean removeExisting)
             throws ItemExistsException, UnsupportedRepositoryOperationException,
@@ -1009,7 +998,7 @@
     }
 
     /**
-     * @see Workspace#getAccessibleWorkspaceNames
+     * {@inheritDoc}
      */
     public String[] getAccessibleWorkspaceNames() throws RepositoryException {
         // check state of this instance
@@ -1019,7 +1008,7 @@
     }
 
     /**
-     * @see Workspace#getImportContentHandler(String, int)
+     * {@inheritDoc}
      */
     public ContentHandler getImportContentHandler(String parentAbsPath,
                                                   int uuidBehavior)
@@ -1034,7 +1023,7 @@
     }
 
     /**
-     * @see Workspace#importXML(String, InputStream, int)
+     * {@inheritDoc}
      */
     public void importXML(String parentAbsPath, InputStream in,
                           int uuidBehavior)

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/XASessionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/XASessionImpl.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/XASessionImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/XASessionImpl.java Fri Mar  4 09:59:44 2005
@@ -23,12 +23,11 @@
 import org.apache.jackrabbit.core.state.TransactionListener;
 import org.apache.log4j.Logger;
 
-import javax.jcr.Credentials;
 import javax.jcr.RepositoryException;
+import javax.security.auth.login.LoginContext;
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
-import javax.security.auth.login.LoginContext;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -61,9 +60,9 @@
     /**
      * Create a new instance of this class.
      *
-     * @param rep         repository
+     * @param rep          repository
      * @param loginContext credentials
-     * @param wspConfig   workspace configuration
+     * @param wspConfig    workspace configuration
      * @throws RepositoryException if an error occurs
      */
     public XASessionImpl(RepositoryImpl rep, LoginContext loginContext,
@@ -74,25 +73,23 @@
     }
 
     //-------------------------------------------------------------< XASession >
-
     /**
-     * @see XASession#getXAResource
+     * {@inheritDoc}
      */
     public XAResource getXAResource() {
         return this;
     }
 
     //------------------------------------------------------------< XAResource >
-
     /**
-     * @see javax.transaction.xa.XAResource#getTransactionTimeout
+     * {@inheritDoc}
      */
     public int getTransactionTimeout() throws XAException {
         return txTimeout;
     }
 
     /**
-     * @see javax.transaction.xa.XAResource#setTransactionTimeout
+     * {@inheritDoc}
      */
     public boolean setTransactionTimeout(int seconds) throws XAException {
         txTimeout = seconds;
@@ -100,10 +97,10 @@
     }
 
     /**
-     * @see javax.transaction.xa.XAResource#isSameRM
-     *      <p/>
-     *      Two resources belong to the same resource manager if both connections
-     *      (i.e. sessions) have the same credentials.
+     * {@inheritDoc}
+     * <p/>
+     * Two resources belong to the same resource manager if both connections
+     * (i.e. sessions) have the same credentials.
      */
     public boolean isSameRM(XAResource xares) throws XAException {
         if (xares instanceof XASessionImpl) {
@@ -114,16 +111,16 @@
     }
 
     /**
-     * @see javax.transaction.xa.XAResource#start
-     *      <p/>
-     *      If <code>TMNOFLAGS</code> is specified, we create a new transaction
-     *      context and associate it with this resource.
-     *      If <code>TMJOIN</code> is specified, this resource should use the
-     *      same transaction context as another, already known transaction.
-     *      If <code>TMRESUME</code> is specified, we should resume work on
-     *      a transaction context that was suspended earlier.
-     *      All other flags generate an <code>XAException</code> of type
-     *      <code>XAER_INVAL</code>
+     * {@inheritDoc}
+     * <p/>
+     * If <code>TMNOFLAGS</code> is specified, we create a new transaction
+     * context and associate it with this resource.
+     * If <code>TMJOIN</code> is specified, this resource should use the
+     * same transaction context as another, already known transaction.
+     * If <code>TMRESUME</code> is specified, we should resume work on
+     * a transaction context that was suspended earlier.
+     * All other flags generate an <code>XAException</code> of type
+     * <code>XAER_INVAL</code>
      */
     public void start(Xid xid, int flags) throws XAException {
         if (isAssociated()) {
@@ -168,16 +165,16 @@
     }
 
     /**
-     * @see javax.transaction.xa.XAResource#end
-     *      <p/>
-     *      If <code>TMSUCCESS</code> is specified, we disassociate this session
-     *      from the transaction specified.
-     *      If <code>TMFAIL</code> is specified, we disassociate this session from
-     *      the transaction specified and mark the transaction rollback only.
-     *      If <code>TMSUSPEND</code> is specified, we disassociate this session
-     *      from the transaction specified.
-     *      All other flags generate an <code>XAException</code> of type
-     *      <code>XAER_INVAL</code>
+     * {@inheritDoc}
+     * <p/>
+     * If <code>TMSUCCESS</code> is specified, we disassociate this session
+     * from the transaction specified.
+     * If <code>TMFAIL</code> is specified, we disassociate this session from
+     * the transaction specified and mark the transaction rollback only.
+     * If <code>TMSUSPEND</code> is specified, we disassociate this session
+     * from the transaction specified.
+     * All other flags generate an <code>XAException</code> of type
+     * <code>XAER_INVAL</code>
      */
     public void end(Xid xid, int flags) throws XAException {
         if (!isAssociated()) {
@@ -201,7 +198,7 @@
     }
 
     /**
-     * @see javax.transaction.xa.XAResource#prepare
+     * {@inheritDoc}
      */
     public synchronized int prepare(Xid xid) throws XAException {
         TransactionContext tx = (TransactionContext) txGlobal.get(xid);
@@ -212,7 +209,7 @@
     }
 
     /**
-     * @see javax.transaction.xa.XAResource#rollback
+     * {@inheritDoc}
      */
     public void rollback(Xid xid) throws XAException {
         TransactionContext tx = (TransactionContext) txGlobal.get(xid);
@@ -223,7 +220,7 @@
     }
 
     /**
-     * @see javax.transaction.xa.XAResource#commit
+     * {@inheritDoc}
      */
     public void commit(Xid xid, boolean onePhase) throws XAException {
         TransactionContext tx = (TransactionContext) txGlobal.get(xid);
@@ -240,18 +237,18 @@
     }
 
     /**
-     * @see javax.transaction.xa.XAResource#recover
-     *      <p/>
-     *      No recovery support yet.
+     * {@inheritDoc}
+     * <p/>
+     * No recovery support yet.
      */
     public Xid[] recover(int flags) throws XAException {
         return new Xid[0];
     }
 
     /**
-     * @see javax.transaction.xa.XAResource#recover
-     *      <p/>
-     *      No recovery support yet.
+     * {@inheritDoc}
+     * <p/>
+     * No recovery support yet.
      */
     public void forget(Xid xid) throws XAException {
     }
@@ -289,10 +286,10 @@
     }
 
     /**
-     * @see org.apache.jackrabbit.core.SessionImpl#dispatch
-     *      <p/>
-     *      If we are currently associated with a transaction, the dispatch operation
-     *      will be postponed until commit.
+     * {@inheritDoc}
+     * <p/>
+     * If we are currently associated with a transaction, the dispatch operation
+     * will be postponed until commit.
      */
     protected void dispatch(EventStateCollection events) {
         if (tx != null) {
@@ -303,7 +300,7 @@
     }
 
     /**
-     * Internal {@link org.apache.jackrabbit.core.state.TransactionListener} implementation that will dispatch
+     * Internal {@link TransactionListener} implementation that will dispatch
      * events only when a transaction has actually been committed.
      */
     static class EventDispatcher implements TransactionListener {
@@ -323,18 +320,18 @@
         }
 
         /**
-         * @see org.apache.jackrabbit.core.state.TransactionListener#transactionCommitted
-         *      <p/>
-         *      Dispatch events.
+         * {@inheritDoc}
+         * <p/>
+         * Dispatch events.
          */
         public void transactionCommitted(TransactionContext tx) {
             events.dispatch();
         }
 
         /**
-         * @see org.apache.jackrabbit.core.state.TransactionListener#transactionCommitted
-         *      <p/>
-         *      Nothing to do.
+         * {@inheritDoc}
+         * <p/>
+         * Nothing to do.
          */
         public void transactionRolledBack(TransactionContext tx) {
         }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/BasedFileSystem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/BasedFileSystem.java?view=diff&r1=156189&r2=156190
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/BasedFileSystem.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/BasedFileSystem.java Fri Mar  4 09:59:44 2005
@@ -66,7 +66,7 @@
 
     //-----------------------------------------------------------< FileSystem >
     /**
-     * @see FileSystem#init
+     * {@inheritDoc}
      */
     public void init() throws FileSystemException {
         // check base path
@@ -76,63 +76,63 @@
     }
 
     /**
-     * @see FileSystem#close
+     * {@inheritDoc}
      */
     public void close() throws FileSystemException {
         // do nothing; base file system should be closed explicitly
     }
 
     /**
-     * @see FileSystem#copy
+     * {@inheritDoc}
      */
     public void copy(String srcPath, String destPath) throws FileSystemException {
         fsBase.copy(buildBasePath(srcPath), buildBasePath(destPath));
     }
 
     /**
-     * @see FileSystem#createFolder
+     * {@inheritDoc}
      */
     public void createFolder(String folderPath) throws FileSystemException {
         fsBase.createFolder(buildBasePath(folderPath));
     }
 
     /**
-     * @see FileSystem#deleteFile
+     * {@inheritDoc}
      */
     public void deleteFile(String filePath) throws FileSystemException {
         fsBase.deleteFile(buildBasePath(filePath));
     }
 
     /**
-     * @see FileSystem#deleteFolder
+     * {@inheritDoc}
      */
     public void deleteFolder(String folderPath) throws FileSystemException {
         fsBase.deleteFolder(buildBasePath(folderPath));
     }
 
     /**
-     * @see FileSystem#exists
+     * {@inheritDoc}
      */
     public boolean exists(String path) throws FileSystemException {
         return fsBase.exists(buildBasePath(path));
     }
 
     /**
-     * @see FileSystem#getInputStream
+     * {@inheritDoc}
      */
     public InputStream getInputStream(String filePath) throws FileSystemException {
         return fsBase.getInputStream(buildBasePath(filePath));
     }
 
     /**
-     * @see FileSystem#getOutputStream
+     * {@inheritDoc}
      */
     public OutputStream getOutputStream(String filePath) throws FileSystemException {
         return fsBase.getOutputStream(buildBasePath(filePath));
     }
 
     /**
-     * @see FileSystem#getRandomAccessOutputStream
+     * {@inheritDoc}
      */
     public RandomAccessOutputStream getRandomAccessOutputStream(String filePath)
             throws FileSystemException {
@@ -140,70 +140,70 @@
     }
 
     /**
-     * @see FileSystem#hasChildren
+     * {@inheritDoc}
      */
     public boolean hasChildren(String path) throws FileSystemException {
         return fsBase.hasChildren(buildBasePath(path));
     }
 
     /**
-     * @see FileSystem#isFile
+     * {@inheritDoc}
      */
     public boolean isFile(String path) throws FileSystemException {
         return fsBase.isFile(buildBasePath(path));
     }
 
     /**
-     * @see FileSystem#isFolder
+     * {@inheritDoc}
      */
     public boolean isFolder(String path) throws FileSystemException {
         return fsBase.isFolder(buildBasePath(path));
     }
 
     /**
-     * @see FileSystem#lastModified
+     * {@inheritDoc}
      */
     public long lastModified(String path) throws FileSystemException {
         return fsBase.lastModified(buildBasePath(path));
     }
 
     /**
-     * @see FileSystem#length
+     * {@inheritDoc}
      */
     public long length(String filePath) throws FileSystemException {
         return fsBase.length(buildBasePath(filePath));
     }
 
     /**
-     * @see FileSystem#touch
+     * {@inheritDoc}
      */
     public void touch(String filePath) throws FileSystemException {
         fsBase.touch(buildBasePath(filePath));
     }
 
     /**
-     * @see FileSystem#list
+     * {@inheritDoc}
      */
     public String[] list(String folderPath) throws FileSystemException {
         return fsBase.list(buildBasePath(folderPath));
     }
 
     /**
-     * @see FileSystem#listFiles
+     * {@inheritDoc}
      */
     public String[] listFiles(String folderPath) throws FileSystemException {
         return fsBase.listFiles(buildBasePath(folderPath));
     }
 
     /**
-     * @see FileSystem#listFolders
+     * {@inheritDoc}
      */
     public String[] listFolders(String folderPath) throws FileSystemException {
         return fsBase.listFolders(buildBasePath(folderPath));
     }
 
     /**
-     * @see FileSystem#move
+     * {@inheritDoc}
      */
     public void move(String srcPath, String destPath) throws FileSystemException {
         fsBase.move(buildBasePath(srcPath), buildBasePath(destPath));



Mime
View raw message